diff --git a/htdocs/langs/ar_SA/accountancy.lang b/htdocs/langs/ar_SA/accountancy.lang
index b0851c20d2c..67d21d731f3 100644
--- a/htdocs/langs/ar_SA/accountancy.lang
+++ b/htdocs/langs/ar_SA/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=محاسبة
 ACCOUNTING_EXPORT_SEPARATORCSV=فاصل العمود لملف التصدير
 ACCOUNTING_EXPORT_DATE=تنسيق التاريخ لملف التصدير
 ACCOUNTING_EXPORT_PIECE=تصدير عدد القطعة
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Accounts with non zero values
 ListOfAccounts=List of accounts
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers 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
 
-AccountancyArea=Accountancy area
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
 AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
@@ -89,7 +90,7 @@ MenuProductsAccounts=Product accounts
 ProductsBinding=Products accounts
 Ventilation=Binding to accounts
 CustomersVentilation=ربط فاتورة الزبون 
-SuppliersVentilation=Supplier invoice binding
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=دفتر الشراء اليومي
 ACCOUNTING_MISCELLANEOUS_JOURNAL=دفتر المتفرقات اليومي
 ACCOUNTING_EXPENSEREPORT_JOURNAL=دفتر تقرير المصروف اليومي
 ACCOUNTING_SOCIAL_JOURNAL=دفتر اليومية الاجتماعي
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
 ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
@@ -185,11 +187,12 @@ ListeMvts=List of movements
 ErrorDebitCredit=الدائن والمدين لا يمكن أن يكون لهم قيمة في الوقت نفسه
 AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
-DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=قائمة الحسابات المحاسبية
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Group of account
 Pcgsubtype=Subgroup of account
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
 ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=استشر هنا لائحة خطوط فواتير الموردين وحساب المحاسبية
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
 DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report 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 fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=خطأ، لا يمكنك حذف هذا الحساب المحاسبي لأنه مستخدم
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -293,4 +296,9 @@ Binded=Lines bound
 ToBind=Lines to bind
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang
index 0d26639a000..a8299774408 100644
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=بروتوكول نقل البريد الإلكتروني
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=بروتوكول نقل البريد الإلكتروني / SMTPS ميناء (غير محددة في مثل PHP على أنظمة يونكس)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=بروتوكول نقل البريد الإلكتروني / SMTPS المضيف (غير محددة في مثل PHP على أنظمة يونكس)
 MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= إرسال منهجية خفية الكربون نسخة من جميع رسائل البريد الإلكتروني المرسلة إلى
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=طريقة استخدام لإرسال رسائل البريد الإلكتروني
 MAIN_MAIL_SMTPS_ID=إذا الهوية SMTP التوثيق اللازم
 MAIN_MAIL_SMTPS_PW=كلمة السر اذا SMTP التوثيق اللازم
@@ -291,7 +292,7 @@ ModuleSetup=إعداد وحدة
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=نظام
 ModuleFamilyCrm=إدارة علاقات العملاء (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=إدارة المنتجات (PM)
 ModuleFamilyHr=إدارة الموارد البشرية (HR)
 ModuleFamilyProjects=مشاريع / العمل التعاوني
@@ -373,7 +374,8 @@ NoSmsEngine=لا مدير مرسل الرسائل القصيرة المتاحة.
 PDF=PDF
 PDFDesc=يمكنك تعيين كل الخيارات العالمية المتصلة جيل PDF
 PDFAddressForging=قواعد لتشكيل مربعات العناوين
-HideAnyVATInformationOnPDF=إخفاء كل المعلومات المتعلقة ضريبة القيمة المضافة على إنشاء قوات الدفاع الشعبي
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=إخفاء وصف المنتجات على لدت PDF
@@ -445,7 +447,8 @@ DisplayCompanyInfo=Display company address
 DisplayCompanyManagers=Display manager names
 DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party 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.
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Set this to 1 if you want to attach main document to emai
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=& مجموعات المستخدمين
 Module0Desc=Users / Employees and Groups management
@@ -479,7 +485,7 @@ Module1Desc=شركات الاتصالات وإدارة
 Module2Name=التجارية
 Module2Desc=الإدارة التجارية
 Module10Name=المحاسبة
-Module10Desc=إدارة المحاسبة البسيطة (ارسال الفواتير والمدفوعات)
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=مقترحات
 Module20Desc=مقترحات تجارية إدارة
 Module22Name=كتلة بالبريد الإلكتروني
@@ -546,8 +552,8 @@ Module400Name=المشاريع / الفرص / يؤدي
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=التكامل Webcalendar
-Module500Name=المصروفات الخاصة
-Module500Desc=إدارة المصروفات الخاصة (الضرائب، الضرائب الاجتماعية أو المالية وتوزيعات الأرباح)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Payment of employee wages
 Module510Desc=Record and follow payment of your employee wages
 Module520Name=قرض
@@ -561,14 +567,14 @@ Module700Name=التبرعات
 Module700Desc=التبرعات إدارة
 Module770Name=تقارير المصاريف
 Module770Desc=إدارة والمطالبة تقارير المصاريف (النقل، وجبة، ...)
-Module1120Name=اقتراح التجاري المورد
-Module1120Desc=اقتراح تجاري طلب المورد والأسعار
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=فرس النبي
 Module1200Desc=فرس النبي التكامل
 Module1520Name=الجيل ثيقة
 Module1520Desc=الجيل ثيقة الإلكتروني الشامل
 Module1780Name=الكلمات / فئات
-Module1780Desc=إنشاء العلامات / فئة (المنتجات والعملاء والموردين والاتصالات أو أفراد)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=WYSIWYG المحرر
 Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
 Module2200Name=الأسعار الديناميكية
@@ -576,7 +582,7 @@ Module2200Desc=تمكين استخدام تعبيرات الرياضيات لل
 Module2300Name=المهام المجدولة
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=خدمات API / ويب (خادم SOAP)
@@ -613,7 +619,7 @@ Module50100Desc=Point of sales module (POS).
 Module50200Name=باي بال
 Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 Module50400Name=المحاسبة (متقدم)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=PrintIPP
 Module54000Desc=(يجب أن تكون الطابعة مرئية من الخادم، ويجب أن تكون الكؤوس تركيبها على الخادم) الطباعة مباشرة (دون فتح المستندات) باستخدام واجهة الكؤوس IPP.
 Module55000Name=استطلاع للرأي، أو مسح التصويت
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=تأخير التسامح (في يوم) في حالة
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=تأخير التسامح (في يوم) في حالة تأهب قبل لإيداع الشيكات للقيام
 Delays_MAIN_DELAY_EXPENSEREPORTS=تأخير التسامح (بالأيام) قبل حالة تأهب لتقارير النفقات الموافقة
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=القيود الأخرى القائمة في إدارة اختياري البارامترات.
 LogEvents=مراجعة الحسابات الأحداث الأمنية
 Audit=المراجعة
@@ -1054,8 +1060,9 @@ LogEventDesc=هنا يمكنك تمكين قطع الأشجار لDolibarr ال
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=نظام المعلومات المتنوعة المعلومات التقنية تحصل في قراءة فقط وواضحة للمشرفين فقط.
 SystemAreaForAdminOnly=هذا المجال المتاح لمدير المستخدمين فقط. أيا من Dolibarr أذونات يمكن أن تقلل من هذا الحد.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=يمكنك ان تختار كل معلمة إلى Dolibarr هنا الشكل والمظهر
 AvailableModules=Available app/modules
 ToActivateModule=لتفعيل وحدات ، على الإعداد منطقة الصفحة الرئيسية&gt; الإعداد -> الوحدات).
@@ -1188,11 +1195,11 @@ UserMailRequired=مطلوب بريد إلكتروني لإنشاء مستخدم
 HRMSetup=HRM وحدة الإعداد
 ##### Company setup #####
 CompanySetup=وحدة الإعداد للشركات
-CompanyCodeChecker=نموذج للجيل الثالث لقانون الأحزاب ومراجعة (عميل أو مورد)
-AccountCodeManager=Module for accounting code generation (customer or supplier)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
 NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
 ModelModules=وثائق قوالب
 DocumentModelOdt=توليد وثائق من OpenDocuments القوالب (.ODT أو .ODS ملفات أوفيس، كي أوفيس، برنامج TextEdit، ...)
@@ -1203,6 +1210,9 @@ MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
 TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=تصدير صلة <b>%s </b> شكل متاح على الوصلة التالية : %s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=نص تجارية حرة على مقترحات
 WatermarkOnDraftProposal=العلامة المائية على مشاريع المقترحات التجارية (أي إذا فارغ)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=اسأل عن وجهة الحساب المصرفي للاقتراح
 ##### SupplierProposal #####
-SupplierProposalSetup=يطلب سعر الإعداد الموردين وحدة
-SupplierProposalNumberingModules=طلبات الأسعار الموردين الذين يبلغ عددهم نماذج
-SupplierProposalPDFModules=يطلب سعر الموردين وثائق نماذج
-FreeLegalTextOnSupplierProposal=النص الحر على طلبات سعر الموردين
-WatermarkOnDraftSupplierProposal=العلامة المائية على مشروع سعر تطلب الموردين (أي إذا فارغ)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=اسأل عن وجهة الحساب المصرفي للطلب السعر
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=طلب مستودع المصدر لأمر
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=أوامر إدارة الإعداد
 OrdersNumberingModules=أوامر الترقيم نمائط
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=اتصال الخادم '%s ' على قاعدة البيانا
 OSCommerceTestKo1=علاقة الخادم '%s ' تنجح ولكن قاعدة البيانات '%s ' لا يمكن التوصل إليها.
 OSCommerceTestKo2=علاقة الخادم '%s ' مستخدم '%s ' فشلت.
 ##### Stock #####
-StockSetup=مستودع وحدة الإعداد
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=إذا كنت تستخدم نقاط البيع وحدة (وحدة POS قدمت افتراضيا أو وحدة خارجية أخرى)، قد يتم تجاهل هذا الإعداد من خلال وجهة نظرك من بيع وحدة. تم تصميم معظم نقطة من وحدات المبيعات لخلق الفور فاتورة وانخفاض الأسهم افتراضيا كل ما هي الخيارات المتاحة هنا. لذلك، إذا كنت في حاجة أو ليس لديهم انخفاض الأسهم عند تسجيل بيع من وجهة نظرك من بيع، وتحقق أيضا مجموعة وحدة POS الخاص بك.
 ##### Menu #####
 MenuDeleted=حذف من القائمة
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
 MultiCompanySetup=نموذج متعدد شركة الإعداد
 ##### Suppliers #####
 SuppliersSetup=المورد الإعداد وحدة
-SuppliersCommandModel=قالب كاملة من أجل المورد (logo...)
-SuppliersInvoiceModel=كاملة قالب من فاتورة المورد (logo. ..)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=فواتير الموردين الذين يبلغ عددهم نماذج
 IfSetToYesDontForgetPermission=إذا اخترت نعم، لا تنسى أن توفر الأذونات إلى المجموعات أو المستخدمين المسموح بها للموافقة الثانية
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=لا تستخدم الأحرف الغامضة ("1"، "
 SalariesSetup=الإعداد للرواتب وحدة
 SortOrder=ترتيب
 Format=شكل
-TypePaymentDesc=0: العميل نوع الدفع، 1: مورد نوع الدفع، 2: كل من العملاء والموردين نوع الدفع
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=يشمل المسار (المحدد في متغير%s)
 ExpenseReportsSetup=إعداد تقارير المصروفات وحدة
 TemplatePDFExpenseReports=قوالب المستند لتوليد حساب ثيقة تقرير
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=تثبيت وحدة خارجية من
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=تسليط الضوء على خطوط الجدول عندما يمر تحرك الماوس فوق
 HighlightLinesColor=تسليط الضوء على لون الخط عند تمرير الماوس فوق (الحفاظ فارغة دون تمييز)
-TextTitleColor=Color of page title
+TextTitleColor=Text color of Page title
 LinkColor=لون الروابط
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=لون الخلفية لقائمة الأعلى
 TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=لون الخلفية القائمة اليمنى
 BackgroundTableTitleColor=لون الخلفية لخط عنوان الجدول
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=لون الخلفية لخطوط الجدول غريبة
 BackgroundTableLineEvenColor=لون الخلفية حتى خطوط الجدول
 MinimumNoticePeriod=الحد الأدنى لمدة إشعار (يجب أن يتم طلب إجازة قبل هذا التأخير)
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=مثال: +2 (ملء فقط إذا كانت المشكل
 ExpectedChecksum=اختباري المتوقع
 CurrentChecksum=اختباري الحالي
 ForcedConstants=Required constant values
-MailToSendProposal=لإرسال اقتراح العملاء
-MailToSendOrder=لإرسال طلب العميل
-MailToSendInvoice=لإرسال فاتورة العملاء
-MailToSendShipment=لإرسال شحنة
-MailToSendIntervention=لإرسال التدخل
-MailToSendSupplierRequestForQuotation=لإرسال طلب الاقتباس إلى المورد
-MailToSendSupplierOrder=لإرسال المورد أجل
-MailToSendSupplierInvoice=لإرسال فاتورة المورد
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-MailToMember=To send email from member page
-MailToUser=To send email from user page
-MailToProject= To send email from project page
+MailToSendProposal=مقترحات العملاء
+MailToSendOrder=طلبات العملاء
+MailToSendInvoice=فواتير العملاء
+MailToSendShipment=شحنات
+MailToSendIntervention=التدخلات
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=عقود
+MailToThirdparty=أطراف ثالثة
+MailToMember=أعضاء
+MailToUser=المستخدمين
+MailToProject=Projects page
 ByDefaultInList=تظهر بشكل افتراضي على عرض القائمة
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=مثال على رسالة يمكنك استخدامها ليعلن هذا الإصدار الرئيسي (لا تتردد في استخدامها على مواقع الويب الخاص بك)
@@ -1780,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/ar_SA/bills.lang b/htdocs/langs/ar_SA/bills.lang
index 9b01a9586eb..f0bcf78d220 100644
--- a/htdocs/langs/ar_SA/bills.lang
+++ b/htdocs/langs/ar_SA/bills.lang
@@ -109,7 +109,7 @@ CancelBill=شطب فاتورة
 SendRemindByMail=إرسال تذكرة عن طريق البريد الإلكتروني
 DoPayment=Enter payment
 DoPaymentBack=Enter refund
-ConvertToReduc=تحويل الخصم في المستقبل
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=دخول الدفع الواردة من العملاء
@@ -120,7 +120,7 @@ BillStatus=حالة الفاتورة
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=مشروع (لا بد من التحقق من صحة)
 BillStatusPaid=دفع
-BillStatusPaidBackOrConverted=Credit note refund or converted into discount
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=المهجورة
 BillStatusValidated=مصادق عليه (لا بد من دفعها)
@@ -296,10 +296,10 @@ DiscountType=Discount type
 NoteReason=ملاحظة / السبب
 ReasonDiscount=السبب
 DiscountOfferedBy=التي تمنحها
-DiscountStillRemaining=Discounts available
-DiscountAlreadyCounted=Discounts already consumed
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+SupplierDiscounts=Vendors discounts
 BillAddress=مشروع قانون معالجة
 HelpEscompte=هذا الخصم هو الخصم الممنوح للعميل لأن الدفع قبل البعيد.
 HelpAbandonBadCustomer=هذا المبلغ قد تم التخلي عنها (وذكر أن العملاء سيئة العملاء) ، ويعتبر أحد exceptionnal فضفاضة.
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Every %s days
 FrequencyPer_m=Every %s months
 FrequencyPer_y=Every %s years
@@ -505,9 +511,14 @@ SituationAmount=مبلغ الفاتورة الوضع (صافي)
 SituationDeduction=الوضع الطرح
 ModifyAllLines=تعديل كافة خطوط
 CreateNextSituationInvoice=إنشاء الوضع المقبل
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=الوضع القادم موجود بالفعل.
 DisabledBecauseFinal=هذا الوضع النهائي.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=دإ
 CantBeLessThanMinPercent=التقدم لا يمكن أن يكون أصغر من قيمتها في الحالة السابقة.
 NoSituations=لا حالات مفتوحة
 InvoiceSituationLast=الفاتورة النهائية والعامة
@@ -532,3 +543,4 @@ AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/ar_SA/categories.lang b/htdocs/langs/ar_SA/categories.lang
index 8142df23e47..09949c3b480 100644
--- a/htdocs/langs/ar_SA/categories.lang
+++ b/htdocs/langs/ar_SA/categories.lang
@@ -1,87 +1,88 @@
 # Dolibarr language file - Source file is en_US - categories
 Rubrique=العلامة / الفئة
 Rubriques=الكلمات / فئات
-RubriquesTransactions=Tags/Categories of transactions
+RubriquesTransactions=علامات/ فئات المعاملات
 categories=علامات / فئات
-NoCategoryYet=أي علامة / فئة من هذا النوع تم إنشاؤها
+NoCategoryYet=لم يتم إنشاء علامة / فئة من هذا النوع
 In=في
-AddIn=أضيف في
+AddIn=اضف الى
 modify=تعديل
-Classify=تصنيف
-CategoriesArea=الكلمات / فئات منطقة
-ProductsCategoriesArea=المنتجات / الخدمات به / المنطقة الفئات
-SuppliersCategoriesArea=الموردين به / المنطقة الفئات
-CustomersCategoriesArea=العملاء العلامات / المنطقة الفئات
-MembersCategoriesArea=به أعضاء / المنطقة الفئات
-ContactsCategoriesArea=اتصالات به / المنطقة الفئات
-AccountsCategoriesArea=Accounts tags/categories area
-ProjectsCategoriesArea=Projects tags/categories area
-SubCats=الفئات الفرعية
-CatList=قائمة العلامات / فئات
-NewCategory=علامة جديدة / فئة
-ModifCat=تعديل العلامة / فئة
-CatCreated=العلامة / فئة خلقت
-CreateCat=إنشاء العلامة / فئة
-CreateThisCat=إنشاء هذه العلامة / فئة
-NoSubCat=لا فرعية.
-SubCatOf=فرعية
-FoundCats=علامات وجدت / فئات
-ImpossibleAddCat=Impossible to add the tag/category %s
-WasAddedSuccessfully=<b>ق ٪</b> أضيفت بنجاح.
-ObjectAlreadyLinkedToCategory=ويرتبط العنصر بالفعل لهذه العلامة / فئة.
-ProductIsInCategories=ويرتبط المنتج / الخدمة ليلي به / فئات
-CompanyIsInCustomersCategories=ويرتبط هذا الطرف الثالث ليلي العملاء / آفاق به / فئات
-CompanyIsInSuppliersCategories=ويرتبط هذا الطرف الثالث ليلي الموردين به / فئات
-MemberIsInCategories=ويرتبط هذا العضو ليلي أعضاء علامات / فئات
-ContactIsInCategories=ويرتبط هذا الاتصال بعد اتصالات به / فئات
-ProductHasNoCategory=هذا المنتج / الخدمة ليست في أية علامات / فئات
-CompanyHasNoCategory=This third party is not in any tags/categories
-MemberHasNoCategory=هذا العضو ليس في أية علامات / فئات
-ContactHasNoCategory=هذا الاتصال ليست في أية علامات / فئات
-ProjectHasNoCategory=This project is not in any tags/categories
-ClassifyInCategory=إضافة إلى علامة / فئة
-NotCategorized=من دون سمة / فئة
-CategoryExistsAtSameLevel=هذه الفئة موجودة بالفعل في نفس المكان
-ContentsVisibleByAllShort=محتويات مرئية من قبل جميع
-ContentsNotVisibleByAllShort=محتويات غير مرئي من قبل جميع
-DeleteCategory=حذف العلامة / فئة
-ConfirmDeleteCategory=هل أنت متأكد أنك تريد حذف هذه العلامة / الفئة؟
-NoCategoriesDefined=أي علامة / فئة محددة
-SuppliersCategoryShort=الموردين العلامة / فئة
-CustomersCategoryShort=عملاء العلامة / فئة
-ProductsCategoryShort=منتجات العلامة / فئة
-MembersCategoryShort=العلامة أعضاء / فئة
-SuppliersCategoriesShort=الموردين به / فئات
-CustomersCategoriesShort=العملاء العلامات / فئات
-ProspectsCategoriesShort=Prospects tags/categories
-CustomersProspectsCategoriesShort=Custo. / Prosp. الفئات
-ProductsCategoriesShort=منتجات العلامات / فئات
-MembersCategoriesShort=به أعضاء / فئات
-ContactCategoriesShort=اتصالات به / فئات
-AccountsCategoriesShort=Accounts tags/categories
-ProjectsCategoriesShort=Projects tags/categories
-ThisCategoryHasNoProduct=هذه الفئة لا تحتوي على أي منتج.
+Classify=صنف
+CategoriesArea=منطقة الكلمات / الفئات 
+ProductsCategoriesArea=منطقة المنتجات / الخدمات العلامات / الفئات
+SuppliersCategoriesArea=منطقة علامات / فئات الموردون 
+CustomersCategoriesArea=منطقة علامات / فئات العملاء 
+MembersCategoriesArea=منطقة علامات / فئات الأعضاء 
+ContactsCategoriesArea=منطقة  اتصالات العلامات / الفئات 
+AccountsCategoriesArea=منطقة علامات / فئات حسابات 
+ProjectsCategoriesArea=منطقة علامات / فئات المشاريع
+SubCats=Sub-categories
+CatList=قائمة العلامات / الفئات
+NewCategory=علامة / فئة جديدة
+ModifCat=تعديل العلامة / الفئة
+CatCreated=تم إنشاء العلامة / الفئة
+CreateCat=إنشاء علامة / فئة
+CreateThisCat=إنشاء هذه العلامة / الفئة
+NoSubCat=لا فئة فرعية.
+SubCatOf=فئة فرعية
+FoundCats=تم العثور على العلامات / الفئات
+ImpossibleAddCat=من المستحيل لإضافة العلامة / فئة %s
+WasAddedSuccessfully=تمت إضافة <b> %s</b> بنجاح.
+ObjectAlreadyLinkedToCategory=العنصر مرتبط بالفعل بهذه العلامة / الفئة.
+ProductIsInCategories=المنتج / الخدمة مرتبط بـ العلامات / الفئات التالية
+CompanyIsInCustomersCategories=هذا الطرف الثالث مرتبط  بـ العملاء / العملاء المحتملون العلامات / فئات التالية 
+CompanyIsInSuppliersCategories=هذا الطرف الثالث مرتبط  بـ  علامات / فئات الموردين التالية
+MemberIsInCategories=هذا العضو مرتبط  بـ علامات / فئات الأعضاء التالية
+ContactIsInCategories=ويرتبط هذا الاتصال إلى علامات / فئات جهات الاتصال التالية 
+ProductHasNoCategory=هذا المنتج / الخدمة ليست في أي علامات / فئات
+CompanyHasNoCategory=هذا الطرف الثالث ليس في أي علامات / فئات
+MemberHasNoCategory=هذا العضو ليس في أي علامات / فئات
+ContactHasNoCategory=هذا الاتصال ليس في أي علامات / فئات
+ProjectHasNoCategory=هذا المشروع ليس في أي علامات / فئات
+ClassifyInCategory=إضافة إلى العلامة / الفئة
+NotCategorized=دون علامة / فئة
+CategoryExistsAtSameLevel=هذه الفئة موجودة بالفعل مع هذا المرجع
+ContentsVisibleByAllShort=المحتويات مرئية للجميع
+ContentsNotVisibleByAllShort=المحتويات غير مرئية من قبل الجميع
+DeleteCategory=حذف العلامة / الفئة
+ConfirmDeleteCategory=هل تريد بالتأكيد حذف هذه العلامة / الفئة؟
+NoCategoriesDefined=لم يتم تحديد أي علامة / فئة
+SuppliersCategoryShort=علامة / فئة الموردون 
+CustomersCategoryShort=علامة / فئة العملاء 
+ProductsCategoryShort=علامة / فئة المنتجات 
+MembersCategoryShort=علامة / فئة الأعضاء 
+SuppliersCategoriesShort=علامات / فئات الموردون 
+CustomersCategoriesShort=علامات / فئات العملاء 
+ProspectsCategoriesShort=علامات/ فئات الاحتمال
+CustomersProspectsCategoriesShort=فئات عميل./احتمال.
+ProductsCategoriesShort=علامات / فئات المنتجات 
+MembersCategoriesShort=علامات / فئات الأعضاء 
+ContactCategoriesShort=علامات / فئات جهات الاتصال 
+AccountsCategoriesShort=علامات / فئات الحسابات 
+ProjectsCategoriesShort=علامات / فئات المشاريع 
+ThisCategoryHasNoProduct=لا تحتوي هذه الفئة على أي منتج.
 ThisCategoryHasNoSupplier=هذه الفئة لا تحتوي على أي مورد.
-ThisCategoryHasNoCustomer=هذه الفئة لا تحتوي على أي عميل.
-ThisCategoryHasNoMember=هذا التصنيف لا يحتوي على أي عضو.
-ThisCategoryHasNoContact=لا تحتوي هذه الفئة أي اتصال.
-ThisCategoryHasNoAccount=This category does not contain any account.
-ThisCategoryHasNoProject=This category does not contain any project.
-CategId=العلامة / فئة معرف
-CatSupList=قائمة المورد به / فئات
-CatCusList=قائمة العملاء / احتمال علامات / فئات
-CatProdList=قائمة منتجات العلامات / فئات
-CatMemberList=قائمة الأعضاء به / فئات
-CatContactList=قائمة الاتصال به / فئات
-CatSupLinks=الروابط بين الموردين والعلامات / فئات
-CatCusLinks=الروابط بين العملاء / آفاق والعلامات / فئات
-CatProdLinks=الروابط بين المنتجات / الخدمات والعلامات / فئات
-CatProJectLinks=Links between projects and tags/categories
-DeleteFromCat=إزالة من العلامات / فئة
-ExtraFieldsCategories=سمات التكميلية
-CategoriesSetup=الكلمات / فئات الإعداد
-CategorieRecursiv=الارتباط مع الوالد العلامة / فئة تلقائيا
-CategorieRecursivHelp=إذا تفعيلها، وربط المنتج أيضا إلى فئة الأم عند إضافة إلى فئة فرعية
-AddProductServiceIntoCategory=أضف التالي المنتج / الخدمة
-ShowCategory=مشاهدة العلامة / فئة
-ByDefaultInList=بشكل افتراضي في القائمة
+ThisCategoryHasNoCustomer=لا تحتوي هذه الفئة على أي عميل.
+ThisCategoryHasNoMember=لا تحتوي هذه الفئة على أي عضو.
+ThisCategoryHasNoContact=لا تحتوي هذه الفئة على أي جهة اتصال.
+ThisCategoryHasNoAccount=لا تحتوي هذه الفئة على أي حساب.
+ThisCategoryHasNoProject=لا تحتوي هذه الفئة على أي مشروع.
+CategId=معرف العلامة / الفئة 
+CatSupList=قائمة علامات / فئات المورد 
+CatCusList=قائمة  علامات / فئات العملاء / احتمال
+CatProdList=قائمة علامات / فئات المنتجات 
+CatMemberList=قائمة علامات / فئات الأعضاء 
+CatContactList=قائمة  اتصال العلامات / الفئات 
+CatSupLinks=الروابط بين الموردين والعلامات / الفئات
+CatCusLinks=الروابط بين العملاء / احتمال والعلامات / فئات
+CatProdLinks=الروابط بين المنتجات / الخدمات والعلامات / الفئات
+CatProJectLinks=الروابط بين المشاريع والعلامات / الفئات
+DeleteFromCat=إزالة من العلامة / الفئة
+ExtraFieldsCategories=سمات تكميلية
+CategoriesSetup=إعداد العلامات / الفئات 
+CategorieRecursiv=ربط مع العلامة / الفئة الاب تلقائيا
+CategorieRecursivHelp=إذا تم تنشيطها، فسيتم ربط المنتج أيضا بفئة الوالدين عند إضافتها إلى فئة فرعية
+AddProductServiceIntoCategory=أضف المنتج / الخدمة التالية
+ShowCategory=إظهار العلامة / الفئة
+ByDefaultInList=افتراضيا في القائمة
+ChooseCategory=Choose category
diff --git a/htdocs/langs/ar_SA/commercial.lang b/htdocs/langs/ar_SA/commercial.lang
index 7164821b081..fd39ed56f00 100644
--- a/htdocs/langs/ar_SA/commercial.lang
+++ b/htdocs/langs/ar_SA/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=إغلاق
 ActionAC_EMAILING=إرسال البريد الإلكتروني الجماعي
 ActionAC_COM=لكي ترسل عن طريق البريد
 ActionAC_SHIP=إرسال الشحن عن طريق البريد
-ActionAC_SUP_ORD=أرسل النظام المورد عن طريق البريد
-ActionAC_SUP_INV=إرسال فاتورة المورد عن طريق البريد
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=آخر
 ActionAC_OTH_AUTO=أحداث إدراجها تلقائيا
 ActionAC_MANUAL=أحداث إدراجها يدويا
diff --git a/htdocs/langs/ar_SA/companies.lang b/htdocs/langs/ar_SA/companies.lang
index 7d6b9857e4f..1e78a09fce3 100644
--- a/htdocs/langs/ar_SA/companies.lang
+++ b/htdocs/langs/ar_SA/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Are you sure you want to delete this contact and all inheri
 MenuNewThirdParty=طرف ثالث جديد
 MenuNewCustomer=عميل جديد
 MenuNewProspect=آفاق جديدة
-MenuNewSupplier=مورد جديد
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=فرد جديد
-NewCompany=الشركة الجديدة (آفاق ، والعملاء ، والموردين)
-NewThirdParty=طرف ثالث جديد (آفاق ، والعملاء ، والموردين)
-CreateDolibarrThirdPartySupplier=إنشاء طرف ثالث (المورد)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=إنشاء طرف ثالث
 CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=مجال التنقيب
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=آفاق
 ThirdPartyCustomers=العملاء
 ThirdPartyCustomersStats=العملاء
 ThirdPartyCustomersWithIdProf12=الزبائن ٪ أو ٪ ق ق
-ThirdPartySuppliers=الموردين
+ThirdPartySuppliers=Vendors
 ThirdPartyType=طرف ثالث من نوع
 Individual=فرد
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
@@ -77,11 +77,11 @@ Web=الويب
 Poste= موقف
 DefaultLang=اللغة افتراضيا
 VATIsUsed=Sales tax is used
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
-ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=اقتراحات
 OverAllOrders=أوامر
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=نوع RE
 TypeLocaltax2ES=IRPF نوع
 WrongCustomerCode=رمز غير صالح العملاء
-WrongSupplierCode=رمز المورد غير صالحة
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=العميل رمز النموذج
-SupplierCodeModel=المورد رمز النموذج
+SupplierCodeModel=Vendor code model
 Gencod=باركود
 ##### Professional ID #####
 ProfId1Short=الأستاذ معرف 1
@@ -267,7 +267,7 @@ Prospect=احتمال
 CustomerCard=بطاقة الزبون
 Customer=العميل
 CustomerRelativeDiscount=العميل الخصم النسبي
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=الخصم النسبي
 CustomerAbsoluteDiscountShort=مطلق الخصم
 CompanyHasRelativeDiscount=هذا العميل قد خصم <b>٪ ق ٪ ٪</b>
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this suppl
 CompanyHasNoAbsoluteDiscount=هذا العميل ليس الخصم الائتمان المتاح
 CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
 CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=بلا
 Supplier=المورد
 AddContact=إنشاء اتصال
@@ -304,13 +304,13 @@ DeleteACompany=حذف شركة
 PersonalInformations=البيانات الشخصية
 AccountancyCode=حساب محاسبي
 CustomerCode=رمز العميل
-SupplierCode=رمز المورد
+SupplierCode=Vendor code
 CustomerCodeShort=كود العميل
-SupplierCodeShort=كود المورد
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=شفرة الزبون ، فريدة من نوعها لجميع العملاء
-SupplierCodeDesc=رمز المورد ، وفريدة من نوعها لجميع الموردين
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=إذا كان الطرف الثالث هو عميل أو احتمال
-RequiredIfSupplier=إذا كان الطرف الثالث هو مورد
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=صحة تسيطر عليها وحدة
 ThisIsModuleRules=هذه هي قواعد لهذه الوحدة
 ProspectToContact=إمكانية الاتصال
@@ -338,7 +338,7 @@ MyContacts=اتصالاتي
 Capital=رأس المال
 CapitalOf=ق ٪ من رأس المال
 EditCompany=تحرير الشركة
-ThisUserIsNot=هذا المستخدم امر غير مطروح ، ولا مورد للعملاء
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=فحص
 VATIntraCheckDesc=الصلة <b>٪ ق</b> يسمح نسأل الأوروبي من ضريبة القيمة المضافة فاحص الخدمة. خارجي من خدمة الإنترنت ويلزم لهذه الخدمة في العمل.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -396,7 +396,7 @@ ImportDataset_company_4=Third parties/Sales representatives (Assign sales repres
 PriceLevel=مستوى الأسعار
 DeliveryAddress=عنوان التسليم
 AddAddress=أضف معالجة
-SupplierCategory=المورد الفئة
+SupplierCategory=Vendor category
 JuridicalStatus200=Independent
 DeleteFile=حذف الملفات
 ConfirmDeleteFile=هل أنت متأكد من أنك تريد حذف هذا الملف؟
@@ -406,7 +406,7 @@ FiscalYearInformation=معلومات عن السنة المالية
 FiscalMonthStart=ابتداء من شهر من السنة المالية
 YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
 YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
-ListSuppliersShort=قائمة الموردين
+ListSuppliersShort=List of vendors
 ListProspectsShort=قائمة التوقعات
 ListCustomersShort=قائمة العملاء
 ThirdPartiesArea=أطراف ثالثة، ومنطقة الاتصال
@@ -420,7 +420,7 @@ CurrentOutstandingBill=فاتورة المستحق حاليا
 OutstandingBill=ماكس. لمشروع قانون المتميز
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=عودة número مع الشكل nnnn - ٪ syymm الزبون ورمز وnnnn - ٪ syymm مورد للقانون حيث السنة هو السنة ، هو شهر ملم وnnnn هو تسلسل بلا كسر وعدم العودة إلى 0.
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=العميل / المورد مدونة مجانية. هذا القانون يمكن تعديلها في أي وقت.
 ManagingDirectors=مدير (ق) اسم (CEO، مدير، رئيس ...)
 MergeOriginThirdparty=تكرار طرف ثالث (طرف ثالث كنت ترغب في حذف)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/ar_SA/compta.lang b/htdocs/langs/ar_SA/compta.lang
index 2ae8fa1b8b5..532638e9fb7 100644
--- a/htdocs/langs/ar_SA/compta.lang
+++ b/htdocs/langs/ar_SA/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=HT المدفوعة
 VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
-VATSummary=Tax Balance
+VATSummary=Tax monthly
+VATBalance=Tax Balance
 VATPaid=Tax paid
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=المحاسبة / الخزانة المنطقة
 NewPayment=دفع جديدة
 Payments=المدفوعات
 PaymentCustomerInvoice=الزبون تسديد الفاتورة
-PaymentSupplierInvoice=دفع فاتورة المورد
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=اجتماعي / دفع الضرائب المالية
 PaymentVat=دفع ضريبة القيمة المضافة
 ListPayment=قائمة المدفوعات
 ListOfCustomerPayments=قائمة مدفوعات العملاء
-ListOfSupplierPayments=قائمة الموردين المدفوعات
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=تاريخ بداية الفترة
 DateEndPeriod=تاريخ انتهاء الفترة
 newLT1Payment=جديد الضريبية 2 الدفع
@@ -110,7 +111,7 @@ ShowVatPayment=وتظهر دفع ضريبة القيمة المضافة
 TotalToPay=على دفع ما مجموعه
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
 CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=الزبون. حساب. رمز
 SupplierAccountancyCodeShort=سوب. حساب. رمز
 AccountNumber=رقم الحساب
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=تقرير RE طرف ثالث
 LT2ReportByCustomersES=تقرير من قبل طرف ثالث IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=تقرير من ضريبة القيمة المضافة العملاء جمع ودفع
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Chart of accounts models
 Pcg_type=نوع PCG
 Pcg_subtype=PCG النوع الفرعي
 InvoiceLinesToDispatch=خطوط الفاتورة لارسال
-ByProductsAndServices=المنتجات والخدمات
+ByProductsAndServices=By product and service
 RefExt=المرجع الخارجي
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
 LinkedOrder=تصل إلى النظام
@@ -215,7 +218,8 @@ Mode1=طريقة 1
 Mode2=طريقة 2
 CalculationRuleDesc=لحساب مجموع الضريبة على القيمة المضافة، هناك طريقتين: <br> طريقة 1 والتقريب ضريبة القيمة المضافة في كل سطر، ثم ملخصا لها. <br> طريقة 2 يتم تلخيص كل ضريبة القيمة المضافة في كل سطر، ثم التقريب النتيجة. <br> النتيجة النهائية قد تختلف من بضعة سنتات. الوضع الافتراضي هو وضع <b>الصورة٪.</b>
 CalculationRuleDescSupplier=وفقا لالمورد، واختيار الطريقة المناسبة لتطبيق الحكم حساب نفسها والحصول على نفس النتيجة المتوقعة من المورد الخاص بك.
-TurnoverPerProductInCommitmentAccountingNotRelevant=تقرير دوران لكل منتج، وعند استخدام طريقة <b>المحاسبة النقدية</b> غير ذي صلة. متاح فقط هذا التقرير عند استخدام طريقة <b>المشاركة المحاسبة</b> (انظر إعداد وحدة المحاسبة).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=وضع الحساب
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=استنساخ ضريبة اجتماعية / مالية
 ConfirmCloneTax=تأكيد استنساخ ل/ دفع الضرائب المالية الاجتماعي
@@ -242,3 +246,10 @@ FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/ar_SA/dict.lang b/htdocs/langs/ar_SA/dict.lang
index 7ceb1dab05d..23ebe84ebba 100644
--- a/htdocs/langs/ar_SA/dict.lang
+++ b/htdocs/langs/ar_SA/dict.lang
@@ -5,7 +5,8 @@ CountryIT=ايطاليا
 CountryES=أسبانيا
 CountryDE=ألمانيا
 CountryCH=سويسرا
-CountryGB=بريطانيا العظمى
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=المملكة المتحدة
 CountryUK=المملكة المتحدة
 CountryIE=أيرلاندا
 CountryCN=الصين
diff --git a/htdocs/langs/ar_SA/ecm.lang b/htdocs/langs/ar_SA/ecm.lang
index 6605eb7cd51..708f22d5a09 100644
--- a/htdocs/langs/ar_SA/ecm.lang
+++ b/htdocs/langs/ar_SA/ecm.lang
@@ -39,9 +39,10 @@ ShowECMSection=وتظهر الدليل
 DeleteSection=إزالة الدليل
 ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
 ECMDirectoryForFiles=دليل النسبي للملفات
-CannotRemoveDirectoryContainsFiles=لا يمكن إزالتها لأنه يحتوي على بعض الملفات
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=مدير الملفات
-ECMSelectASection=اختر دليل على ترك شجرة...
+ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
diff --git a/htdocs/langs/ar_SA/errors.lang b/htdocs/langs/ar_SA/errors.lang
index a9e217aa0a1..4cf88cd6c6d 100644
--- a/htdocs/langs/ar_SA/errors.lang
+++ b/htdocs/langs/ar_SA/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=رمز شريط المطلوب
 ErrorCustomerCodeAlreadyUsed=الشفرة المستخدمة بالفعل العملاء
 ErrorBarCodeAlreadyUsed=الرمز الشريطي تستخدم بالفعل
 ErrorPrefixRequired=المطلوب ببادئة
-ErrorBadSupplierCodeSyntax=مورد سوء تركيب لمدونة
-ErrorSupplierCodeRequired=رمز المورد المطلوب
-ErrorSupplierCodeAlreadyUsed=الشفرة المستخدمة بالفعل مورد
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=بارامترات سيئة
 ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
 ErrorBadImageFormat=ملف الصورة لم تنسيق معتمد (PHP لديك لا يدعم وظائف لتحويل الصور من هذا الشكل)
@@ -87,7 +87,7 @@ ErrorsOnXLines=الأخطاء على خطوط مصدر <b>%s</b>
 ErrorFileIsInfectedWithAVirus=وكان برنامج مكافحة الفيروسات غير قادرة على التحقق من صحة الملف (ملف قد يكون مصابا بواسطة فيروس)
 ErrorSpecialCharNotAllowedForField=غير مسموح الأحرف الخاصة لحقل "%s"
 ErrorNumRefModel=إشارة إلى وجود قاعدة بيانات (%s) ، وغير متوافق مع هذه القاعدة الترقيم. سجل إزالة أو إعادة تسميته اشارة الى تفعيل هذه الوحدة.
-ErrorQtyTooLowForThisSupplier=كمية قليلة جدا لهذا المورد أو السعر لا تعرف عن هذا المنتج لهذا المورد
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=خطأ في قناع
 ErrorBadMaskFailedToLocatePosOfSequence=خطأ، من دون قناع رقم التسلسل
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=سيئة تعريف القائم
 ErrorSavingChanges=وقد ocurred لخطأ عند حفظ التغييرات
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
-ErrorSupplierCountryIsNotDefined=لهذا البلد المورد غير محدد. تصحيح هذا أولا.
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
diff --git a/htdocs/langs/ar_SA/install.lang b/htdocs/langs/ar_SA/install.lang
index 1c63a302a58..fa315b1a21c 100644
--- a/htdocs/langs/ar_SA/install.lang
+++ b/htdocs/langs/ar_SA/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=ملف الإعداد <b>%s</b> مفق
 ConfFileCouldBeCreated=يمكن إنشاء ملف الإعداد <b>%s</b>
 ConfFileIsNotWritable=لا يمكن الكتابة الى ملف الإعداد <b>%s</b>. تحقق من الصلاحيات. اذا كان هذا التنصيب هو الأول، تحقق من أن السيرفر قادر ولديه جميع صلاحيات الكتابة والقراءة خلال عملية التنصيب، مثال: (chmod 666) لمستخدمي سيرفرات يونكس.
 ConfFileIsWritable=ملف الإعداد <b>%s</b> قابل للكتابة.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=إعادة تحميل جميع المعلومات من ملف الإعداد.
 PHPSupportSessions=يدعم هذا الـ PHP ميزة الجلسات الزمنية.
 PHPSupportPOSTGETOk=يدعم هذا الـ PHP وظائف POST و GET.
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
 WarningRemoveInstallDir=تحذير ، لأسباب أمنية ، بعد تثبيت أو تحديث كاملة ، يجب إزالة <b>تثبيت أو إعادة تسمية الدليل على install.lock من أجل تجنب استخدام الخبيثة.</b>
 FunctionNotAvailableInThisPHP=لا تتوفر على هذا PHP
 ChoosedMigrateScript=اختار الهجرة سكريبت
-DataMigration=بيانات الهجرة
-DatabaseMigration=هيكل قاعدة بيانات الهجرة
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=السيناريو تجهيز
 ChooseYourSetupMode=اختر طريقة الإعداد وانقر على "ابدأ"...
 FreshInstall=تركيب جديد
@@ -146,7 +147,7 @@ NothingToDo=Nothing to do
 # upgrade
 MigrationFixData=إصلاح البيانات الذي لم تتم تسويته
 MigrationOrder=بيانات الهجرة طلبات الزبائن
-MigrationSupplierOrder=بيانات الهجرة من أجل الموردين أوامر
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=بيانات الهجرة لأغراض تجارية اقتراحات
 MigrationInvoice=بيانات الهجرة لعملاء الفواتير
 MigrationContract=بيانات الهجرة للحصول على عقود
@@ -196,6 +197,8 @@ MigrationEvents=الترحيل من الأحداث لإضافة مالك الح
 MigrationEventsContact=Migration of events to add event contact into assignement table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
 MigrationReloadModule=إعادة تحديث الوحدات %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 ShowNotAvailableOptions=عرض خيارات غير متوفرة
diff --git a/htdocs/langs/ar_SA/ldap.lang b/htdocs/langs/ar_SA/ldap.lang
index 7d81c8673fc..6b6c34bdba7 100644
--- a/htdocs/langs/ar_SA/ldap.lang
+++ b/htdocs/langs/ar_SA/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=كلمة السر لالنطاق
 YouMustChangePassNextLogon=كلمة السر للمستخدم <b>٪</b> على النطاق <b>ق ق ٪</b> ويجب أن يتغير.
 UserMustChangePassNextLogon=يجب على المستخدم تغيير كلمة المرور على المجال ق ٪
 LDAPInformationsForThisContact=المعلومات في قاعدة البيانات LDAP لهذا الاتصال
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Member type synchronized
 ContactSynchronized=وتزامن الاتصال
 ForceSynchronize=واكبت قوة Dolibarr --> LDAP
 ErrorFailedToReadLDAP=فشل في قراءة قاعدة البيانات LDAP. LDAP وحدة التحقق من الإعداد ، وإمكانية الوصول إلى قاعدة البيانات.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/ar_SA/loan.lang b/htdocs/langs/ar_SA/loan.lang
index 8953f884b1b..4238a5d7c23 100644
--- a/htdocs/langs/ar_SA/loan.lang
+++ b/htdocs/langs/ar_SA/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=عاصمة
 Insurance=تأمين
 Interest=اهتمام
 Nbterms=عدد من المصطلحات
+Term=Term
 LoanAccountancyCapitalCode=Accounting account capital
 LoanAccountancyInsuranceCode=Accounting account insurance
 LoanAccountancyInterestCode=Accounting account interest
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=تأكيد حذف هذا القرض
 LoanDeleted=بنجاح قرض محذوفة
 ConfirmPayLoan=تأكيد صنف دفع هذا القرض
 LoanPaid=القرض المدفوع
-# Calc
-LoanCalc=بنك القروض حاسبة
-PurchaseFinanceInfo=شراء وتمويل معلومات
-SalePriceOfAsset=بيع سعر الأصول
-PercentageDown=نسبة داون
-LengthOfMortgage=Duration of loan
-AnnualInterestRate=معدل الفائدة السنوي
-ExplainCalculations=شرح الحسابات
-ShowMeCalculationsAndAmortization=تدلني على الحسابات والإطفاء
-MortgagePaymentInformation=معلومات الرهن العقاري الدفع
-DownPayment=الدفعة الأولى
-DownPaymentDesc=<b>الدفعة</b> الأولى = سعر المنزل مضروبا في نسبة مقسمة بنسبة 100٪ (5٪ يصبح أسفل 5/100 أو 0.05)
-InterestRateDesc=<b>سعر</b> الفائدة = نسبة الفائدة السنوية مقسومة على 100
-MonthlyFactorDesc=<b>عامل الشهري</b> = ونتيجة الصيغة التالية
-MonthlyInterestRateDesc=<b>معدل الفائدة الشهرية</b> = معدل الفائدة السنوي مقسوما على 12 (لمدة 12 شهرا في السنة)
-MonthTermDesc=<b>على</b> المدى <b>شهر</b> القرض في أشهر = لعدد من السنوات كنت قد اتخذت القرض بها لمرة 12
-MonthlyPaymentDesc=وبرزت دفع أفضل نتيجة من استخدام الصيغة التالية
-AmortizationPaymentDesc=<a href="#amortization">والإطفاء</a> ينهار مقدار الدفع الشهري يذهب نحو مصلحة البنك، وكم يذهب إلى سداد أصل القرض الخاص بك.
-AmountFinanced=مبلغ التمويل
-AmortizationMonthlyPaymentOverYears=الإطفاء للدفع <b>الشهري:٪ الصورة</b> أكثر من٪ الصورة سنوات
-Totalsforyear=مجاميع العام
-MonthlyPayment=الدفع الشهري
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
-GoToInterest=٪ S سوف تذهب نحو الفائدة
-GoToPrincipal=٪ S سوف تذهب نحو PRINCIPAL
-YouWillSpend=You will spend %s in year %s
 ListLoanAssociatedProject=List of loan associated with the project
 AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=اهتمام
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=التكوين للقرض وحدة
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-FinancialCommitment=Financial commitment
 CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/langs/ar_SA/mails.lang b/htdocs/langs/ar_SA/mails.lang
index b6debd81eb6..999f52bddd4 100644
--- a/htdocs/langs/ar_SA/mails.lang
+++ b/htdocs/langs/ar_SA/mails.lang
@@ -11,7 +11,9 @@ MailFrom=مرسل
 MailErrorsTo=الأخطاء
 MailReply=وردا على
 MailTo=جهاز الاستقبال (ق)
+MailToUsers=To user(s)
 MailCC=نسخة إلى
+MailToCCUsers=Copy to users(s)
 MailCCC=نسخة إلى نسخة
 MailTopic=البريد الإلكتروني الموضوع
 MailText=رسالة
@@ -164,4 +166,4 @@ InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=معلومات
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang
index f3457f3dd39..9132bfe01c8 100644
--- a/htdocs/langs/ar_SA/main.lang
+++ b/htdocs/langs/ar_SA/main.lang
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is se
 Administrator=مدير
 Undefined=غير محدد
 PasswordForgotten=Password forgotten?
+NoAccount=No account?
 SeeAbove=أنظر فوق
 HomeArea=المنطقة الرئيسية
 LastConnexion=Latest connection
@@ -231,7 +232,7 @@ Limit=حد
 Limits=حدود
 Logout=تسجيل خروج
 NoLogoutProcessWithAuthMode=أي ميزة قطع تطبيقية مع وضع <b>المصادقة٪ الصورة</b>
-Connection=الاتصال
+Connection=تسجيل الدخول
 Setup=التثبيت
 Alert=إنذار
 MenuWarnings=تنبيهات
@@ -402,6 +403,7 @@ DefaultTaxRate=Default tax rate
 Average=متوسط
 Sum=مجموع
 Delta=دلتا
+RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=خيار
@@ -414,7 +416,7 @@ Favorite=المفضل
 ShortInfo=معلومات.
 Ref=المرجع.
 ExternalRef=المرجع. خارجي
-RefSupplier=المرجع. المورد
+RefSupplier=Ref. vendor
 RefPayment=المرجع. دفع
 CommercialProposalsShort=مقترحات تجارية
 Comment=التعليق
@@ -493,7 +495,7 @@ Received=تم الاستلام
 Paid=دفع
 Topic=الموضوع
 ByCompanies=من قبل أطراف ثالثة
-ByUsers=من قبل المستخدمين
+ByUsers=By user
 Links=الروابط
 Link=حلقة الوصل
 Rejects=ترفض
@@ -619,9 +621,9 @@ BuildDoc=بناء مستدات
 Entity=كيان
 Entities=الكيانات
 CustomerPreview=العميل معاينة
-SupplierPreview=المورد معاينة
+SupplierPreview=Vendor preview
 ShowCustomerPreview=وتبين للعملاء معاينة
-ShowSupplierPreview=وتظهر معاينة المورد
+ShowSupplierPreview=Show vendor preview
 RefCustomer=المرجع. العميل
 Currency=العملة
 InfoAdmin=معلومات للإداريين
@@ -679,7 +681,7 @@ Color=لون
 Documents=ربط الملفات
 Documents2=وثائق
 UploadDisabled=تحميل المعوقين
-MenuAccountancy=المحاسبة
+MenuAccountancy=محاسبة
 MenuECM=وثائق
 MenuAWStats=AWStats
 MenuMembers=أعضاء
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=المنتجات أو الخدمات
 SearchIntoProjects=مشاريع
 SearchIntoTasks=المهام
 SearchIntoCustomerInvoices=فواتير العملاء
-SearchIntoSupplierInvoices=فواتير الموردين
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=طلبات العملاء
-SearchIntoSupplierOrders=أوامر المورد
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=مقترحات العملاء
-SearchIntoSupplierProposals=مقترحات المورد
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=التدخلات
 SearchIntoContracts=عقود
 SearchIntoCustomerShipments=Customer shipments
@@ -941,3 +943,5 @@ Remote=Remote
 LocalAndRemote=Local and Remote
 KeyboardShortcut=Keyboard shortcut
 AssignedTo=مخصص ل
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/ar_SA/margins.lang b/htdocs/langs/ar_SA/margins.lang
index 294c0e77b08..a68c2b82ab9 100644
--- a/htdocs/langs/ar_SA/margins.lang
+++ b/htdocs/langs/ar_SA/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=كخدمة
 UseDiscountOnTotal=على المجموع الفرعي
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=يحدد ما إذا كان يتم التعامل مع الخصم العالمي كمنتج أو خدمة أو فقط على المجموع الفرعي لحساب الهامش.
 MARGIN_TYPE=سعر الشراء / التكلفة المقترحة افتراضيا لحساب الهامش
-MargeType1=هامش على أفضل سعر المورد
+MargeType1=Margin on Best vendor price
 MargeType2=الهامش على متوسط ​​السعر المرجح (واب)
 MargeType3=هامش على سعر التكلفة
-MarginTypeDesc=* سعر الهامش على أفضل سعر شراء = سعر البيع - أفضل سعر للمورد محدد على بطاقة المنتج <br> * هامش على متوسط ​​السعر المرجح (واب) = سعر البيع - متوسط ​​السعر المرجح للمنتج (واب) أو أفضل سعر للمورد إذا لم يتم تعريف واب بعد <br>* هامش على سعر التكلفة = سعر البيع - سعر التكلفة المحدد على بطاقة المنتج أو واب إذا لم يتم تحديد سعر التكلفة، أو أفضل سعر المورد إذا لم يتم تعريف واب حتى الآن
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=سعر الكلفة
 UnitCharges=رسوم الوحدة
 Charges=الرسوم
diff --git a/htdocs/langs/ar_SA/members.lang b/htdocs/langs/ar_SA/members.lang
index 021ca092cb8..4de188494a7 100644
--- a/htdocs/langs/ar_SA/members.lang
+++ b/htdocs/langs/ar_SA/members.lang
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
diff --git a/htdocs/langs/ar_SA/opensurvey.lang b/htdocs/langs/ar_SA/opensurvey.lang
index a09c0e8ca39..4e4a8b7419c 100644
--- a/htdocs/langs/ar_SA/opensurvey.lang
+++ b/htdocs/langs/ar_SA/opensurvey.lang
@@ -58,3 +58,4 @@ MoreChoices=إدخال المزيد من الخيارات للناخبين
 SurveyExpiredInfo=The poll has been closed or voting delay has expired.
 EmailSomeoneVoted=قد ملأت%s خط. يمكنك العثور على استطلاع الرأي الخاص بك على الرابط:٪ الصورة
 ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/ar_SA/orders.lang b/htdocs/langs/ar_SA/orders.lang
index 3875a844e5a..9c77740cfc2 100644
--- a/htdocs/langs/ar_SA/orders.lang
+++ b/htdocs/langs/ar_SA/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=أوامر منطقة العملاء
-SuppliersOrdersArea=الموردين أوامر المنطقة
+SuppliersOrdersArea=Purchase orders area
 OrderCard=من أجل بطاقة
 OrderId=رقم التعريف الخاص بالطلب
 Order=ترتيب
@@ -13,18 +13,18 @@ OrderToProcess=من أجل عملية
 NewOrder=النظام الجديد
 ToOrder=ومن أجل جعل
 MakeOrder=ومن أجل جعل
-SupplierOrder=من أجل المورد
-SuppliersOrders=الموردين أوامر
-SuppliersOrdersRunning=الحالية الموردين أوامر
-CustomerOrder=عملاء النظام
-CustomersOrders=طلبات العملاء
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=طلب العملاء
+CustomersOrders=طلبات الزبائن
 CustomersOrdersRunning=أوامر العملاء الحالية
 CustomersOrdersAndOrdersLines=طلبات العملاء وخطوط أجل
 OrdersDeliveredToBill=Customer orders delivered to bill
 OrdersToBill=تسليم أوامر العملاء
 OrdersInProcess=طلبات العملاء في عملية
 OrdersToProcess=طلبات العملاء لمعالجة
-SuppliersOrdersToProcess=أوامر المورد لمعالجة
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=ألغى
 StatusOrderDraftShort=مسودة
 StatusOrderValidatedShort=صادق
@@ -75,15 +75,15 @@ ShowOrder=وتبين من أجل
 OrdersOpened=أوامر لمعالجة
 NoDraftOrders=لا مشاريع المراسيم
 NoOrder=No order
-NoSupplierOrder=لا مورد طلبات
+NoSupplierOrder=No purchase order
 LastOrders=Latest %s customer orders
 LastCustomerOrders=Latest %s customer orders
-LastSupplierOrders=Latest %s supplier orders
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=Latest %s modified orders
 AllOrders=جميع أوامر
 NbOfOrders=عدد الأوامر
 OrdersStatistics=أوامر إحصاءات
-OrdersStatisticsSuppliers=المورد أوامر إحصاءات
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=عدد أوامر الشهر
 AmountOfOrdersByMonthHT=كمية أوامر من شهر (صافية من الضرائب)
 ListOfOrders=قائمة الأوامر
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</
 GenerateBill=توليد الفاتورة
 ClassifyShipped=تصنيف تسليمها
 DraftOrders=مشروع أوامر
-DraftSuppliersOrders=أوامر مشروع الموردين
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=على عملية أوامر
 RefOrder=المرجع. ترتيب
 RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for supplier
-RefOrderSupplierShort=Ref. order supplier
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=لكي ترسل عن طريق البريد
 ActionsOnOrder=إجراءات من أجل
 NoArticleOfTypeProduct=أي مادة من نوع 'منتج' حتى لا مادة للشحن لهذا النظام
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
 DispatchSupplierOrder=%s استقبال النظام مورد
 FirstApprovalAlreadyDone=الموافقة الأولى فعلت
 SecondApprovalAlreadyDone=الموافقة الثانية فعلت
-SupplierOrderReceivedInDolibarr=Supplier order %s received %s
-SupplierOrderSubmitedInDolibarr=Supplier order %s submited
-SupplierOrderClassifiedBilled=Supplier order %s set billed
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=أوامر أخرى
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=ممثل العميل متابعة النظام
@@ -125,11 +125,11 @@ 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_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=ممثل الشحن متابعة
-TypeContact_order_supplier_external_BILLING=المورد فاتورة الاتصال
-TypeContact_order_supplier_external_SHIPPING=المورد الشحن الاتصال
-TypeContact_order_supplier_external_CUSTOMER=المورد الاتصال أجل متابعة
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=لم تعرف COMMANDE_SUPPLIER_ADDON مستمر
 Error_COMMANDE_ADDON_NotDefined=لم تعرف COMMANDE_ADDON مستمر
 Error_OrderNotChecked=لا أوامر إلى فاتورة مختارة
diff --git a/htdocs/langs/ar_SA/other.lang b/htdocs/langs/ar_SA/other.lang
index ea66f672541..07748e6e4c9 100644
--- a/htdocs/langs/ar_SA/other.lang
+++ b/htdocs/langs/ar_SA/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=ملفات كبيرة جدا
 PleaseBePatient=يرجى التحلي بالصبر...
 NewPassword=New password
 ResetPassword=Reset password
-RequestToResetPasswordReceived=وقد وردت طلب لتغيير كلمة المرور الخاصة بك Dolibarr
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=هذا هو مفاتيح جديدة لتسجيل الدخول
 NewKeyWillBe=والمفتاح الجديد الخاص بك للدخول إلى برنامج يكون
 ClickHereToGoTo=انقر هنا للذهاب إلى٪ s
@@ -233,6 +233,8 @@ PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=صادرات المنطقة
 AvailableFormats=الأشكال المتاحة
diff --git a/htdocs/langs/ar_SA/productbatch.lang b/htdocs/langs/ar_SA/productbatch.lang
index fc34b3bd188..ed856843ff1 100644
--- a/htdocs/langs/ar_SA/productbatch.lang
+++ b/htdocs/langs/ar_SA/productbatch.lang
@@ -16,7 +16,7 @@ printEatby=تناول الطعام عن طريق:٪ الصورة
 printSellby=بيع عن طريق:٪ الصورة
 printQty=الكمية:٪ د
 AddDispatchBatchLine=إضافة سطر لالصلاحية إيفاد
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic increase/decrease stock mode is forced to shipping validate and manual dispatching for reception and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=هذا المنتج لا يستخدم الكثير / الرقم التسلسلي
 ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
diff --git a/htdocs/langs/ar_SA/products.lang b/htdocs/langs/ar_SA/products.lang
index 432876eb8df..3e68079c04e 100644
--- a/htdocs/langs/ar_SA/products.lang
+++ b/htdocs/langs/ar_SA/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=السعر الجديد
 MinPrice=سعر البيع
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=سعر البيع لا يمكن أن يكون أقل من الحد الأدنى المسموح لهذا المنتج (٪ ق بدون الضرائب)
 ContractStatusClosed=مغلق
 ErrorProductAlreadyExists=المنتج ذو المرجع %sموجود بالفعل.
@@ -155,7 +156,7 @@ BuyingPrices=شراء أسعار
 CustomerPrices=أسعار العميل
 SuppliersPrices=أسعار المورد
 SuppliersPricesOfProductsOrServices=أسعار المورد (منتجات أو خدمات)
-CustomCode=الجمارك/السلع /كود HS
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=بلد المنشأ
 Nature=طبيعة
 ShortLabel=التسمية قصيرة
diff --git a/htdocs/langs/ar_SA/projects.lang b/htdocs/langs/ar_SA/projects.lang
index a19286641e1..350872e741f 100644
--- a/htdocs/langs/ar_SA/projects.lang
+++ b/htdocs/langs/ar_SA/projects.lang
@@ -77,6 +77,7 @@ Time=وقت
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=قائمة المقترحات التجارية المرتبطة بالمشروع.
 ListOrdersAssociatedProject=List of customer orders associated with the project
@@ -226,4 +227,4 @@ AllowCommentOnProject=Allow user comments on projects
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/ar_SA/stocks.lang b/htdocs/langs/ar_SA/stocks.lang
index 82ff9e856b2..ba30a0bb167 100644
--- a/htdocs/langs/ar_SA/stocks.lang
+++ b/htdocs/langs/ar_SA/stocks.lang
@@ -203,3 +203,4 @@ RegulateStock=Regulate Stock
 ListInventory=قائمة
 StockSupportServices=Stock management support services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/ar_SA/stripe.lang b/htdocs/langs/ar_SA/stripe.lang
index 9e187dc0d78..2162529e9b8 100644
--- a/htdocs/langs/ar_SA/stripe.lang
+++ b/htdocs/langs/ar_SA/stripe.lang
@@ -58,8 +58,8 @@ NameOnCard=Name on card
 CardNumber=Card Number
 ExpiryDate=Expiry Date
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/ar_SA/supplier_proposal.lang b/htdocs/langs/ar_SA/supplier_proposal.lang
index 41c05085987..9f4b6cba259 100644
--- a/htdocs/langs/ar_SA/supplier_proposal.lang
+++ b/htdocs/langs/ar_SA/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=مقترحات التجارية المورد
-supplier_proposalDESC=إدارة طلبات السعر للموردين
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
 SupplierProposalNew=طلب السعر الجديد
 CommRequest=طلب السعر
 CommRequests=طلبات الأسعار
 SearchRequest=العثور على الطلب
 DraftRequests=مشروع طلبات
-SupplierProposalsDraft=Draft supplier proposals
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=Latest %s modified price requests
 RequestsOpened=طلبات السعر المفتوحة
-SupplierProposalArea=منطقة مقترحات المورد
-SupplierProposalShort=اقتراح المورد
-SupplierProposals=مقترحات المورد
-SupplierProposalsShort=مقترحات المورد
+SupplierProposalArea=Vendor proposals area
+SupplierProposalShort=Vendor proposal
+SupplierProposals=Vendor proposals
+SupplierProposalsShort=Vendor proposals
 NewAskPrice=طلب السعر الجديد
 ShowSupplierProposal=طلب عرض أسعار
 AddSupplierProposal=إنشاء طلب السعر
-SupplierProposalRefFourn=المورد المرجع
+SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=تاريخ التسليم او الوصول
 SupplierProposalRefFournNotice=قبل أن يغلق على "مقبول"، والتفكير لفهم الموردين المراجع.
 ConfirmValidateAsk=Are you sure you want to validate this price request under name <b>%s</b>?
@@ -47,9 +47,9 @@ CommercialAsk=طلب السعر
 DefaultModelSupplierProposalCreate=إنشاء نموذج افتراضي
 DefaultModelSupplierProposalToBill=القالب الافتراضي عند إغلاق طلب السعر (مقبول)
 DefaultModelSupplierProposalClosed=القالب الافتراضي عند إغلاق طلب السعر (رفض)
-ListOfSupplierProposals=قائمة الطلبات اقتراح المورد
-ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
-SupplierProposalsToClose=Supplier proposals to close
-SupplierProposalsToProcess=Supplier proposals to process
+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
diff --git a/htdocs/langs/ar_SA/suppliers.lang b/htdocs/langs/ar_SA/suppliers.lang
index 0691b7497d8..68a3ee5d152 100644
--- a/htdocs/langs/ar_SA/suppliers.lang
+++ b/htdocs/langs/ar_SA/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=الموردين
-SuppliersInvoice=فاتورة الموردين
-ShowSupplierInvoice=مشاهدة فاتورة المورد
-NewSupplier=مورد جديد
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=التاريخ
-ListOfSuppliers=قائمة الموردين
-ShowSupplier=وتظهر المورد
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=من أجل التاريخ
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=بعض المنتجات الفرعية التي لا تعرف السعر
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
-SupplierPrices=أسعار المورد
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=ويرتبط هذا المورد بالفعل مرجع مع مرجع : %s
-NoRecordedSuppliers=لم تسجل الموردين
-SupplierPayment=المورد الدفع
-SuppliersArea=الموردين المنطقة
-RefSupplierShort=المرجع. المورد
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=توفر
-ExportDataset_fournisseur_1=قائمة فواتير الموردين والفواتير 'خطوط
-ExportDataset_fournisseur_2=فواتير الموردين والمدفوعات
-ExportDataset_fournisseur_3=أوامر المورد وخطوط أجل
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=الموافقة على هذا النظام
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=إنكار هذا النظام
 ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
 ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
-AddSupplierOrder=من أجل إنشاء مورد
-AddSupplierInvoice=إنشاء مورد فاتورة
-ListOfSupplierProductForSupplier=قائمة المنتجات والأسعار لمورد <b>ق ٪</b>
-SentToSuppliers=أرسلت للموردين
-ListOfSupplierOrders=قائمة الطلبات المورد
-MenuOrdersSupplierToBill=أوامر مورد للفاتورة
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=تأخير التسليم في أيام
 DescNbDaysToDelivery=أكبر تسليم تأخير من المنتجات من هذا النظام
-SupplierReputation=Supplier reputation
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
 AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=أسعار المورد
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/ar_SA/website.lang b/htdocs/langs/ar_SA/website.lang
index caceee19920..0b9bd8ad92c 100644
--- a/htdocs/langs/ar_SA/website.lang
+++ b/htdocs/langs/ar_SA/website.lang
@@ -73,7 +73,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
diff --git a/htdocs/langs/ar_SA/workflow.lang b/htdocs/langs/ar_SA/workflow.lang
index b7d00832f8a..46316c36c49 100644
--- a/htdocs/langs/ar_SA/workflow.lang
+++ b/htdocs/langs/ar_SA/workflow.lang
@@ -1,20 +1,20 @@
 # Dolibarr language file - Source file is en_US - workflow
-WorkflowSetup=سير العمل وحدة الإعداد
-WorkflowDesc=تم تصميم هذه الوحدة لتعديل السلوك من الإجراءات الآلية إلى التطبيق. افتراضيا، سير العمل مفتوح (يمكنك أن تفعل أشياء في النظام الذي تريد). يمكنك تفعيل الإجراءات الآلية كنت مهتما في.
-ThereIsNoWorkflowToModify=لا يوجد أي تعديلات سير العمل المتاحة مع وحدات تفعيلها.
+WorkflowSetup=إعداد وحدة تدفق العمل
+WorkflowDesc=تم تصميم هذه الوحدة لتعديل سلوك الإجراءات التلقائية إلى التطبيق. افتراضيا، سير العمل مفتوح (يمكنك القيام بالأشياء بالترتيب الذي تريده). يمكنك تفعيل الإجراءات التلقائية التي تهمك.
+ThereIsNoWorkflowToModify=لا توجد تعديلات على سير العمل متوفرة مع الوحدات النشطة.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed (new order will have same amount than proposal)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (new invoice will have same amount than proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=إنشاء طلب عميل تلقائيا بعد التوقيع على اقتراح تجاري (سيكون الطلب الجديد بنفس المبلغ من الاقتراح)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=إنشاء فاتورة العملاء تلقائيا بعد التوقيع على اقتراح تجاري (سيكون للفاتورة الجديدة نفس المبلغ من الاقتراح)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=إنشاء فاتورة العميل تلقائيا بعد التحقق من صحة العقد
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed (new invoice will have same amount than order)
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=إنشاء فاتورة العميل تلقائيا بعد إغلاق طلب العميل (فاتورة جديدة سيكون لها نفس المبلغ من النظام)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer order is set to billed (and if amount of the order is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=تصنيف اقتراح (مقترحات) المصدر المرتبط بالفوترة عند تعيين طلب العميل على الفاتورة (وإذا كان مقدار الطلب هو نفسه من إجمالي مبلغ الاقتراحات المرتبطة التي تم توقيعها)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=تصنيف مقترح (مقترحات) المصدر المرتبط بالفوترة عندما يتم التحقق من صحة فاتورة العميل (وإذا كان مبلغ الفاتورة هو نفسه من إجمالي مبلغ الاقتراحات المرتبطة التي تم توقيعها)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=تصنيف طلب (أوامر) العميل المصدر المرتبط بالفوترة عندما يتم التحقق من صحة فاتورة العميل (وإذا كان مبلغ الفاتورة هو نفسه من إجمالي مبلغ الطلبات المرتبطة)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=تصنيف طلب (أوامر) العميل المصدر المرتبط إلى الفاتورة عندما يتم تعيين فاتورة العميل على الدفع (وإذا كان مبلغ الفاتورة هو نفسه من إجمالي مبلغ الطلبات المرتبطة)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=تصنيف مرتبط النظام العميل المصدر لشحنها عندما يتم التحقق من صحة الشحنة (وإذا الكمية التي يتم شحنها من قبل جميع الشحنات هو نفسه كما في الأمر لتحديث)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
-AutomaticCreation=Automatic creation
-AutomaticClassification=Automatic classification
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+AutomaticCreation=إنشاء تلقائي
+AutomaticClassification=التصنيف التلقائي
diff --git a/htdocs/langs/bg_BG/accountancy.lang b/htdocs/langs/bg_BG/accountancy.lang
index 56dcc576180..5788216eae0 100644
--- a/htdocs/langs/bg_BG/accountancy.lang
+++ b/htdocs/langs/bg_BG/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Accounting
 ACCOUNTING_EXPORT_SEPARATORCSV=Разделител за колона за експорт на файл
 ACCOUNTING_EXPORT_DATE=Формат на дата за експорт на файл
 ACCOUNTING_EXPORT_PIECE=Експортирай номера от частта
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Accounts with non zero values
 ListOfAccounts=List of accounts
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers 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
 
-AccountancyArea=Accountancy area
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
 AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
@@ -89,7 +90,7 @@ MenuProductsAccounts=Product accounts
 ProductsBinding=Products accounts
 Ventilation=Binding to accounts
 CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Supplier invoice binding
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
 ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
@@ -185,11 +187,12 @@ ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
-DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Group of account
 Pcgsubtype=Subgroup of account
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
 ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
 DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report 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 fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Възникна грешка, вие не можете да изтриете тази счетоводна сметка, защото се използва.
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -293,4 +296,9 @@ Binded=Lines bound
 ToBind=Lines to bind
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang
index 9e9ce88cd40..4921e23d3e8 100644
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/htdocs/langs/bg_BG/admin.lang
@@ -3,8 +3,8 @@ Foundation=Организация
 Version=Версия
 Publisher=Publisher
 VersionProgram=Версия на програмата
-VersionLastInstall=Initial install version
-VersionLastUpgrade=Latest version upgrade
+VersionLastInstall=Първоначално инсталирана версия
+VersionLastUpgrade=Версия на последния ъпгрейд
 VersionExperimental=Експериментален
 VersionDevelopment=Разработка
 VersionUnknown=Неизвестен
@@ -29,7 +29,7 @@ SessionId=ID на сесията
 SessionSaveHandler=Handler за да запазите сесията
 SessionSavePath=Място за съхранение на сесията
 PurgeSessions=Изчистване на сесиите
-ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
+ConfirmPurgeSessions=Сигурни ли сте, че желаете да изчистите всички сесии? Това ще прекъсне всички потребители (освен Вас).
 NoSessionListWithThisHandler=Запиши сесиен манипулатор конфигурирани във вашата PHP, не позволява да се изброят всички текущи сесии.
 LockNewSessions=Заключване за нови свързвания
 ConfirmLockNewSessions=Сигурни ли сте, че желаете да ограничите всяка нова връзка Dolibarr за себе си. Само <b>%s</b> потребителят ще бъде в състояние да се свърже след това.
@@ -107,7 +107,7 @@ MenuIdParent=ID майка меню
 DetailMenuIdParent=ID на основното меню (0 за горното меню)
 DetailPosition=Брой Сортиране, за да определи позицията на менюто
 AllMenus=Всички
-NotConfigured=Module/Application not configured
+NotConfigured=Модула не е конфигуриран
 Active=Активен
 SetupShort=Настройки
 OtherOptions=Други опции
@@ -128,13 +128,13 @@ CurrentHour=Час на PHP (сървър)
 CurrentSessionTimeOut=Продължителност на текущата сесия
 YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
 HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
-Box=Widget
-Boxes=Widgets
-MaxNbOfLinesForBoxes=Max number of lines for widgets
+Box=Джаджа
+Boxes=Джаджи
+MaxNbOfLinesForBoxes=Максимален брой на редовете за джаджи
 AllWidgetsWereEnabled=All available widgets are enabled
 PositionByDefault=Default order
 Position=Длъжност
-MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
+MenusDesc=Мениджърите на менюто определят дали съдържанието на двете ленти с менюта (хоризонтална лента и вертикална лента).
 MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br>Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
 MenuForUsers=Меню за потребители
 LangFile=.lang файл
@@ -144,12 +144,12 @@ SystemToolsArea=Системни инструменти
 SystemToolsAreaDesc=Тук се предоставят административни функции. Използвайте менюто за да изберете функцията която търсите.
 Purge=Изчистване
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
-PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
+PurgeDeleteLogFile=Изтриване на лог файлове <b>%s,</b> избрани за Syslog модуля (няма риск от загуба на данни)
+PurgeDeleteTemporaryFiles=Изтриване на всички временни файлове (няма риск от загуба на данни)
 PurgeDeleteTemporaryFilesShort=Изтрий временните файлове
 PurgeDeleteAllFilesInDocumentsDir=Изтриване на всички файлове в директорията <b>%s.</b> Временни файлове, но също така и резервната база данни сметища, файлове, прикрепени към елементи (контрагенти, фактури, ...) и качени в модул ECM ще бъдат изтрити.
 PurgeRunNow=Изчистване сега
-PurgeNothingToDelete=No directory or files to delete.
+PurgeNothingToDelete=Няма директория или файлове за изтриване.
 PurgeNDirectoriesDeleted=<b>%s</b> изтрити файлове или директории.
 PurgeNDirectoriesFailed=Failed to delete <b>%s</b> files or directories.
 PurgeAuditEvents=Поръси всички събития по сигурността
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Хост (По подразбиране в php.
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Порт (Не дефиниран в PHP на Unix подобни системи)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Хост (Не дефиниран в PHP на Unix подобни системи)
 MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= Изпрати систематично скрит въглероден копие на всички изпратени имейли
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=Метод за изпращане на имейли
 MAIN_MAIL_SMTPS_ID=SMTP ID, ако разпознаване, изискван
 MAIN_MAIL_SMTPS_PW=SMTP парола, ако разпознаване, изискван
@@ -291,7 +292,7 @@ ModuleSetup=Настройки на модул
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=Система
 ModuleFamilyCrm=Управление на Връзки с клиенти (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Управление на продукти
 ModuleFamilyHr=Управление на човешките ресурси
 ModuleFamilyProjects=Проекти / съвместна работа
@@ -373,7 +374,8 @@ NoSmsEngine=Не изпращач мениджър SMS на разположен
 PDF=PDF
 PDFDesc=Можете да настроите всеки глобални опции, свързани към PDF поколение
 PDFAddressForging=Правила за изграждането на адрес кутии
-HideAnyVATInformationOnPDF=Скриване на цялата информация, свързана с ДДС върху генерирани PDF
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=Скриване на продуктите описание на генерирани PDF
@@ -445,7 +447,8 @@ DisplayCompanyInfo=Display company address
 DisplayCompanyManagers=Display manager names
 DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party 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.
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Set this to 1 if you want to attach main document to emai
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=Потребители и групи
 Module0Desc=Users / Employees and Groups management
@@ -479,7 +485,7 @@ Module1Desc=Фирми и управление на контакти
 Module2Name=Търговски
 Module2Desc=Търговско управление
 Module10Name=Счетоводство
-Module10Desc=Simple управленско счетоводство (фактура и заплащане експедиция)
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=Предложения
 Module20Desc=Търговско предложение управление
 Module22Name=Масови имейли
@@ -546,8 +552,8 @@ Module400Name=Проекти/Възможности
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar интеграция
-Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Payment of employee wages
 Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
@@ -561,14 +567,14 @@ Module700Name=Дарения
 Module700Desc=Управление на дарения
 Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=Богомолка
 Module1200Desc=Mantis интеграция
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
 Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=WYSIWYG редактор
 Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
 Module2200Name=Dynamic Prices
@@ -576,7 +582,7 @@ Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Планирани задачи
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API services (Web services SOAP)
@@ -613,7 +619,7 @@ Module50100Desc=Point of sales module (POS).
 Module50200Name=Paypal
 Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Poll, Survey or Vote
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=Толерантност закъснение (в дн
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Толерантност закъснение (в дни), преди сигнал за проверки депозит
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=Другите записи от менюто управляват допълнителни параметри.
 LogEvents=Събития одит на сигурността
 Audit=Проверка
@@ -1054,8 +1060,9 @@ LogEventDesc=Можете да разрешите тук сеч за събит
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Информационна система Разни техническа информация можете да получите в режим само за четене и видими само за администратори.
 SystemAreaForAdminOnly=Тази област е достъпна само за администратори. Никой не може да промени това ограничение.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=От тук можете да изберете параметрите свързани с външния вид на Dolibar
 AvailableModules=Available app/modules
 ToActivateModule=За да активирате модули, отидете на настройка пространство (Начало-> Setup-> модули).
@@ -1188,11 +1195,11 @@ UserMailRequired=Задължително е въвеждането на име
 HRMSetup=HRM module setup
 ##### Company setup #####
 CompanySetup=Фирми модул за настройка
-CompanyCodeChecker=Модул за контрагенти за генериране на кода и проверка (клиент или доставчик)
-AccountCodeManager=Module for accounting code generation (customer or supplier)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
 NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
 ModelModules=Документи шаблони
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
@@ -1203,6 +1210,9 @@ MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
 TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=За износ на линк към <b>%s</b> формат е на разположение на следния линк: %s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=Свободен текст на търговски пр
 WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
 ##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Питане за Складов източник за поръчка
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=Настройки за управление на поръчки
 OrdersNumberingModules=Поръчки номериране модули
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=Връзка към &quot;%s&quot; сървър на &quot;%s&q
 OSCommerceTestKo1=Свързване към сървър &quot;%s успее, но база данни&quot; %s &quot;не може да бъде постигнато.
 OSCommerceTestKo2=Връзка към сървъра &quot;%s&quot; с потребителя %s &quot;се провали.
 ##### Stock #####
-StockSetup=Warehouse module setup
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
 ##### Menu #####
 MenuDeleted=Меню заличават
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
 MultiCompanySetup=Multi-модул за настройка компания
 ##### Suppliers #####
 SuppliersSetup=Настройка доставчик модул
-SuppliersCommandModel=Пълна шаблон на доставчика за (logo. ..)
-SuppliersInvoiceModel=Пълна образец на фактура на доставчика (logo. ..)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","
 SalariesSetup=Setup of module salaries
 SortOrder=Sort order
 Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Install of external module from applic
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Цвят за подчертаване на линията, когато мишката мине отгоре (оставете празно за без подчертаване)
-TextTitleColor=Цвят на заглавието на страницата
+TextTitleColor=Text color of Page title
 LinkColor=Цвят на връзките
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=Background color for Top menu
 TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
 ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-MailToMember=To send email from member page
-MailToUser=To send email from user page
-MailToProject= To send email from project page
+MailToSendProposal=Клиентски предложения
+MailToSendOrder=Клиентски поръчки
+MailToSendInvoice=Клиентски фактури
+MailToSendShipment=Превозите
+MailToSendIntervention=Намеси
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Договори
+MailToThirdparty=Контрагенти
+MailToMember=Членове
+MailToUser=Потребители
+MailToProject=Projects page
 ByDefaultInList=Показване по подразбиране при показа на списък
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1780,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/bg_BG/bills.lang b/htdocs/langs/bg_BG/bills.lang
index 1cc890e3ca9..e27546b1ff5 100644
--- a/htdocs/langs/bg_BG/bills.lang
+++ b/htdocs/langs/bg_BG/bills.lang
@@ -109,7 +109,7 @@ CancelBill=Отказване на фактура
 SendRemindByMail=Изпращане на напомняне по имейл
 DoPayment=Enter payment
 DoPaymentBack=Enter refund
-ConvertToReduc=Конвертиране в бъдеще отстъпка
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Въведете плащане получено от клиент
@@ -120,7 +120,7 @@ BillStatus=Статус на фактурата
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Чернова (трябва да се валидира)
 BillStatusPaid=Платена
-BillStatusPaidBackOrConverted=Credit note refund or converted into discount
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Изоставена
 BillStatusValidated=Валидирана (трябва да се плати)
@@ -296,10 +296,10 @@ DiscountType=Discount type
 NoteReason=Бележка/Причина
 ReasonDiscount=Причина
 DiscountOfferedBy=Предоставено от
-DiscountStillRemaining=Discounts available
-DiscountAlreadyCounted=Discounts already consumed
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+SupplierDiscounts=Vendors discounts
 BillAddress=Фактурен адрес
 HelpEscompte=Тази отстъпка е предоставена на клиента, тъй като плащането е извършено преди срока.
 HelpAbandonBadCustomer=Тази сума е изоставена (клиентът се оказва лош клиент) и се счита като извънредна загуба.
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Every %s days
 FrequencyPer_m=Every %s months
 FrequencyPer_y=Every %s years
@@ -505,9 +511,14 @@ SituationAmount=Сума за ситуационна фактура (нето)
 SituationDeduction=Ситуационно изваждане
 ModifyAllLines=Промени всички линии
 CreateNextSituationInvoice=Създай следваща ситуация
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=Следваща ситуация вече съществува.
 DisabledBecauseFinal=Тази ситуация е финална.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=Н
 CantBeLessThanMinPercent=Прогресът не може да бъде по-малък от стойността в предишната ситуация.
 NoSituations=Няма отворени ситуации
 InvoiceSituationLast=Последна и обща фактура
@@ -532,3 +543,4 @@ AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/bg_BG/cashdesk.lang b/htdocs/langs/bg_BG/cashdesk.lang
index df0bd291455..6360f3557ed 100644
--- a/htdocs/langs/bg_BG/cashdesk.lang
+++ b/htdocs/langs/bg_BG/cashdesk.lang
@@ -14,7 +14,7 @@ ShoppingCart=Кошница
 NewSell=Нова продажба
 AddThisArticle=Добави артикула
 RestartSelling=Обратно към продажбите
-SellFinished=Sale complete
+SellFinished=Продажбата завършена
 PrintTicket=Отпечатване на билет
 NoProductFound=Няма открит артикул
 ProductFound=открит продукт
@@ -25,7 +25,7 @@ Difference=Разлика
 TotalTicket=Общо билет
 NoVAT=Без ДДС за тази продажба
 Change=Превишение получи
-BankToPay=Account for payment
+BankToPay=Акаунт за плащане
 ShowCompany=Покажи фирмата
 ShowStock=Покажи склад
 DeleteArticle=Кликнете, за да се премахне тази статия
diff --git a/htdocs/langs/bg_BG/categories.lang b/htdocs/langs/bg_BG/categories.lang
index 5ccd6ad0a34..7b13818275f 100644
--- a/htdocs/langs/bg_BG/categories.lang
+++ b/htdocs/langs/bg_BG/categories.lang
@@ -16,7 +16,7 @@ MembersCategoriesArea=Зона етикети/категории Членове
 ContactsCategoriesArea=Зона етикети/категории Контакти
 AccountsCategoriesArea=Accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
-SubCats=Подкатегории
+SubCats=Sub-categories
 CatList=Списък на етикети/категории
 NewCategory=Нов етикет/категория
 ModifCat=Редактиране етикет/категория
@@ -85,3 +85,4 @@ CategorieRecursivHelp=Ако е активирано, продукта ще бъ
 AddProductServiceIntoCategory=Добавяне на следния продукт/услуга
 ShowCategory=Показване на етикет/категория
 ByDefaultInList=По подразбиране в списък
+ChooseCategory=Choose category
diff --git a/htdocs/langs/bg_BG/commercial.lang b/htdocs/langs/bg_BG/commercial.lang
index 62f67cb1c2e..a84beabe02f 100644
--- a/htdocs/langs/bg_BG/commercial.lang
+++ b/htdocs/langs/bg_BG/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=Близо
 ActionAC_EMAILING=Изпращане на масов имейл
 ActionAC_COM=Изпратете заявка на клиента по пощата
 ActionAC_SHIP=Изпрати доставка по пощата
-ActionAC_SUP_ORD=Изпращане на доставчика за по пощата
-ActionAC_SUP_INV=Изпращане на доставчика фактура по пощата
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=Друг
 ActionAC_OTH_AUTO=Автоматично добавени
 ActionAC_MANUAL=Ръчно добавени
diff --git a/htdocs/langs/bg_BG/companies.lang b/htdocs/langs/bg_BG/companies.lang
index a22dde5f8b1..d67da39c23a 100644
--- a/htdocs/langs/bg_BG/companies.lang
+++ b/htdocs/langs/bg_BG/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Are you sure you want to delete this contact and all inheri
 MenuNewThirdParty=Нов контрагент
 MenuNewCustomer=Нов клиент
 MenuNewProspect=Нов потенциален
-MenuNewSupplier=Нов доставчик
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=Ново физическо лице
-NewCompany=Нова фирма (потенциален, клиент, доставчик)
-NewThirdParty=Нов контрагент (потенциален, клиент, доставчик)
-CreateDolibarrThirdPartySupplier=Създаване на контрагент (доставчик)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=Създаване контрагент
 CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Област потенциални
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=Потенциални
 ThirdPartyCustomers=Клиенти
 ThirdPartyCustomersStats=Клиенти
 ThirdPartyCustomersWithIdProf12=Клиентите с %s или %s
-ThirdPartySuppliers=Доставчици
+ThirdPartySuppliers=Vendors
 ThirdPartyType=Вид на контрагент
 Individual=Частно лице
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
@@ -77,11 +77,11 @@ Web=Уеб
 Poste= Позиция
 DefaultLang=Език по подразбиране
 VATIsUsed=Sales tax is used
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
-ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Предложения
 OverAllOrders=Поръчки
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=RE тип
 TypeLocaltax2ES=IRPF тип
 WrongCustomerCode=Невалиден код на клиент
-WrongSupplierCode=Невалиден код на доставчик
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Образец на код на клиент
-SupplierCodeModel=Образец на код на доставчик
+SupplierCodeModel=Vendor code model
 Gencod=Бар код
 ##### Professional ID #####
 ProfId1Short=Проф. номер 1
@@ -267,7 +267,7 @@ Prospect=Потенциален
 CustomerCard=Клиентска карта
 Customer=Клиент
 CustomerRelativeDiscount=Относителна клиентска отстъпка
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=Относителна отстъпка
 CustomerAbsoluteDiscountShort=Абсолютна отстъпка
 CompanyHasRelativeDiscount=Този клиент има по подразбиране отстъпка <b>%s%%</b>
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this suppl
 CompanyHasNoAbsoluteDiscount=Този клиент не разполага с наличен кредит за отстъпка
 CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
 CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=Няма
 Supplier=Доставчик
 AddContact=Създай контакт
@@ -304,13 +304,13 @@ DeleteACompany=Изтриване на фирма
 PersonalInformations=Лични данни
 AccountancyCode=Accounting account
 CustomerCode=Код на клиент
-SupplierCode=Код на доставчик
+SupplierCode=Vendor code
 CustomerCodeShort=Код на клиента
-SupplierCodeShort=Код на доставчика
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=Потребителски код, уникален за всички клиенти
-SupplierCodeDesc=Код на доставчик, уникален за всички доставчици
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=Изисква се, ако контрагентът е клиент или потенциален
-RequiredIfSupplier=Изисква се, ако контрагентът е доставчик
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=Валидност контролирана от модул
 ThisIsModuleRules=Това са правила за този модул
 ProspectToContact=Потенциален за контакт
@@ -338,7 +338,7 @@ MyContacts=Моите контакти
 Capital=Капитал
 CapitalOf=Столица на %s
 EditCompany=Редактиране на фирма
-ThisUserIsNot=Този потребител не е потенциален, клиенти или доставчик
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=Проверка
 VATIntraCheckDesc=Връзката <b>%s</b> позволява да се попита Европейската служба за проверка на ДДС. Външен достъп до интернет от сървъра се изисква за тази услуга, за да работи.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -396,7 +396,7 @@ ImportDataset_company_4=Third parties/Sales representatives (Assign sales repres
 PriceLevel=Ценово ниво
 DeliveryAddress=Адрес за доставка
 AddAddress=Добавяне на адрес
-SupplierCategory=Категория на доставчик
+SupplierCategory=Vendor category
 JuridicalStatus200=Independent
 DeleteFile=Изтриване на файл
 ConfirmDeleteFile=Сигурен ли сте, че искате да изтриете този файл?
@@ -406,7 +406,7 @@ FiscalYearInformation=Информация за фискалната годин
 FiscalMonthStart=Начален месец на фискалната година
 YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
 YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
-ListSuppliersShort=Списък на доставчиците
+ListSuppliersShort=List of vendors
 ListProspectsShort=Списък на потенциални
 ListCustomersShort=Списък на клиенти
 ThirdPartiesArea=Контрагенти и контакти
@@ -420,7 +420,7 @@ CurrentOutstandingBill=Текуща висяща сметка
 OutstandingBill=Макс. за висяща сметка
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=Кодът е безплатен. Този код може да бъде променен по всяко време.
 ManagingDirectors=Име на управител(и) (гл. изп. директор, директор, президент...)
 MergeOriginThirdparty=Дублиращ контрагент (контрагентът, който искате да изтриете)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/bg_BG/compta.lang b/htdocs/langs/bg_BG/compta.lang
index b8e3848cfec..8a6c0373d23 100644
--- a/htdocs/langs/bg_BG/compta.lang
+++ b/htdocs/langs/bg_BG/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=Нето платени
 VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
-VATSummary=Tax Balance
+VATSummary=Tax monthly
+VATBalance=Tax Balance
 VATPaid=Tax paid
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=Секция Счетоводство/ценности
 NewPayment=Ново плащане
 Payments=Плащания
 PaymentCustomerInvoice=Плащане на продажна фактура
-PaymentSupplierInvoice=Плащане доставна фактура
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=Плащането на ДДС
 ListPayment=Списък на плащанията
 ListOfCustomerPayments=Списък на клиентски плащания
-ListOfSupplierPayments=Списък на доставчика плащания
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -110,7 +111,7 @@ ShowVatPayment=Покажи плащане на ДДС
 TotalToPay=Всичко за плащане
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
 CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
 SupplierAccountancyCodeShort=Sup. account. code
 AccountNumber=Номер на сметка
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Доклад от контрагент IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Chart of accounts models
 Pcg_type=PCG тип
 Pcg_subtype=PCG подтип
 InvoiceLinesToDispatch=Invoice lines to dispatch
-ByProductsAndServices=By products and services
+ByProductsAndServices=By product and service
 RefExt=External ref
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
 LinkedOrder=Link to order
@@ -215,7 +218,8 @@ Mode1=Method 1
 Mode2=Method 2
 CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
 CalculationRuleDescSupplier=According to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
@@ -242,3 +246,10 @@ FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/bg_BG/dict.lang b/htdocs/langs/bg_BG/dict.lang
index 7bdcf00f8e3..366391943a4 100644
--- a/htdocs/langs/bg_BG/dict.lang
+++ b/htdocs/langs/bg_BG/dict.lang
@@ -5,7 +5,8 @@ CountryIT=Италия
 CountryES=Испания
 CountryDE=Германия
 CountryCH=Швейцария
-CountryGB=Великобритания
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=Обединено Кралство
 CountryUK=Обединено Кралство
 CountryIE=Ирландия
 CountryCN=Китай
diff --git a/htdocs/langs/bg_BG/ecm.lang b/htdocs/langs/bg_BG/ecm.lang
index 34be247f00d..d3101db381e 100644
--- a/htdocs/langs/bg_BG/ecm.lang
+++ b/htdocs/langs/bg_BG/ecm.lang
@@ -39,9 +39,10 @@ ShowECMSection=Покажи директория
 DeleteSection=Изтриване на директория
 ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
 ECMDirectoryForFiles=Относителна директория за файловете
-CannotRemoveDirectoryContainsFiles=Премахването не е възможно, защото съдържа файлове
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=Файлов мениджър
-ECMSelectASection=Изберете директория от лявото дърво ...
+ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
diff --git a/htdocs/langs/bg_BG/errors.lang b/htdocs/langs/bg_BG/errors.lang
index df9bf2472c3..7e5702e9aed 100644
--- a/htdocs/langs/bg_BG/errors.lang
+++ b/htdocs/langs/bg_BG/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Бар код е задължителен
 ErrorCustomerCodeAlreadyUsed=Клиентът код вече се използва
 ErrorBarCodeAlreadyUsed=Бар кодът вече се използва
 ErrorPrefixRequired=Префикс изисква
-ErrorBadSupplierCodeSyntax=Bad синтаксис за код на доставчика
-ErrorSupplierCodeRequired=Доставчик изисква код
-ErrorSupplierCodeAlreadyUsed=Доставчик код вече се използва
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Лошите параметри
 ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
 ErrorBadImageFormat=Файлът на изображението е с неподържан формат (Вашето PHP не поддържа фукции за конвертиране на изображения от този формат)
@@ -87,7 +87,7 @@ ErrorsOnXLines=Грешки на <b>%s</b> изходни линии
 ErrorFileIsInfectedWithAVirus=Антивирусна програма не е в състояние да валидира файла (файл може да бъде заразен с вирус)
 ErrorSpecialCharNotAllowedForField=Специални знаци не са разрешени за полето &quot;%s&quot;
 ErrorNumRefModel=Позоваване съществува в база данни (%s) и не е съвместим с това правило за номериране. Премахване на запис или преименува препратка към активира този модул.
-ErrorQtyTooLowForThisSupplier=Количество твърде ниска за този доставчик или няма цена, определена за този продукт на този доставчик
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Грешка на маска
 ErrorBadMaskFailedToLocatePosOfSequence=Грешка, маска без поредния номер
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
-ErrorSupplierCountryIsNotDefined=Не е определено на страната на доставчика. Корекция на щепсела.
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
diff --git a/htdocs/langs/bg_BG/hrm.lang b/htdocs/langs/bg_BG/hrm.lang
index 7b12c7d818b..068752cfd2f 100644
--- a/htdocs/langs/bg_BG/hrm.lang
+++ b/htdocs/langs/bg_BG/hrm.lang
@@ -1,16 +1,16 @@
 # Dolibarr language file - en_US - hrm
 # Admin
-HRM_EMAIL_EXTERNAL_SERVICE=Email to prevent HRM external service
+HRM_EMAIL_EXTERNAL_SERVICE=Изпрати Email за да предупредиш външната услуга ЧР
 Establishments=Обекти
 Establishment=Обект
 NewEstablishment=Нов обект
 DeleteEstablishment=Изтриване на обект
-ConfirmDeleteEstablishment=Are-you sure to delete this establishment?
+ConfirmDeleteEstablishment=Сигурни ли сте, че искате да изтриете този обект?
 OpenEtablishment=Отвори обект
 CloseEtablishment=Затвори обект
 # Dictionary
-DictionaryDepartment=HRM - Department list
-DictionaryFunction=HRM - Function list
+DictionaryDepartment=ЧР - Списък с отдели
+DictionaryFunction=ЧР - Списък с функции
 # Module
 Employees=Служители
 Employee=Служител
diff --git a/htdocs/langs/bg_BG/install.lang b/htdocs/langs/bg_BG/install.lang
index 183ae0384f5..e4ad15fe34a 100644
--- a/htdocs/langs/bg_BG/install.lang
+++ b/htdocs/langs/bg_BG/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=Конфигурационния фа
 ConfFileCouldBeCreated=Конфигурационния файл <b>%s</b> може да бъде създаден.
 ConfFileIsNotWritable=<b>%s</b> конфигурационен файл е без права за запис. Проверете правата. При първа инсталация, вашия уеб сървър трябва да бъде настроен с права за запис в този файл по време на процеса на конфигуриране (&quot;chmod 666&quot; за пример на Unix подобна операционна система).
 ConfFileIsWritable=Конфигурационния файл <b>%s</b> е с права за писане.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Презареждане на цялата информация от конфигурационния файл.
 PHPSupportSessions=PHP поддържа сесии.
 PHPSupportPOSTGETOk=PHP поддържа променливи POST и GET.
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
 WarningRemoveInstallDir=Внимание, от съображения за сигурност, след като ведъж инсталирането или надграждането завърши, за да се избегне ново използване на инструментите за инсталиране, трябва да добавите файл наречен <b>install.lock</b> в директорията с документи на Dolibarr, за да се избегне злонамерена употреба.
 FunctionNotAvailableInThisPHP=Не е наличено за това PHP
 ChoosedMigrateScript=Изберете скрипт за миграция
-DataMigration=Миграция на данните
-DatabaseMigration=Миграция на структурата на базата данни
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Скрипта обработва
 ChooseYourSetupMode=Изберете режим на настройка и кликнете върху "Начало"...
 FreshInstall=Нова инсталация
@@ -146,7 +147,7 @@ NothingToDo=Nothing to do
 # upgrade
 MigrationFixData=Корекция на denormalized данни
 MigrationOrder=Миграция на данни за поръчки от клиенти
-MigrationSupplierOrder=Миграция на данни за поръчки към доставчик
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Миграция на данни за оферти
 MigrationInvoice=Миграция на данни за фактури за клиенти
 MigrationContract=Миграция на данни за договори
@@ -196,6 +197,8 @@ MigrationEvents=Миграция на събития за добавяне на
 MigrationEventsContact=Migration of events to add event contact into assignement table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
 MigrationReloadModule=Презареждане на модула %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 ShowNotAvailableOptions=Показване на недостъпните опции
diff --git a/htdocs/langs/bg_BG/ldap.lang b/htdocs/langs/bg_BG/ldap.lang
index 53391ce57ee..2ac38f0824c 100644
--- a/htdocs/langs/bg_BG/ldap.lang
+++ b/htdocs/langs/bg_BG/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Парола за домейн
 YouMustChangePassNextLogon=Парола за потребителски <b>%s</b> за домейна <b>%s</b> трябва да бъдат променени.
 UserMustChangePassNextLogon=Потребителят трябва да смени паролата на домейна %s
 LDAPInformationsForThisContact=Информация в LDAP база данни за този контакт
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Member type synchronized
 ContactSynchronized=Свържи се синхронизират
 ForceSynchronize=Force синхронизиране Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Неуспех при четенето на LDAP база данни. Проверете LDAP модул за настройка и достъпността на базата данни.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/bg_BG/loan.lang b/htdocs/langs/bg_BG/loan.lang
index 1fead286203..81bbc28a904 100644
--- a/htdocs/langs/bg_BG/loan.lang
+++ b/htdocs/langs/bg_BG/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=Капитал
 Insurance=Застраховка
 Interest=Лихва
 Nbterms=Number of terms
+Term=Term
 LoanAccountancyCapitalCode=Accounting account capital
 LoanAccountancyInsuranceCode=Accounting account insurance
 LoanAccountancyInterestCode=Accounting account interest
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=Потвърдете изтриването на този за
 LoanDeleted=Заемът е изтрит успешно
 ConfirmPayLoan=Confirm classify paid this loan
 LoanPaid=Заем Платен
-# Calc
-LoanCalc=Калкулатор Банкови Заеми
-PurchaseFinanceInfo=Покупна и Финансова Информация
-SalePriceOfAsset=Продажна цена на Актив
-PercentageDown=Процетна Вноска
-LengthOfMortgage=Duration of loan
-AnnualInterestRate=Годишна Лихвена Тарифа
-ExplainCalculations=Обясняване на изчисленията
-ShowMeCalculationsAndAmortization=Покажате ми изчисленията и сумата за погашение
-MortgagePaymentInformation=Информация за Плащане на Ипотека
-DownPayment=Вноска
-DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
-InterestRateDesc=<b>Лихвената тарифа</b> = Годишният лихвен процент разделен на 100
-MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
-MonthlyInterestRateDesc=<b>Месечната лихвена тарифа</b> = Годишната лихвена тарифа разделена на 12 (за 12-те месеца в година)
-MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
-MonthlyPaymentDesc=Месечното плащане е базирано на следната формула
-AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
-AmountFinanced=Сума на финансиране
-AmortizationMonthlyPaymentOverYears=Сума за погасяване при Месечно Плащане: <b>%s</b> за %s години
-Totalsforyear=Totals for year
-MonthlyPayment=Месечно Плащане
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
-GoToInterest=%s ще върви към ЛИХВАТА
-GoToPrincipal=%s ще върви към ГЛАВНИЦАТА
-YouWillSpend=You will spend %s in year %s
 ListLoanAssociatedProject=List of loan associated with the project
 AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Лихва
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=Конфигурация на модула заем
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-FinancialCommitment=Financial commitment
 CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/langs/bg_BG/mails.lang b/htdocs/langs/bg_BG/mails.lang
index 09fc6466251..f5609b5498a 100644
--- a/htdocs/langs/bg_BG/mails.lang
+++ b/htdocs/langs/bg_BG/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Подател
 MailErrorsTo=Грешки до
 MailReply=Отговор на
 MailTo=Получател (и)
+MailToUsers=To user(s)
 MailCC=Копие до
+MailToCCUsers=Copy to users(s)
 MailCCC=Кеширано копие до
 MailTopic=Тема на имейла
 MailText=Съобщение
@@ -164,4 +166,4 @@ InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Информация
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/bg_BG/main.lang b/htdocs/langs/bg_BG/main.lang
index d63f97d916c..8dca6ff8c6d 100644
--- a/htdocs/langs/bg_BG/main.lang
+++ b/htdocs/langs/bg_BG/main.lang
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is se
 Administrator=Администратор
 Undefined=Неопределен
 PasswordForgotten=Password forgotten?
+NoAccount=No account?
 SeeAbove=Виж по-горе
 HomeArea=Начало
 LastConnexion=Latest connection
@@ -231,7 +232,7 @@ Limit=Лимит
 Limits=Лимити
 Logout=Изход
 NoLogoutProcessWithAuthMode=Не се прилага функция за изключване на връзката с режима за удостоверяване <b>%s</b>
-Connection=Вход
+Connection=Влизане
 Setup=Настройки
 Alert=Предупреждение
 MenuWarnings=Сигнали
@@ -402,6 +403,7 @@ DefaultTaxRate=Default tax rate
 Average=Средно
 Sum=Сума
 Delta=Делта
+RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Опция
@@ -414,7 +416,7 @@ Favorite=Любими
 ShortInfo=Инфо
 Ref=Код
 ExternalRef=Код външен
-RefSupplier=Код доставчик
+RefSupplier=Ref. vendor
 RefPayment=Код плащане
 CommercialProposalsShort=Търговски предложения
 Comment=Коментар
@@ -493,7 +495,7 @@ Received=Получено
 Paid=Платено
 Topic=Тема
 ByCompanies=По контрагенти
-ByUsers=По потребители
+ByUsers=By user
 Links=Връзки
 Link=Връзка
 Rejects=Откази
@@ -619,9 +621,9 @@ BuildDoc=Създай Doc
 Entity=Субект
 Entities=Субекти
 CustomerPreview=Преглед на клиент
-SupplierPreview=Преглед на доставчик
+SupplierPreview=Vendor preview
 ShowCustomerPreview=Покажи преглед на клиента
-ShowSupplierPreview=Покажи преглед на доставчика
+ShowSupplierPreview=Show vendor preview
 RefCustomer=Код клиент
 Currency=Валута
 InfoAdmin=Информация за администратори
@@ -679,7 +681,7 @@ Color=Цвят
 Documents=Свързани файлове
 Documents2=Документи
 UploadDisabled=Качването е деактивирано
-MenuAccountancy=Счетоводство
+MenuAccountancy=Accounting
 MenuECM=Документи
 MenuAWStats=AWStats
 MenuMembers=Членове
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=Продукти или услуги
 SearchIntoProjects=Проекти
 SearchIntoTasks=Задачи
 SearchIntoCustomerInvoices=Клиентски фактури
-SearchIntoSupplierInvoices=Фактури доставчици
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Клиентски поръчки
-SearchIntoSupplierOrders=Поръчки доставчици
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=Клиентски предложения
-SearchIntoSupplierProposals=Предложения доставчици
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Намеси
 SearchIntoContracts=Договори
 SearchIntoCustomerShipments=Customer shipments
@@ -941,3 +943,5 @@ Remote=Remote
 LocalAndRemote=Local and Remote
 KeyboardShortcut=Keyboard shortcut
 AssignedTo=Възложено на
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/bg_BG/margins.lang b/htdocs/langs/bg_BG/margins.lang
index 5ee0eeaeaeb..09789443a91 100644
--- a/htdocs/langs/bg_BG/margins.lang
+++ b/htdocs/langs/bg_BG/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=Като услуга
 UseDiscountOnTotal=On subtotal
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
 MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best supplier price
+MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Cost price
 UnitCharges=Unit charges
 Charges=Charges
diff --git a/htdocs/langs/bg_BG/members.lang b/htdocs/langs/bg_BG/members.lang
index 5077d468551..996d98e4d40 100644
--- a/htdocs/langs/bg_BG/members.lang
+++ b/htdocs/langs/bg_BG/members.lang
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
diff --git a/htdocs/langs/bg_BG/opensurvey.lang b/htdocs/langs/bg_BG/opensurvey.lang
index 712f45d26ab..9a08ed868ad 100644
--- a/htdocs/langs/bg_BG/opensurvey.lang
+++ b/htdocs/langs/bg_BG/opensurvey.lang
@@ -58,3 +58,4 @@ MoreChoices=Въведете повече възможности за избор
 SurveyExpiredInfo=The poll has been closed or voting delay has expired.
 EmailSomeoneVoted=%s е попълнил ред.\nМожете да намерите вашата анкета на линка:\n%s
 ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/bg_BG/orders.lang b/htdocs/langs/bg_BG/orders.lang
index d8908c7d548..3ab9c072594 100644
--- a/htdocs/langs/bg_BG/orders.lang
+++ b/htdocs/langs/bg_BG/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Секция за поръчки от клиенти
-SuppliersOrdersArea=Секция за поръчки към доставчици
+SuppliersOrdersArea=Purchase orders area
 OrderCard=Карта за поръчка
 OrderId=Поръчка Id
 Order=Поръчка
@@ -13,10 +13,10 @@ OrderToProcess=Поръчка за обработка
 NewOrder=Нова поръчка
 ToOrder=Направи поръчка
 MakeOrder=Направите поръчка
-SupplierOrder=Поръчка към доставчик
-SuppliersOrders=Поръчки към доставчици
-SuppliersOrdersRunning=Доставчика за поръчки
-CustomerOrder=Поръчка от клиент
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=Поръчка на клиента
 CustomersOrders=Поръчки от клиенти
 CustomersOrdersRunning=Текущи поръчки от клиенти
 CustomersOrdersAndOrdersLines=Поръчки от клиенти и редове от поръчки
@@ -24,7 +24,7 @@ OrdersDeliveredToBill=Customer orders delivered to bill
 OrdersToBill=Поръчки от клиенти доставени
 OrdersInProcess=Поръчки от клиенти в изпълнение
 OrdersToProcess=Поръчки от клиенти за изпълнение
-SuppliersOrdersToProcess=Поръчки от доставчици за изпълнение
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=Отменен
 StatusOrderDraftShort=Чернова
 StatusOrderValidatedShort=Валидиран
@@ -75,15 +75,15 @@ ShowOrder=Покажи поръчка
 OrdersOpened=Поръчки за обработка
 NoDraftOrders=Няма поръчки чернови
 NoOrder=No order
-NoSupplierOrder=Няма поръчка доставчик
+NoSupplierOrder=No purchase order
 LastOrders=Latest %s customer orders
 LastCustomerOrders=Latest %s customer orders
-LastSupplierOrders=Latest %s supplier orders
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=Latest %s modified orders
 AllOrders=Всички поръчки
 NbOfOrders=Брой на поръчките
 OrdersStatistics=Поръчка статистически данни
-OrdersStatisticsSuppliers=Доставчик реда статистика
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Брой на поръчки по месец
 AmountOfOrdersByMonthHT=Сума на поръчки по месец (без данък)
 ListOfOrders=Списък на поръчките
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</
 GenerateBill=Генерирай фактура
 ClassifyShipped=Класифицирай доставени
 DraftOrders=Поръчки чернови
-DraftSuppliersOrders=Чернови поръчки доставчици
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=Поръчки в изпълнение
 RefOrder=Реф. поръчка
 RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for supplier
-RefOrderSupplierShort=Ref. order supplier
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=Изпрати поръчката с имейл
 ActionsOnOrder=Събития по поръчката
 NoArticleOfTypeProduct=Няма артикул от тип 'продукт', така че няма артикули годни за доставка по тази поръчка
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
 DispatchSupplierOrder=Получаване поръчка от доставчик %s
 FirstApprovalAlreadyDone=Първо одобрение вече е направено
 SecondApprovalAlreadyDone=Второ одобрение вече е направено
-SupplierOrderReceivedInDolibarr=Supplier order %s received %s
-SupplierOrderSubmitedInDolibarr=Supplier order %s submited
-SupplierOrderClassifiedBilled=Supplier order %s set billed
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Други поръчки
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Представител проследява поръчка на клиент
@@ -125,11 +125,11 @@ 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_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Представител проследява доставка
-TypeContact_order_supplier_external_BILLING=Контакт на доставчик по фактура
-TypeContact_order_supplier_external_SHIPPING=Контакт на доставчик по доставка
-TypeContact_order_supplier_external_CUSTOMER=Контакт на доставчик по поръчка
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
 Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
 Error_OrderNotChecked=No orders to invoice selected
diff --git a/htdocs/langs/bg_BG/other.lang b/htdocs/langs/bg_BG/other.lang
index 2f2e1937780..eaa3d68553d 100644
--- a/htdocs/langs/bg_BG/other.lang
+++ b/htdocs/langs/bg_BG/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=Файлът е твърде голям
 PleaseBePatient=Моля, бъдете търпеливи...
 NewPassword=New password
 ResetPassword=Reset password
-RequestToResetPasswordReceived=Получена е заявка за промяна на вашата парола за достъп
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=Това е вашият нов ключ за влизане
 NewKeyWillBe=Вашият нов ключ за влизане в софтуера ще бъде
 ClickHereToGoTo=Кликнете тук, за да отидете на %s
@@ -233,6 +233,8 @@ PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=Секция за експорт
 AvailableFormats=Налични формати
diff --git a/htdocs/langs/bg_BG/productbatch.lang b/htdocs/langs/bg_BG/productbatch.lang
index 02be9951ab3..bb75ac9dfa0 100644
--- a/htdocs/langs/bg_BG/productbatch.lang
+++ b/htdocs/langs/bg_BG/productbatch.lang
@@ -16,7 +16,7 @@ printEatby=Eat-by: %s
 printSellby=Sell-by: %s
 printQty=Кол: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic increase/decrease stock mode is forced to shipping validate and manual dispatching for reception and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
 ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
diff --git a/htdocs/langs/bg_BG/products.lang b/htdocs/langs/bg_BG/products.lang
index 4e57b45fc4f..06ba0644129 100644
--- a/htdocs/langs/bg_BG/products.lang
+++ b/htdocs/langs/bg_BG/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=Нова цена
 MinPrice=Мин. продажна цена
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=Продажната цена не може да бъде по-ниска от максимално допустимата за този продукт (%s без ДДС). Това съобщение може да се появи, ако въведете твърде важна отстъпка.
 ContractStatusClosed=Затворен
 ErrorProductAlreadyExists=Вече съществува продукт с референция %s .
@@ -155,7 +156,7 @@ BuyingPrices=Buying prices
 CustomerPrices=Продажни цени
 SuppliersPrices=Доставни цени
 SuppliersPricesOfProductsOrServices=Цени на доставчика (за продукти или услуги)
-CustomCode=Customs/Commodity/HS code
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=Държава на произход
 Nature=Същност
 ShortLabel=Кратък етикет
diff --git a/htdocs/langs/bg_BG/projects.lang b/htdocs/langs/bg_BG/projects.lang
index 4cccbdb804e..01ddfb33433 100644
--- a/htdocs/langs/bg_BG/projects.lang
+++ b/htdocs/langs/bg_BG/projects.lang
@@ -77,6 +77,7 @@ Time=Време
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=Списък на търговските предложения, свързани с проекта
 ListOrdersAssociatedProject=List of customer orders associated with the project
@@ -226,4 +227,4 @@ AllowCommentOnProject=Allow user comments on projects
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/bg_BG/stocks.lang b/htdocs/langs/bg_BG/stocks.lang
index 451da0c98a2..35e49ba56f0 100644
--- a/htdocs/langs/bg_BG/stocks.lang
+++ b/htdocs/langs/bg_BG/stocks.lang
@@ -203,3 +203,4 @@ RegulateStock=Regulate Stock
 ListInventory=Списък
 StockSupportServices=Stock management support services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/bg_BG/stripe.lang b/htdocs/langs/bg_BG/stripe.lang
index c79261165d3..539c7930538 100644
--- a/htdocs/langs/bg_BG/stripe.lang
+++ b/htdocs/langs/bg_BG/stripe.lang
@@ -58,8 +58,8 @@ NameOnCard=Name on card
 CardNumber=Card Number
 ExpiryDate=Expiry Date
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/bg_BG/supplier_proposal.lang b/htdocs/langs/bg_BG/supplier_proposal.lang
index 5e1ed1c7151..556bdb3f02c 100644
--- a/htdocs/langs/bg_BG/supplier_proposal.lang
+++ b/htdocs/langs/bg_BG/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Търговски предложения от доставчици
-supplier_proposalDESC=Управление на запитвания за цени към доставчици
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
 SupplierProposalNew=Ново запитване за цена
 CommRequest=Запитване за цена
 CommRequests=Запитвания за цени
 SearchRequest=Намиране на запитване
 DraftRequests=Чернови на запитвания
-SupplierProposalsDraft=Draft supplier proposals
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=Latest %s modified price requests
 RequestsOpened=Отваряне на запитване за цена
-SupplierProposalArea=Зона предложения от доставчици
-SupplierProposalShort=Предложение от доставчик
-SupplierProposals=Предложения доставчици
-SupplierProposalsShort=Предложения доставчици
+SupplierProposalArea=Vendor proposals area
+SupplierProposalShort=Vendor proposal
+SupplierProposals=Vendor proposals
+SupplierProposalsShort=Vendor proposals
 NewAskPrice=Ново запитване за цена
 ShowSupplierProposal=Показване на запитване за цена
 AddSupplierProposal=Създаване на запитване за цена
-SupplierProposalRefFourn=Доставчик реф.
+SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=Дата на доставка
 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>?
@@ -47,9 +47,9 @@ CommercialAsk=Запитване за цена
 DefaultModelSupplierProposalCreate=Създаване на модел по подразбиране
 DefaultModelSupplierProposalToBill=Шаблон по подразбиране, когато се затваря запитване за цена (прието)
 DefaultModelSupplierProposalClosed=Шаблон по подразбиране, когато се затваря запитване за цена (отказано)
-ListOfSupplierProposals=Списък на запитвания за цени към доставчици
-ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
-SupplierProposalsToClose=Supplier proposals to close
-SupplierProposalsToProcess=Supplier proposals to process
+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
diff --git a/htdocs/langs/bg_BG/suppliers.lang b/htdocs/langs/bg_BG/suppliers.lang
index 8e14bb78484..4096355bcb8 100644
--- a/htdocs/langs/bg_BG/suppliers.lang
+++ b/htdocs/langs/bg_BG/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Доставчици
-SuppliersInvoice=Фактура
-ShowSupplierInvoice=Показване на фактура на доставчик
-NewSupplier=Нов доставчик
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=Исторически
-ListOfSuppliers=Списък на доставчиците
-ShowSupplier=Вижте доставчик
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=Дата на поръчката
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Някои под-продукти нямата определена цена
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
-SupplierPrices=Доставни цени
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Този референтен доставчик вече е свързана с референтното: %s
-NoRecordedSuppliers=Не регистриран доставчик
-SupplierPayment=Доставчика на платежни услуги
-SuppliersArea=Space доставчици
-RefSupplierShort=Не. снабдител
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=Наличност
-ExportDataset_fournisseur_1=Фактури и фактура линии
-ExportDataset_fournisseur_2=Фактури и наредби
-ExportDataset_fournisseur_3=Поръчки към доставчици и линии на поръчки
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=Одобряване на поръчката
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Отхвърляне на тази поръчка
 ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
 ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
-AddSupplierOrder=Създаване на поръчка за покупка
-AddSupplierInvoice=Създаване на фактура
-ListOfSupplierProductForSupplier=Списък на доставчици на стоки и цени <b>%s</b>
-SentToSuppliers=Изпратено към доставчици
-ListOfSupplierOrders=Списък на нарежданията за доставчика
-MenuOrdersSupplierToBill=Поръчки на доставчика за фактуриране
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Закъснение на доставка в дни
 DescNbDaysToDelivery=Най-голямото закъснение на доставка за продукти от тази поръчка
-SupplierReputation=Supplier reputation
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
 AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=Доставни цени
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/bg_BG/website.lang b/htdocs/langs/bg_BG/website.lang
index 4e2478533be..ab283f62b5f 100644
--- a/htdocs/langs/bg_BG/website.lang
+++ b/htdocs/langs/bg_BG/website.lang
@@ -73,7 +73,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
diff --git a/htdocs/langs/bg_BG/workflow.lang b/htdocs/langs/bg_BG/workflow.lang
index 6f8869f8e98..ac65d1382f2 100644
--- a/htdocs/langs/bg_BG/workflow.lang
+++ b/htdocs/langs/bg_BG/workflow.lang
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Класифицирай въ
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Класифицирай свързаната клиентска поръчка/поръчки като платена, когато фактурата е маркирана като платена (ако стойността на фактурата е същата, като на вързаната поръчка)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=Автоматично създаване
 AutomaticClassification=Автоматично класифициране
diff --git a/htdocs/langs/bn_BD/accountancy.lang b/htdocs/langs/bn_BD/accountancy.lang
index c37db78c215..daa15928096 100644
--- a/htdocs/langs/bn_BD/accountancy.lang
+++ b/htdocs/langs/bn_BD/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Accounting
 ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
 ACCOUNTING_EXPORT_DATE=Date format for export file
 ACCOUNTING_EXPORT_PIECE=Export the number of piece
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Accounts with non zero values
 ListOfAccounts=List of accounts
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers 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
 
-AccountancyArea=Accountancy area
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
 AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
@@ -89,7 +90,7 @@ MenuProductsAccounts=Product accounts
 ProductsBinding=Products accounts
 Ventilation=Binding to accounts
 CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Supplier invoice binding
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
 ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
@@ -185,11 +187,12 @@ ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
-DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Group of account
 Pcgsubtype=Subgroup of account
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
 ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
 DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report 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 fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -293,4 +296,9 @@ Binded=Lines bound
 ToBind=Lines to bind
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/bn_BD/admin.lang b/htdocs/langs/bn_BD/admin.lang
index fed6af9a6fa..28eb076c540 100644
--- a/htdocs/langs/bn_BD/admin.lang
+++ b/htdocs/langs/bn_BD/admin.lang
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems)
 MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=Method to use to send EMails
 MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
 MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
@@ -291,7 +292,7 @@ ModuleSetup=Module setup
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projects/Collaborative work
@@ -373,7 +374,8 @@ NoSmsEngine=No SMS sender manager available. SMS sender manager are not installe
 PDF=PDF
 PDFDesc=You can set each global options related to the PDF generation
 PDFAddressForging=Rules to forge address boxes
-HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=Hide products description on generated PDF
@@ -445,7 +447,8 @@ DisplayCompanyInfo=Display company address
 DisplayCompanyManagers=Display manager names
 DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party 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.
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Set this to 1 if you want to attach main document to emai
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -479,7 +485,7 @@ Module1Desc=Companies and contact management (customers, prospects...)
 Module2Name=Commercial
 Module2Desc=Commercial management
 Module10Name=Accounting
-Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching.
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=Proposals
 Module20Desc=Commercial proposal management
 Module22Name=Mass E-mailings
@@ -546,8 +552,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
-Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Payment of employee wages
 Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
@@ -561,14 +567,14 @@ Module700Name=Donations
 Module700Desc=Donation management
 Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Mantis integration
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
 Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
 Module2200Name=Dynamic Prices
@@ -576,7 +582,7 @@ Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Scheduled jobs
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API/Web services (SOAP server)
@@ -613,7 +619,7 @@ Module50100Desc=Point of sales module (POS).
 Module50200Name=Paypal
 Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Poll, Survey or Vote
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed memb
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=Other menu entries manage optional parameters.
 LogEvents=Security audit events
 Audit=Audit
@@ -1054,8 +1060,9 @@ LogEventDesc=You can enable here the logging for Dolibarr security events. Admin
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1188,11 +1195,11 @@ UserMailRequired=EMail required to create a new user
 HRMSetup=HRM module setup
 ##### Company setup #####
 CompanySetup=Companies module setup
-CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier)
-AccountCodeManager=Module for accounting code generation (customer or supplier)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
 NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
 ModelModules=Documents templates
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
@@ -1203,6 +1210,9 @@ MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
 TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=Free text on commercial proposals
 WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
 ##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=Order management setup
 OrdersNumberingModules=Orders numbering models
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe
 OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
 OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
 ##### Stock #####
-StockSetup=Warehouse module setup
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
 ##### Menu #####
 MenuDeleted=Menu deleted
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
 MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
 SuppliersSetup=Supplier module setup
-SuppliersCommandModel=Complete template of supplier order (logo...)
-SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","
 SalariesSetup=Setup of module salaries
 SortOrder=Sort order
 Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Install of external module from applic
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
-TextTitleColor=Color of page title
+TextTitleColor=Text color of Page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=Background color for Top menu
 TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
 ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-MailToMember=To send email from member page
-MailToUser=To send email from user page
-MailToProject= To send email from project page
+MailToSendProposal=Customer proposals
+MailToSendOrder=Customer orders
+MailToSendInvoice=Customer invoices
+MailToSendShipment=Shipments
+MailToSendIntervention=Interventions
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Contracts
+MailToThirdparty=Third parties
+MailToMember=Members
+MailToUser=Users
+MailToProject=Projects page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1780,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/bn_BD/bills.lang b/htdocs/langs/bn_BD/bills.lang
index 87122a4d31a..0984ddaf7ff 100644
--- a/htdocs/langs/bn_BD/bills.lang
+++ b/htdocs/langs/bn_BD/bills.lang
@@ -109,7 +109,7 @@ CancelBill=Cancel an invoice
 SendRemindByMail=Send reminder by EMail
 DoPayment=Enter payment
 DoPaymentBack=Enter refund
-ConvertToReduc=Convert into future discount
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
@@ -120,7 +120,7 @@ BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
 BillStatusPaid=Paid
-BillStatusPaidBackOrConverted=Refund or converted into discount
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Abandoned
 BillStatusValidated=Validated (needs to be paid)
@@ -296,10 +296,10 @@ DiscountType=Discount type
 NoteReason=Note/Reason
 ReasonDiscount=Reason
 DiscountOfferedBy=Granted by
-DiscountStillRemaining=Discounts available
-DiscountAlreadyCounted=Discounts already consumed
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+SupplierDiscounts=Vendors discounts
 BillAddress=Bill address
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Every %s days
 FrequencyPer_m=Every %s months
 FrequencyPer_y=Every %s years
@@ -505,9 +511,14 @@ SituationAmount=Situation invoice amount(net)
 SituationDeduction=Situation subtraction
 ModifyAllLines=Modify all lines
 CreateNextSituationInvoice=Create next situation
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=S
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
 NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
@@ -532,3 +543,4 @@ AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/bn_BD/categories.lang b/htdocs/langs/bn_BD/categories.lang
index 721f6779124..8ce44b06dbc 100644
--- a/htdocs/langs/bn_BD/categories.lang
+++ b/htdocs/langs/bn_BD/categories.lang
@@ -16,7 +16,7 @@ MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
-SubCats=Subcategories
+SubCats=Sub-categories
 CatList=List of tags/categories
 NewCategory=New tag/category
 ModifCat=Modify tag/category
@@ -85,3 +85,4 @@ CategorieRecursivHelp=If activated, product will also linked to parent category
 AddProductServiceIntoCategory=Add the following product/service
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
+ChooseCategory=Choose category
diff --git a/htdocs/langs/bn_BD/commercial.lang b/htdocs/langs/bn_BD/commercial.lang
index f6bfea9c0d3..efadc44d700 100644
--- a/htdocs/langs/bn_BD/commercial.lang
+++ b/htdocs/langs/bn_BD/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=Close
 ActionAC_EMAILING=Send mass email
 ActionAC_COM=Send customer order by mail
 ActionAC_SHIP=Send shipping by mail
-ActionAC_SUP_ORD=Send supplier order by mail
-ActionAC_SUP_INV=Send supplier invoice by mail
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=Other
 ActionAC_OTH_AUTO=Automatically inserted events
 ActionAC_MANUAL=Manually inserted events
diff --git a/htdocs/langs/bn_BD/companies.lang b/htdocs/langs/bn_BD/companies.lang
index 840d927521d..584efd135f1 100644
--- a/htdocs/langs/bn_BD/companies.lang
+++ b/htdocs/langs/bn_BD/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Are you sure you want to delete this contact and all inheri
 MenuNewThirdParty=New third party
 MenuNewCustomer=New customer
 MenuNewProspect=New prospect
-MenuNewSupplier=New supplier
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=New private individual
-NewCompany=New company (prospect, customer, supplier)
-NewThirdParty=New third party (prospect, customer, supplier)
-CreateDolibarrThirdPartySupplier=Create a third party (supplier)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=Create third party
 CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Prospection area
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=Prospects
 ThirdPartyCustomers=Customers
 ThirdPartyCustomersStats=Customers
 ThirdPartyCustomersWithIdProf12=Customers with %s or %s
-ThirdPartySuppliers=Suppliers
+ThirdPartySuppliers=Vendors
 ThirdPartyType=Third party type
 Individual=Private individual
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
@@ -77,11 +77,11 @@ Web=Web
 Poste= Position
 DefaultLang=Language by default
 VATIsUsed=Sales tax is used
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
-ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Proposals
 OverAllOrders=Orders
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=RE Type
 TypeLocaltax2ES=IRPF Type
 WrongCustomerCode=Customer code invalid
-WrongSupplierCode=Supplier code invalid
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Customer code model
-SupplierCodeModel=Supplier code model
+SupplierCodeModel=Vendor code model
 Gencod=Bar code
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
@@ -267,7 +267,7 @@ Prospect=Prospect
 CustomerCard=Customer Card
 Customer=Customer
 CustomerRelativeDiscount=Relative customer discount
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=Relative discount
 CustomerAbsoluteDiscountShort=Absolute discount
 CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this suppl
 CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
 CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
 CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=None
 Supplier=Supplier
 AddContact=Create contact
@@ -304,13 +304,13 @@ DeleteACompany=Delete a company
 PersonalInformations=Personal data
 AccountancyCode=Accounting account
 CustomerCode=Customer code
-SupplierCode=Supplier code
+SupplierCode=Vendor code
 CustomerCodeShort=Customer code
-SupplierCodeShort=Supplier code
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=Customer code, unique for all customers
-SupplierCodeDesc=Supplier code, unique for all suppliers
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=Required if third party is a customer or prospect
-RequiredIfSupplier=Required if third party is a supplier
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=Validity controled by module
 ThisIsModuleRules=This is rules for this module
 ProspectToContact=Prospect to contact
@@ -338,7 +338,7 @@ MyContacts=My contacts
 Capital=Capital
 CapitalOf=Capital of %s
 EditCompany=Edit company
-ThisUserIsNot=This user is not a prospect, customer nor supplier
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=Check
 VATIntraCheckDesc=The link <b>%s</b> allows to ask the european VAT checker service. An external internet access from server is required for this service to work.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -396,7 +396,7 @@ ImportDataset_company_4=Third parties/Sales representatives (Assign sales repres
 PriceLevel=Price level
 DeliveryAddress=Delivery address
 AddAddress=Add address
-SupplierCategory=Supplier category
+SupplierCategory=Vendor category
 JuridicalStatus200=Independent
 DeleteFile=Delete file
 ConfirmDeleteFile=Are you sure you want to delete this file?
@@ -406,7 +406,7 @@ FiscalYearInformation=Information on the fiscal year
 FiscalMonthStart=Starting month of the fiscal year
 YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
 YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
-ListSuppliersShort=List of suppliers
+ListSuppliersShort=List of vendors
 ListProspectsShort=List of prospects
 ListCustomersShort=List of customers
 ThirdPartiesArea=Third parties and contact area
@@ -420,7 +420,7 @@ CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/bn_BD/compta.lang b/htdocs/langs/bn_BD/compta.lang
index cda96a546b8..d2cfb714900 100644
--- a/htdocs/langs/bn_BD/compta.lang
+++ b/htdocs/langs/bn_BD/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=Net paid
 VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
-VATSummary=Tax Balance
+VATSummary=Tax monthly
+VATBalance=Tax Balance
 VATPaid=Tax paid
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=Accountancy/Treasury area
 NewPayment=New payment
 Payments=Payments
 PaymentCustomerInvoice=Customer invoice payment
-PaymentSupplierInvoice=Supplier invoice payment
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
-ListOfSupplierPayments=List of supplier payments
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -110,7 +111,7 @@ ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
 CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
 SupplierAccountancyCodeShort=Sup. account. code
 AccountNumber=Account number
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
 Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
-ByProductsAndServices=By products and services
+ByProductsAndServices=By product and service
 RefExt=External ref
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
 LinkedOrder=Link to order
@@ -215,7 +218,8 @@ Mode1=Method 1
 Mode2=Method 2
 CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
 CalculationRuleDescSupplier=According to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
@@ -242,3 +246,10 @@ FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/bn_BD/dict.lang b/htdocs/langs/bn_BD/dict.lang
index ca0c61a9cbc..61a7237f472 100644
--- a/htdocs/langs/bn_BD/dict.lang
+++ b/htdocs/langs/bn_BD/dict.lang
@@ -5,7 +5,8 @@ CountryIT=Italy
 CountryES=Spain
 CountryDE=Germany
 CountryCH=Switzerland
-CountryGB=Great Britain
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=United Kingdom
 CountryUK=United Kingdom
 CountryIE=Ireland
 CountryCN=China
diff --git a/htdocs/langs/bn_BD/ecm.lang b/htdocs/langs/bn_BD/ecm.lang
index 65e9b17bdb2..5200fa30b1d 100644
--- a/htdocs/langs/bn_BD/ecm.lang
+++ b/htdocs/langs/bn_BD/ecm.lang
@@ -39,9 +39,10 @@ ShowECMSection=Show directory
 DeleteSection=Remove directory
 ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
 ECMDirectoryForFiles=Relative directory for files
-CannotRemoveDirectoryContainsFiles=Removed not possible because it contains some files
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=File manager
-ECMSelectASection=Select a directory on left tree...
+ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
diff --git a/htdocs/langs/bn_BD/errors.lang b/htdocs/langs/bn_BD/errors.lang
index ec036b28bc5..0ca7488b8cb 100644
--- a/htdocs/langs/bn_BD/errors.lang
+++ b/htdocs/langs/bn_BD/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Bar code required
 ErrorCustomerCodeAlreadyUsed=Customer code already used
 ErrorBarCodeAlreadyUsed=Bar code already used
 ErrorPrefixRequired=Prefix required
-ErrorBadSupplierCodeSyntax=Bad syntax for supplier code
-ErrorSupplierCodeRequired=Supplier code required
-ErrorSupplierCodeAlreadyUsed=Supplier code already used
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Bad parameters
 ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
 ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
@@ -87,7 +87,7 @@ ErrorsOnXLines=Errors on <b>%s</b> source record(s)
 ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
 ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s"
 ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
-ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Error on mask
 ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
-ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
diff --git a/htdocs/langs/bn_BD/install.lang b/htdocs/langs/bn_BD/install.lang
index e602c54640c..587d4f83da6 100644
--- a/htdocs/langs/bn_BD/install.lang
+++ b/htdocs/langs/bn_BD/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not
 ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
 ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be granted to be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reload all information from configuration file.
 PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
 WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called <b>install.lock</b> into Dolibarr document directory, in order to avoid malicious use of it.
 FunctionNotAvailableInThisPHP=Not available on this PHP
 ChoosedMigrateScript=Choose migration script
-DataMigration=Data migration
-DatabaseMigration=Structure database migration
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script processing
 ChooseYourSetupMode=Choose your setup mode and click "Start"...
 FreshInstall=Fresh install
@@ -146,7 +147,7 @@ NothingToDo=Nothing to do
 # upgrade
 MigrationFixData=Fix for denormalized data
 MigrationOrder=Data migration for customer's orders
-MigrationSupplierOrder=Data migration for supplier's orders
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Data migration for commercial proposals
 MigrationInvoice=Data migration for customer's invoices
 MigrationContract=Data migration for contracts
@@ -196,6 +197,8 @@ MigrationEvents=Migration of events to add event owner into assignement table
 MigrationEventsContact=Migration of events to add event contact into assignement table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 ShowNotAvailableOptions=Show not available options
diff --git a/htdocs/langs/bn_BD/ldap.lang b/htdocs/langs/bn_BD/ldap.lang
index d6360f3e540..abe11602147 100644
--- a/htdocs/langs/bn_BD/ldap.lang
+++ b/htdocs/langs/bn_BD/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Password for domain
 YouMustChangePassNextLogon=Password for user <b>%s</b> on the domain <b>%s</b> must be changed.
 UserMustChangePassNextLogon=User must change password on the domain %s
 LDAPInformationsForThisContact=Information in LDAP database for this contact
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Member type synchronized
 ContactSynchronized=Contact synchronized
 ForceSynchronize=Force synchronizing Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Failed to read LDAP database. Check LDAP module setup and database accessibility.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/bn_BD/loan.lang b/htdocs/langs/bn_BD/loan.lang
index 9aae3869cc3..534dee08867 100644
--- a/htdocs/langs/bn_BD/loan.lang
+++ b/htdocs/langs/bn_BD/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=Capital
 Insurance=Insurance
 Interest=Interest
 Nbterms=Number of terms
+Term=Term
 LoanAccountancyCapitalCode=Accounting account capital
 LoanAccountancyInsuranceCode=Accounting account insurance
 LoanAccountancyInterestCode=Accounting account interest
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=Confirm deleting this loan
 LoanDeleted=Loan Deleted Successfully
 ConfirmPayLoan=Confirm classify paid this loan
 LoanPaid=Loan Paid
-# Calc
-LoanCalc=Bank Loans Calculator
-PurchaseFinanceInfo=Purchase & Financing Information
-SalePriceOfAsset=Sale Price of Asset
-PercentageDown=Percentage Down
-LengthOfMortgage=Duration of loan
-AnnualInterestRate=Annual Interest Rate
-ExplainCalculations=Explain Calculations
-ShowMeCalculationsAndAmortization=Show me the calculations and amortization
-MortgagePaymentInformation=Mortgage Payment Information
-DownPayment=Down Payment
-DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
-InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
-MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
-MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
-MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
-MonthlyPaymentDesc=The montly payment is figured out using the following formula
-AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
-AmountFinanced=Amount Financed
-AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
-Totalsforyear=Totals for year
-MonthlyPayment=Monthly Payment
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
-GoToInterest=%s will go towards INTEREST
-GoToPrincipal=%s will go towards PRINCIPAL
-YouWillSpend=You will spend %s in year %s
 ListLoanAssociatedProject=List of loan associated with the project
 AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Interest
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-FinancialCommitment=Financial commitment
 CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/langs/bn_BD/mails.lang b/htdocs/langs/bn_BD/mails.lang
index cedcd01066b..2313910de93 100644
--- a/htdocs/langs/bn_BD/mails.lang
+++ b/htdocs/langs/bn_BD/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Sender
 MailErrorsTo=Errors to
 MailReply=Reply to
 MailTo=Receiver(s)
+MailToUsers=To user(s)
 MailCC=Copy to
+MailToCCUsers=Copy to users(s)
 MailCCC=Cached copy to
 MailTopic=EMail topic
 MailText=Message
@@ -164,4 +166,4 @@ InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/bn_BD/main.lang b/htdocs/langs/bn_BD/main.lang
index 46246394dde..54ba8f3387c 100644
--- a/htdocs/langs/bn_BD/main.lang
+++ b/htdocs/langs/bn_BD/main.lang
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is se
 Administrator=Administrator
 Undefined=Undefined
 PasswordForgotten=Password forgotten?
+NoAccount=No account?
 SeeAbove=See above
 HomeArea=Home area
 LastConnexion=Latest connection
@@ -231,7 +232,7 @@ Limit=Limit
 Limits=Limits
 Logout=Logout
 NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Connection
+Connection=Login
 Setup=Setup
 Alert=Alert
 MenuWarnings=Alerts
@@ -402,6 +403,7 @@ DefaultTaxRate=Default tax rate
 Average=Average
 Sum=Sum
 Delta=Delta
+RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
@@ -414,7 +416,7 @@ Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
 ExternalRef=Ref. extern
-RefSupplier=Ref. supplier
+RefSupplier=Ref. vendor
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
 Comment=Comment
@@ -493,7 +495,7 @@ Received=Received
 Paid=Processed
 Topic=Subject
 ByCompanies=By third parties
-ByUsers=By users
+ByUsers=By user
 Links=Links
 Link=Link
 Rejects=Rejects
@@ -619,9 +621,9 @@ BuildDoc=Build Doc
 Entity=Environment
 Entities=Entities
 CustomerPreview=Customer preview
-SupplierPreview=Supplier preview
+SupplierPreview=Vendor preview
 ShowCustomerPreview=Show customer preview
-ShowSupplierPreview=Show supplier preview
+ShowSupplierPreview=Show vendor preview
 RefCustomer=Ref. customer
 Currency=Currency
 InfoAdmin=Information for administrators
@@ -679,7 +681,7 @@ Color=Color
 Documents=Linked files
 Documents2=Documents
 UploadDisabled=Upload disabled
-MenuAccountancy=Accountancy
+MenuAccountancy=Accounting
 MenuECM=Documents
 MenuAWStats=AWStats
 MenuMembers=Members
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=Products or services
 SearchIntoProjects=Projects
 SearchIntoTasks=Tasks
 SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Interventions
 SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
@@ -941,3 +943,5 @@ Remote=Remote
 LocalAndRemote=Local and Remote
 KeyboardShortcut=Keyboard shortcut
 AssignedTo=Assigned to
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/bn_BD/margins.lang b/htdocs/langs/bn_BD/margins.lang
index 9f590ef3718..b9d52dcfdc6 100644
--- a/htdocs/langs/bn_BD/margins.lang
+++ b/htdocs/langs/bn_BD/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=As a service
 UseDiscountOnTotal=On subtotal
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
 MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best supplier price
+MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Cost price
 UnitCharges=Unit charges
 Charges=Charges
diff --git a/htdocs/langs/bn_BD/members.lang b/htdocs/langs/bn_BD/members.lang
index 7326f3b9950..b29477e346d 100644
--- a/htdocs/langs/bn_BD/members.lang
+++ b/htdocs/langs/bn_BD/members.lang
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
diff --git a/htdocs/langs/bn_BD/opensurvey.lang b/htdocs/langs/bn_BD/opensurvey.lang
index 87e6a74913a..76684955e56 100644
--- a/htdocs/langs/bn_BD/opensurvey.lang
+++ b/htdocs/langs/bn_BD/opensurvey.lang
@@ -58,3 +58,4 @@ MoreChoices=Enter more choices for the voters
 SurveyExpiredInfo=The poll has been closed or voting delay has expired.
 EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
 ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/bn_BD/orders.lang b/htdocs/langs/bn_BD/orders.lang
index 8de0279be44..1b36a25df66 100644
--- a/htdocs/langs/bn_BD/orders.lang
+++ b/htdocs/langs/bn_BD/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Customers orders area
-SuppliersOrdersArea=Suppliers orders area
+SuppliersOrdersArea=Purchase orders area
 OrderCard=Order card
 OrderId=Order Id
 Order=Order
@@ -13,18 +13,18 @@ OrderToProcess=Order to process
 NewOrder=New order
 ToOrder=Make order
 MakeOrder=Make order
-SupplierOrder=Supplier order
-SuppliersOrders=Suppliers orders
-SuppliersOrdersRunning=Current suppliers orders
-CustomerOrder=Customer order
-CustomersOrders=Customer orders
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=Customer Order
+CustomersOrders=Customer Orders
 CustomersOrdersRunning=Current customer orders
 CustomersOrdersAndOrdersLines=Customer orders and order lines
 OrdersDeliveredToBill=Customer orders delivered to bill
 OrdersToBill=Customer orders delivered
 OrdersInProcess=Customer orders in process
 OrdersToProcess=Customer orders to process
-SuppliersOrdersToProcess=Supplier orders to process
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=Canceled
 StatusOrderDraftShort=Draft
 StatusOrderValidatedShort=Validated
@@ -75,15 +75,15 @@ ShowOrder=Show order
 OrdersOpened=Orders to process
 NoDraftOrders=No draft orders
 NoOrder=No order
-NoSupplierOrder=No supplier order
+NoSupplierOrder=No purchase order
 LastOrders=Latest %s customer orders
 LastCustomerOrders=Latest %s customer orders
-LastSupplierOrders=Latest %s supplier orders
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=Latest %s modified orders
 AllOrders=All orders
 NbOfOrders=Number of orders
 OrdersStatistics=Order's statistics
-OrdersStatisticsSuppliers=Supplier order's statistics
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Number of orders by month
 AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
 ListOfOrders=List of orders
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</
 GenerateBill=Generate invoice
 ClassifyShipped=Classify delivered
 DraftOrders=Draft orders
-DraftSuppliersOrders=Draft suppliers orders
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=In process orders
 RefOrder=Ref. order
 RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for supplier
-RefOrderSupplierShort=Ref. order supplier
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=Send order by mail
 ActionsOnOrder=Events on order
 NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
 DispatchSupplierOrder=Receiving supplier order %s
 FirstApprovalAlreadyDone=First approval already done
 SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=Supplier order %s received %s
-SupplierOrderSubmitedInDolibarr=Supplier order %s submited
-SupplierOrderClassifiedBilled=Supplier order %s set billed
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Other orders
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
@@ -125,11 +125,11 @@ TypeContact_commande_internal_SHIPPING=Representative following-up shipping
 TypeContact_commande_external_BILLING=Customer invoice contact
 TypeContact_commande_external_SHIPPING=Customer shipping contact
 TypeContact_commande_external_CUSTOMER=Customer contact following-up order
-TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
-TypeContact_order_supplier_external_BILLING=Supplier invoice contact
-TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact
-TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
 Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
 Error_OrderNotChecked=No orders to invoice selected
diff --git a/htdocs/langs/bn_BD/other.lang b/htdocs/langs/bn_BD/other.lang
index 2afabe43b06..13907ca380e 100644
--- a/htdocs/langs/bn_BD/other.lang
+++ b/htdocs/langs/bn_BD/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=Files is too big
 PleaseBePatient=Please be patient...
 NewPassword=New password
 ResetPassword=Reset password
-RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
@@ -233,6 +233,8 @@ PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=Exports area
 AvailableFormats=Available formats
diff --git a/htdocs/langs/bn_BD/productbatch.lang b/htdocs/langs/bn_BD/productbatch.lang
index 1c2d22395ce..54270c4a23b 100644
--- a/htdocs/langs/bn_BD/productbatch.lang
+++ b/htdocs/langs/bn_BD/productbatch.lang
@@ -16,7 +16,7 @@ printEatby=Eat-by: %s
 printSellby=Sell-by: %s
 printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic increase/decrease stock mode is forced to shipping validate and manual dispatching for reception and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
 ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
diff --git a/htdocs/langs/bn_BD/products.lang b/htdocs/langs/bn_BD/products.lang
index b9ebefc91c9..72e717367fc 100644
--- a/htdocs/langs/bn_BD/products.lang
+++ b/htdocs/langs/bn_BD/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
 MinPrice=Min. selling price
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
 ContractStatusClosed=Closed
 ErrorProductAlreadyExists=A product with reference %s already exists.
@@ -155,7 +156,7 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Supplier prices
 SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
-CustomCode=Customs/Commodity/HS code
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
 Nature=Nature
 ShortLabel=Short label
diff --git a/htdocs/langs/bn_BD/projects.lang b/htdocs/langs/bn_BD/projects.lang
index 319a6e7e0e2..e04f28689a1 100644
--- a/htdocs/langs/bn_BD/projects.lang
+++ b/htdocs/langs/bn_BD/projects.lang
@@ -77,6 +77,7 @@ Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer orders associated with the project
@@ -226,4 +227,4 @@ AllowCommentOnProject=Allow user comments on projects
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/bn_BD/stocks.lang b/htdocs/langs/bn_BD/stocks.lang
index 7fbe2f6b82a..aaa7e21fc0d 100644
--- a/htdocs/langs/bn_BD/stocks.lang
+++ b/htdocs/langs/bn_BD/stocks.lang
@@ -203,3 +203,4 @@ RegulateStock=Regulate Stock
 ListInventory=List
 StockSupportServices=Stock management support services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/bn_BD/stripe.lang b/htdocs/langs/bn_BD/stripe.lang
index 9fb2fa45113..6fa072b4c9a 100644
--- a/htdocs/langs/bn_BD/stripe.lang
+++ b/htdocs/langs/bn_BD/stripe.lang
@@ -58,8 +58,8 @@ NameOnCard=Name on card
 CardNumber=Card Number
 ExpiryDate=Expiry Date
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/bn_BD/supplier_proposal.lang b/htdocs/langs/bn_BD/supplier_proposal.lang
index d5b51978920..ef2e7242e31 100644
--- a/htdocs/langs/bn_BD/supplier_proposal.lang
+++ b/htdocs/langs/bn_BD/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Supplier commercial proposals
-supplier_proposalDESC=Manage price requests to suppliers
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
 SupplierProposalNew=New price request
 CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
-SupplierProposalsDraft=Draft supplier proposals
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=Latest %s modified price requests
 RequestsOpened=Open price requests
-SupplierProposalArea=Supplier proposals area
-SupplierProposalShort=Supplier proposal
-SupplierProposals=Supplier proposals
-SupplierProposalsShort=Supplier proposals
+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=Supplier ref
+SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=Delivery date
 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>?
@@ -47,9 +47,9 @@ CommercialAsk=Price request
 DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposals=List of supplier proposal requests
-ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
-SupplierProposalsToClose=Supplier proposals to close
-SupplierProposalsToProcess=Supplier proposals to process
+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
diff --git a/htdocs/langs/bn_BD/suppliers.lang b/htdocs/langs/bn_BD/suppliers.lang
index f9e383e09af..d0cf540d3eb 100644
--- a/htdocs/langs/bn_BD/suppliers.lang
+++ b/htdocs/langs/bn_BD/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Suppliers
-SuppliersInvoice=Suppliers invoice
-ShowSupplierInvoice=Show Supplier Invoice
-NewSupplier=New supplier
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=History
-ListOfSuppliers=List of suppliers
-ShowSupplier=Show supplier
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=Order date
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
-SupplierPrices=Supplier prices
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
-NoRecordedSuppliers=No suppliers recorded
-SupplierPayment=Supplier payment
-SuppliersArea=Suppliers area
-RefSupplierShort=Ref. supplier
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=Availability
-ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
-ExportDataset_fournisseur_2=Supplier invoices and payments
-ExportDataset_fournisseur_3=Supplier orders and order lines
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=Approve this order
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
 ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
 ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
-AddSupplierOrder=Create supplier order
-AddSupplierInvoice=Create supplier invoice
-ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
-SentToSuppliers=Sent to suppliers
-ListOfSupplierOrders=List of supplier orders
-MenuOrdersSupplierToBill=Supplier orders to invoice
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-SupplierReputation=Supplier reputation
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
 AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=Supplier prices
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/bn_BD/website.lang b/htdocs/langs/bn_BD/website.lang
index 0350da13f8f..0f0673e3716 100644
--- a/htdocs/langs/bn_BD/website.lang
+++ b/htdocs/langs/bn_BD/website.lang
@@ -73,7 +73,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
diff --git a/htdocs/langs/bn_BD/workflow.lang b/htdocs/langs/bn_BD/workflow.lang
index a50bd91595b..783373ad66d 100644
--- a/htdocs/langs/bn_BD/workflow.lang
+++ b/htdocs/langs/bn_BD/workflow.lang
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source custome
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/bs_BA/accountancy.lang b/htdocs/langs/bs_BA/accountancy.lang
index b4e2dcadb2d..4c9fe24c275 100644
--- a/htdocs/langs/bs_BA/accountancy.lang
+++ b/htdocs/langs/bs_BA/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Računovodstvo
 ACCOUNTING_EXPORT_SEPARATORCSV=Odvajanje kolona za izvoznu datoteku
 ACCOUNTING_EXPORT_DATE=Format datuma za izvoznu datoteku
 ACCOUNTING_EXPORT_PIECE=Izvoz broja komada
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Accounts with non zero values
 ListOfAccounts=List of accounts
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers 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
 
-AccountancyArea=Accountancy area
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
 AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
@@ -89,7 +90,7 @@ MenuProductsAccounts=Product accounts
 ProductsBinding=Products accounts
 Ventilation=Binding to accounts
 CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Supplier invoice binding
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modifikacija transakcije
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=Dnevnik nabavki
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Dnevnik raznih stavki
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Dnevnik troškova
 ACCOUNTING_SOCIAL_JOURNAL=Dnevnik doprinosa
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
 ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
@@ -185,11 +187,12 @@ ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
-DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Group of account
 Pcgsubtype=Subgroup of account
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
 ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
 DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report 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 fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -239,11 +242,7 @@ AccountingJournalType2=Sales
 AccountingJournalType3=Purchases
 AccountingJournalType4=Banka
 AccountingJournalType5=Expenses report
-<<<<<<< HEAD
-AccountingJournalType8=Inventory
-=======
 AccountingJournalType8=Inventar
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
 AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
@@ -297,4 +296,9 @@ Binded=Lines bound
 ToBind=Lines to bind
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang
index 406baafc746..4109859ed1a 100644
--- a/htdocs/langs/bs_BA/admin.lang
+++ b/htdocs/langs/bs_BA/admin.lang
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems)
 MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=Method to use to send EMails
 MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
 MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
@@ -291,7 +292,7 @@ ModuleSetup=Postavke modula
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=Sistem
 ModuleFamilyCrm=Customer Relation Management (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projects/Collaborative work
@@ -373,7 +374,8 @@ NoSmsEngine=No SMS sender manager available. SMS sender manager are not installe
 PDF=PDF
 PDFDesc=You can set each global options related to the PDF generation
 PDFAddressForging=Rules to forge address boxes
-HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=Hide products description on generated PDF
@@ -445,7 +447,8 @@ DisplayCompanyInfo=Display company address
 DisplayCompanyManagers=Display manager names
 DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party 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.
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Set this to 1 if you want to attach main document to emai
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -479,7 +485,7 @@ Module1Desc=Companies and contact management (customers, prospects...)
 Module2Name=Poslovno
 Module2Desc=Commercial management
 Module10Name=Računovodstvo
-Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching.
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=Prijedlozi
 Module20Desc=Commercial proposal management
 Module22Name=Mass E-mailings
@@ -546,8 +552,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
-Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Payment of employee wages
 Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
@@ -561,14 +567,14 @@ Module700Name=Donacije
 Module700Desc=Donation management
 Module770Name=Izvještaj o troškovima
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Mantis integration
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
 Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
 Module2200Name=Dynamic Prices
@@ -576,7 +582,7 @@ Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Scheduled jobs
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API/Web services (SOAP server)
@@ -613,7 +619,7 @@ Module50100Desc=Point of sales module (POS).
 Module50200Name=Paypal
 Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Poll, Survey or Vote
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed memb
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=Other menu entries manage optional parameters.
 LogEvents=Security audit events
 Audit=Audit
@@ -1054,8 +1060,9 @@ LogEventDesc=You can enable here the logging for Dolibarr security events. Admin
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1188,11 +1195,11 @@ UserMailRequired=EMail required to create a new user
 HRMSetup=HRM module setup
 ##### Company setup #####
 CompanySetup=Companies module setup
-CompanyCodeChecker=Modul za generaciju i provjeru trećih stranaka (kupca ili dobavljača)
-AccountCodeManager=Module for accounting code generation (customer or supplier)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
 NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
 ModelModules=Documents templates
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
@@ -1203,6 +1210,9 @@ MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
 TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=Free text on commercial proposals
 WatermarkOnDraftProposal=Vodeni žig na nacrte komercijalnih prijedloga (ništa, ako je prazno) 
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
 ##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=Order management setup
 OrdersNumberingModules=Orders numbering models
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe
 OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
 OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
 ##### Stock #####
-StockSetup=Warehouse module setup
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
 ##### Menu #####
 MenuDeleted=Menu deleted
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
 MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
 SuppliersSetup=Supplier module setup
-SuppliersCommandModel=Complete template of supplier order (logo...)
-SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","
 SalariesSetup=Setup of module salaries
 SortOrder=Sort order
 Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Install of external module from applic
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
-TextTitleColor=Color of page title
+TextTitleColor=Text color of Page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=Background color for Top menu
 TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
 ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-MailToMember=To send email from member page
-MailToUser=To send email from user page
-MailToProject= To send email from project page
+MailToSendProposal=Ponude kupcima
+MailToSendOrder=Narudžbe kupaca
+MailToSendInvoice=Fakture kupaca
+MailToSendShipment=Pošiljke
+MailToSendIntervention=Intervencije
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Ugovori
+MailToThirdparty=Subjekti
+MailToMember=Članovi
+MailToUser=Korisnici
+MailToProject=Projects page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1780,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/bs_BA/bills.lang b/htdocs/langs/bs_BA/bills.lang
index c140e99384a..d1625d9c065 100644
--- a/htdocs/langs/bs_BA/bills.lang
+++ b/htdocs/langs/bs_BA/bills.lang
@@ -109,7 +109,7 @@ CancelBill=Otkaži fakturu
 SendRemindByMail=Pošalji opomenu na E-Mail
 DoPayment=Unesi uplatu
 DoPaymentBack=Unesi refundaciju
-ConvertToReduc=Pretvori u budući popust
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Unesi uplate primljene od kupca
@@ -120,7 +120,7 @@ BillStatus=Status fakture
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Uzorak (Potrebna je potvrda)
 BillStatusPaid=Plaćeno
-BillStatusPaidBackOrConverted=Refundacija knjiž.obavijesti ili pretvoreno u popust
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Otkazano
 BillStatusValidated=Potvrđeno (Potrebno platiti)
@@ -296,10 +296,10 @@ DiscountType=Discount type
 NoteReason=Bilješka/Razlog
 ReasonDiscount=Razlog
 DiscountOfferedBy=Odobreno od strane
-DiscountStillRemaining=ostalo popusta
-DiscountAlreadyCounted=Popusti već iskorišteni
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+SupplierDiscounts=Vendors discounts
 BillAddress=Adresa fakture
 HelpEscompte=Ovaj popust je odobren za kupca jer je isplata izvršena prije roka.
 HelpAbandonBadCustomer=Ovaj iznos je otkazan (kupac je loš kupac) i smatra se kao potencijalni gubitak.
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Svakih %s dana
 FrequencyPer_m=Svakih %s mjeseci
 FrequencyPer_y=Svakih %s godina
@@ -505,9 +511,14 @@ SituationAmount=Situation invoice amount(net)
 SituationDeduction=Oduzimanje situacije
 ModifyAllLines=Izmijeni sve redove
 CreateNextSituationInvoice=Napravi sljedeću situaciju
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=Sljedeća situacija već postoji.
 DisabledBecauseFinal=Ova situacija je konačna.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=S
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
 NoSituations=Nema otvorenih situacija
 InvoiceSituationLast=Final and general invoice
@@ -532,3 +543,4 @@ AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/bs_BA/categories.lang b/htdocs/langs/bs_BA/categories.lang
index d70d6e34842..ed5eca5cf88 100644
--- a/htdocs/langs/bs_BA/categories.lang
+++ b/htdocs/langs/bs_BA/categories.lang
@@ -85,3 +85,4 @@ CategorieRecursivHelp=If activated, product will also linked to parent category
 AddProductServiceIntoCategory=Add the following product/service
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
+ChooseCategory=Choose category
diff --git a/htdocs/langs/bs_BA/commercial.lang b/htdocs/langs/bs_BA/commercial.lang
index 6167e593245..a48ed15e580 100644
--- a/htdocs/langs/bs_BA/commercial.lang
+++ b/htdocs/langs/bs_BA/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=Close
 ActionAC_EMAILING=Send mass email
 ActionAC_COM=Send customer order by mail
 ActionAC_SHIP=Send shipping by mail
-ActionAC_SUP_ORD=Send supplier order by mail
-ActionAC_SUP_INV=Send supplier invoice by mail
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=Ostalo
 ActionAC_OTH_AUTO=Automatically inserted events
 ActionAC_MANUAL=Manually inserted events
diff --git a/htdocs/langs/bs_BA/companies.lang b/htdocs/langs/bs_BA/companies.lang
index 8e611ebd64d..a0420a9aace 100644
--- a/htdocs/langs/bs_BA/companies.lang
+++ b/htdocs/langs/bs_BA/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Da li ste sigurni da želite obrisati ovaj kontakt i sve po
 MenuNewThirdParty=Novi subjekt
 MenuNewCustomer=Novi kupac
 MenuNewProspect=Novi mogući klijent
-MenuNewSupplier=Novi dobavljač
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=Novo fizičko lice
-NewCompany=Nova kompanija (mogući klijent, kupac, dobavljač)
-NewThirdParty=Novi subjekt (mogući klijent, kupac, dobavljač)
-CreateDolibarrThirdPartySupplier=Napravi subjekt (dobavljač)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=Napravi novi subjekt
 CreateThirdPartyAndContact=Napravi subjekt + podređeni kontakt
 ProspectionArea=Područje za moguće kupce
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=Mogući klijenti
 ThirdPartyCustomers=Kupci
 ThirdPartyCustomersStats=Kupci
 ThirdPartyCustomersWithIdProf12=Kupci sa %s ili %s
-ThirdPartySuppliers=Dobavljači
+ThirdPartySuppliers=Vendors
 ThirdPartyType=Tip subjekta
 Individual=Fizičko lice
 ToCreateContactWithSameName=Automatski pravi kontakt/adresu sa istim informacijama kao i subjekt ispod. U većini slučajeva, čak i kada je subjekt fizička osoba, samo pravljenje subjekta je dovoljno.
@@ -77,11 +77,11 @@ Web=Web
 Poste= Pozicija
 DefaultLang=Defaultni jezik
 VATIsUsed=Porez na promet je obračunat
-VATIsUsedWhenSelling=Ovim se definira da li treća strana uključuje porez ili ne kada pravi fakture svojim kupcima
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Porez na promet nije obračunat
 CopyAddressFromSoc=Popuni adresu sa adresom subjekta
-ThirdpartyNotCustomerNotSupplierSoNoRef=Subjekt nije kupac niti dobavljač, nema dostupnih referentnih objekata
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Treća strana nije niti dobavljač ni kupac, popusti nisu dostupni
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Bankovni račun za plaćanje
 OverAllProposals=Prijedlozi
 OverAllOrders=Narudžbe
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=Vrsta RE
 TypeLocaltax2ES=Vrsta IRPF
 WrongCustomerCode=Nevažeća šifra kupca
-WrongSupplierCode=Nevažeća šifra dobavljača
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Model šifre kupca
-SupplierCodeModel=Model šifre dobavljača
+SupplierCodeModel=Vendor code model
 Gencod=Barkod
 ##### Professional ID #####
 ProfId1Short=ID broj 1
@@ -267,11 +267,7 @@ Prospect=Mogući klijent
 CustomerCard=Kartica kupca
 Customer=Kupac
 CustomerRelativeDiscount=Relativni popust kupca
-<<<<<<< HEAD
-SupplierRelativeDiscount=Relative supplier discount
-=======
-SupplierRelativeDiscount=Relativni popust dobavljača
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=Relativni popust
 CustomerAbsoluteDiscountShort=Fiksni popust
 CompanyHasRelativeDiscount=Ovaj kupca ima defaultni popust od <b>%s%%</b>
@@ -288,8 +284,8 @@ HasCreditNoteFromSupplier=Imate knjižne obavijesti od <b>%s</b> %s od strane ov
 CompanyHasNoAbsoluteDiscount=Ovaj kupac nema zasluga za popust
 CustomerAbsoluteDiscountAllUsers=Apsolutni popusti kupcima (odobreni od svih korisnika)
 CustomerAbsoluteDiscountMy=Apsolutni popusti kupcima (koje ste vi odobrili)
-SupplierAbsoluteDiscountAllUsers=Apsolutni popusti dobavljača (odobreni od svih korisnika)
-SupplierAbsoluteDiscountMy=Apsolutni popusti dobavljača (koje ste vi odobrili)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=Ništa
 Supplier=Dobavljač
 AddContact=Napravi kontakt
@@ -308,13 +304,13 @@ DeleteACompany=Obrisati kompaniju
 PersonalInformations=Osobni podaci
 AccountancyCode=Računovodstveni račun
 CustomerCode=Šifra kupca
-SupplierCode=Šifra dobavljača
+SupplierCode=Vendor code
 CustomerCodeShort=Šifra kupca
-SupplierCodeShort=Šifra dobavljača
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=Šifra kupca, jedinstvena za sve kupce
-SupplierCodeDesc=Šifra dobavljača, jedinstvena za sve dobavljače
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=Potrebno ako je subjekt kupac ili mogući klijent
-RequiredIfSupplier=Potrebno ako je subjekt dobavljač
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=Porvjera valjanosti se kontroliše modulom
 ThisIsModuleRules=Ovo su pravila za ovaj modul
 ProspectToContact=Mogući klijent za kontaktirati
@@ -342,7 +338,7 @@ MyContacts=Moji kontakti
 Capital=Kapital
 CapitalOf=Kapital od %s
 EditCompany=Uredi kompaniju
-ThisUserIsNot=Ovaj korisnik nije mogući klijent, kupac niti dobavljač
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=Provjeri
 VATIntraCheckDesc=Link <b>%s</b> dozvoljava upit za evopski PDV servis za provjeru. Potrebno je imati pristup internetu na serveru za ovu uslugu.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -400,7 +396,7 @@ ImportDataset_company_4=Predstavnici prodaje/treće strane (dodavanje korisnika
 PriceLevel=Visina cijene
 DeliveryAddress=Adresa za dostavu
 AddAddress=Dodaj adresu
-SupplierCategory=Kategorija dobavljača
+SupplierCategory=Vendor category
 JuridicalStatus200=Nezavisni
 DeleteFile=Obriši fajl
 ConfirmDeleteFile=Jeste li sigurni da želite obrisati ovaj fajl?
@@ -410,7 +406,7 @@ FiscalYearInformation=Informacije o fiskalnoj godini
 FiscalMonthStart=Početni mjesec fiskalne godine
 YouMustAssignUserMailFirst=Morate najprije napraviti email za ovog korisnika da biste mogli dodati email notifikacije
 YouMustCreateContactFirst=Da bi mogli dodati e-mail obavještenja, prvo morate definirati kontakte s važećom e-poštom za subjekte
-ListSuppliersShort=Lista dobavljača
+ListSuppliersShort=List of vendors
 ListProspectsShort=Lista mogućih klijenata
 ListCustomersShort=Lista kupaca
 ThirdPartiesArea=Područje za subjekte i kontakte
@@ -424,7 +420,7 @@ CurrentOutstandingBill=Trenutni neplaćeni račun
 OutstandingBill=Max. za neplaćeni račun
 OutstandingBillReached=Dostignut maksimum za neplaćene račune
 OrderMinAmount=Najmanja količina za naručiti
-MonkeyNumRefModelDesc=Vratiti broj sa formatom %syymm-nnnn za šifru kupca i $syymm-nnnn za šifru dobavljača gdje je yy godina, mm mjesec i nnnn niz bez prekida i bez vraćanja za 0.
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=Ova šifra je slobodna. Ova šifra se može mijenjati bilo kad.
 ManagingDirectors=Ime menadžer(a) (CEO, direktor, predsjednik...)
 MergeOriginThirdparty=Umnoži subjekta (subjekt kojeg želite obrisati)
@@ -435,4 +431,4 @@ SaleRepresentativeLogin=Pristup za predstavnika prodaje
 SaleRepresentativeFirstname=Ime predstavnika prodaje
 SaleRepresentativeLastname=Prezime predstavnika prodaje
 ErrorThirdpartiesMerge=Nastala je greška pri brisanju treće strane. Molimo vas da provjerite zapisnik. Izmjene su vraćene.
-NewCustomerSupplierCodeProposed=Kod novog kupca ili dobavljača predložen za duplikat koda
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/bs_BA/compta.lang b/htdocs/langs/bs_BA/compta.lang
index dc3db7a2ad5..47fd5ac5470 100644
--- a/htdocs/langs/bs_BA/compta.lang
+++ b/htdocs/langs/bs_BA/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=Neto plaćeno
 VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
-VATSummary=Tax Balance
+VATSummary=Tax monthly
+VATBalance=Tax Balance
 VATPaid=Tax paid
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=Accountancy/Treasury area
 NewPayment=Novo plaćanje
 Payments=Uplate
 PaymentCustomerInvoice=Plaćanje računa kupca
-PaymentSupplierInvoice=Supplier invoice payment
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Plaćanje socijalnog/fiskalnog poreza
 PaymentVat=Plaćanje PDVa
 ListPayment=Spisak plaćanja
 ListOfCustomerPayments=Spisak uplata kupca
-ListOfSupplierPayments=List of supplier payments
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -110,7 +111,7 @@ ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
 CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
 SupplierAccountancyCodeShort=Sup. account. code
 AccountNumber=Kod računa
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
 Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
-ByProductsAndServices=By products and services
+ByProductsAndServices=By product and service
 RefExt=External ref
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
 LinkedOrder=Link ka narudžbi
@@ -215,7 +218,8 @@ Mode1=Method 1
 Mode2=Method 2
 CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
 CalculationRuleDescSupplier=According to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
@@ -242,3 +246,10 @@ FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/bs_BA/dict.lang b/htdocs/langs/bs_BA/dict.lang
index 3a00bb5658b..f894c39c279 100644
--- a/htdocs/langs/bs_BA/dict.lang
+++ b/htdocs/langs/bs_BA/dict.lang
@@ -5,7 +5,8 @@ CountryIT=Italija
 CountryES=Španija
 CountryDE=Njemačka
 CountryCH=Švicarska
-CountryGB=Velika Britanija
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=Ujedinjeno Kraljevstvo
 CountryUK=Ujedinjeno Kraljevstvo
 CountryIE=Irska
 CountryCN=Kina
diff --git a/htdocs/langs/bs_BA/ecm.lang b/htdocs/langs/bs_BA/ecm.lang
index 5efa2d26a47..5b40d9734ed 100644
--- a/htdocs/langs/bs_BA/ecm.lang
+++ b/htdocs/langs/bs_BA/ecm.lang
@@ -39,9 +39,10 @@ ShowECMSection=Prikaži direktorij
 DeleteSection=Ukloni direktorij
 ConfirmDeleteSection=Možete li potvrditi da želite obrisati direktorij <b>%s</b>?
 ECMDirectoryForFiles=Relativni direktorij za fajlove
-CannotRemoveDirectoryContainsFiles=Nemoguće ukloniti jer sadrži fajlove
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=Updavljanje fajlovima
-ECMSelectASection=Odaberi direktorij u lijevoj strukturi
+ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
diff --git a/htdocs/langs/bs_BA/errors.lang b/htdocs/langs/bs_BA/errors.lang
index 32ec89f38ab..128da908a0f 100644
--- a/htdocs/langs/bs_BA/errors.lang
+++ b/htdocs/langs/bs_BA/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Bar code required
 ErrorCustomerCodeAlreadyUsed=Customer code already used
 ErrorBarCodeAlreadyUsed=Bar code already used
 ErrorPrefixRequired=Prefix required
-ErrorBadSupplierCodeSyntax=Bad syntax for supplier code
-ErrorSupplierCodeRequired=Supplier code required
-ErrorSupplierCodeAlreadyUsed=Supplier code already used
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Bad parameters
 ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
 ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
@@ -87,7 +87,7 @@ ErrorsOnXLines=Errors on <b>%s</b> source record(s)
 ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
 ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s"
 ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
-ErrorQtyTooLowForThisSupplier=Količina premala za ovog dobavljača ili cijena nije određena za ovaj proizvod od ovog dobavljača
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Error on mask
 ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
-ErrorSupplierCountryIsNotDefined=Zemlja za ovog dobavljača nije definisana. Prvo ispravite ovo.
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
diff --git a/htdocs/langs/bs_BA/install.lang b/htdocs/langs/bs_BA/install.lang
index da5f554255d..60eb5651043 100644
--- a/htdocs/langs/bs_BA/install.lang
+++ b/htdocs/langs/bs_BA/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=Konfiguracijska datoteka <b>%s</b> ne
 ConfFileCouldBeCreated=Konfiguracijska datoteka <b>%s</b> se može napraviti.
 ConfFileIsNotWritable=Po konfiguracijskoj datoteci <b>%s</b> se ne može pisati. Provjerite dozvole. Za prvu instalaciju, vaš web server mora dopustiti pisanje u ovu datoteku tokom procesa konfiguracije ("chmod 666" naprimjer na OS poput Unixa).
 ConfFileIsWritable=Konfiguracijska datoteka <b>%s</b> je slobodna za pisanje.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Napuni sve informacije iz konfiguracijske datoteke.
 PHPSupportSessions=Ovaj PHP podržava sesije.
 PHPSupportPOSTGETOk=Ovaj PHP podržava varijable POST i GET.
@@ -14,14 +15,14 @@ PHPSupportGD=Ovaj PHP podržava GD grafičke funkcije.
 PHPSupportCurl=This PHP support Curl.
 PHPSupportUTF8=Ovaj PHP podržava UTF8 funkcije.
 PHPMemoryOK=Vaša maksimalna memorija za PHP  sesiju je postavljena na <b>%s</b>. To bi trebalo biti dovoljno.
-PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This should be too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
-Recheck=Click here for a more significative test
-ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup.
-ErrorPHPDoesNotSupportGD=Your PHP installation does not support graphical function GD. No graph will be available.
+PHPMemoryTooLow=Vaša maks. PHP memorija sesije postavljena je na <b>%s</b> bajta. To je isuviše malo. Promijenite vaš <b>php.ini</b> da parametar <b>memory_limit</b> ima najmanje <b>%s</b> bajta.
+Recheck=Kliknite ovdje za više značajan test
+ErrorPHPDoesNotSupportSessions=Vaša PHP instalacija ne podržava sesije. Ova osobina je neophodna da bi Dolibarr uopće radio. Provjerite vašu PHP instalaciju.
+ErrorPHPDoesNotSupportGD=Vaša PHP instalacija ne podržava grafičku funkciju GD. Neće biti dostupni grafikoni.
 ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
 ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr.
-ErrorDirDoesNotExists=Directory %s does not exist.
-ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters.
+ErrorDirDoesNotExists=Direktorij %s ne postoji.
+ErrorGoBackAndCorrectParameters=Vratite se nazad i ispravite pogrešne parametre.
 ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
 ErrorFailedToCreateDatabase=Failed to create database '%s'.
 ErrorFailedToConnectToDatabase=Failed to connect to database '%s'.
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
 WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called <b>install.lock</b> into Dolibarr document directory, in order to avoid malicious use of it.
 FunctionNotAvailableInThisPHP=Not available on this PHP
 ChoosedMigrateScript=Choose migration script
-DataMigration=Data migration
-DatabaseMigration=Structure database migration
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script processing
 ChooseYourSetupMode=Choose your setup mode and click "Start"...
 FreshInstall=Fresh install
@@ -140,13 +141,13 @@ KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values
 KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
 UpgradeExternalModule=Run dedicated upgrade process of external modules
 SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
-NothingToDelete=Nothing to clean/delete
+NothingToDelete=Ništa za čišćenje/brisanje
 NothingToDo=Nothing to do
 #########
 # upgrade
 MigrationFixData=Fix for denormalized data
 MigrationOrder=Data migration for customer's orders
-MigrationSupplierOrder=Data migration for supplier's orders
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Data migration for commercial proposals
 MigrationInvoice=Data migration for customer's invoices
 MigrationContract=Data migration for contracts
@@ -193,9 +194,11 @@ MigrationActioncommElement=Update data on actions
 MigrationPaymentMode=Data migration for payment mode
 MigrationCategorieAssociation=Migration of categories
 MigrationEvents=Migration of events to add event owner into assignement table
-MigrationEventsContact=Migration of events to add event contact into assignement table
+MigrationEventsContact=Premještanje događaja da bi se dodao kontakt događaja u tabelu dodjeljivanja
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 ShowNotAvailableOptions=Show not available options
diff --git a/htdocs/langs/bs_BA/ldap.lang b/htdocs/langs/bs_BA/ldap.lang
index d6320bffaf5..abc79ebc3d2 100644
--- a/htdocs/langs/bs_BA/ldap.lang
+++ b/htdocs/langs/bs_BA/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Šifra za domenu
 YouMustChangePassNextLogon=Šifra za korisnika <b>%s</b> na domeni <b>%s</b> mora biti promijenjena.
 UserMustChangePassNextLogon=Korisnik mora promijeniti šifru na domeni %s
 LDAPInformationsForThisContact=Information in LDAP database for this contact
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Member type synchronized
 ContactSynchronized=Contact synchronized
 ForceSynchronize=Force synchronizing Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Failed to read LDAP database. Check LDAP module setup and database accessibility.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/bs_BA/loan.lang b/htdocs/langs/bs_BA/loan.lang
index c11a2dfc08c..d23ccbef66f 100644
--- a/htdocs/langs/bs_BA/loan.lang
+++ b/htdocs/langs/bs_BA/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=Kapital
 Insurance=Insurance
 Interest=Interest
 Nbterms=Number of terms
+Term=Term
 LoanAccountancyCapitalCode=Accounting account capital
 LoanAccountancyInsuranceCode=Accounting account insurance
 LoanAccountancyInterestCode=Accounting account interest
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=Confirm deleting this loan
 LoanDeleted=Loan Deleted Successfully
 ConfirmPayLoan=Confirm classify paid this loan
 LoanPaid=Loan Paid
-# Calc
-LoanCalc=Bank Loans Calculator
-PurchaseFinanceInfo=Purchase & Financing Information
-SalePriceOfAsset=Sale Price of Asset
-PercentageDown=Percentage Down
-LengthOfMortgage=Duration of loan
-AnnualInterestRate=Annual Interest Rate
-ExplainCalculations=Explain Calculations
-ShowMeCalculationsAndAmortization=Show me the calculations and amortization
-MortgagePaymentInformation=Mortgage Payment Information
-DownPayment=Down Payment
-DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
-InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
-MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
-MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
-MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
-MonthlyPaymentDesc=The montly payment is figured out using the following formula
-AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
-AmountFinanced=Amount Financed
-AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
-Totalsforyear=Totals for year
-MonthlyPayment=Monthly Payment
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
-GoToInterest=%s will go towards INTEREST
-GoToPrincipal=%s will go towards PRINCIPAL
-YouWillSpend=You will spend %s in year %s
 ListLoanAssociatedProject=List of loan associated with the project
 AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Interest
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-FinancialCommitment=Financial commitment
 CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/langs/bs_BA/mails.lang b/htdocs/langs/bs_BA/mails.lang
index 45df990dc52..54558e787d5 100644
--- a/htdocs/langs/bs_BA/mails.lang
+++ b/htdocs/langs/bs_BA/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Pošiljalac
 MailErrorsTo=Greške prema
 MailReply=Odgovori na
 MailTo=Primalac(oci)
+MailToUsers=To user(s)
 MailCC=Kopiraj na
+MailToCCUsers=Copy to users(s)
 MailCCC=Cached kopija na
 MailTopic=Tema emaila
 MailText=Poruka
@@ -164,4 +166,4 @@ InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Inromacije
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/bs_BA/main.lang b/htdocs/langs/bs_BA/main.lang
index 6b8ad5ad4c3..042fac75144 100644
--- a/htdocs/langs/bs_BA/main.lang
+++ b/htdocs/langs/bs_BA/main.lang
@@ -64,22 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=Greška, nije definirana PDV stopa za drž
 ErrorNoSocialContributionForSellerCountry=Greška, nisu definirane vrste doprinosa i poreza za državu '%s'.
 ErrorFailedToSaveFile=Greška, neuspjelo spremanje datoteke.
 ErrorCannotAddThisParentWarehouse=Pokušavate dodati nadređeno skladište koje je već podređeno skladište ovom trenutnom
-<<<<<<< HEAD
-MaxNbOfRecordPerPage=Max number of record per page
-=======
 MaxNbOfRecordPerPage=Maks broj unosa po stranici
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 NotAuthorized=Niste ovlašteni da to uradite.
 SetDate=Postavi datum
 SelectDate=Odaberi datum
 SeeAlso=Također pogledajte %s
 SeeHere=Pogledaj ovdje
 ClickHere=Klikni ovdje
-<<<<<<< HEAD
-Here=Here
-=======
 Here=Ovdje
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 Apply=Primijeniti
 BackgroundColorByDefault=Osnovna boja pozadine
 FileRenamed=Datoteka je uspješno preimenovana
@@ -100,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr način odobrenja je posta
 Administrator=Administrator
 Undefined=Nedefinirano
 PasswordForgotten=Zaboravljena šifra?
+NoAccount=No account?
 SeeAbove=Vidi iznad
 HomeArea=Početno područje
 LastConnexion=Posljednje veze
@@ -239,7 +232,7 @@ Limit=Ograničenje
 Limits=Ograničenja
 Logout=Odjava
 NoLogoutProcessWithAuthMode=Nema moguće osobine odspajanja sa načinom autentifikacije <b>%s</b>
-Connection=Konekcija
+Connection=Pristup
 Setup=Postavke
 Alert=Uzbuna
 MenuWarnings=Upozorenja
@@ -410,6 +403,7 @@ DefaultTaxRate=Pretpostavljena stopa poreza
 Average=Prosjek
 Sum=Zbir
 Delta=Delta
+RemainToPay=Remain to pay
 Module=Modul/aplikacija
 Modules=Moduli/aplikacije
 Option=Opcija
@@ -422,7 +416,7 @@ Favorite=Omiljeni
 ShortInfo=Info.
 Ref=Ref.
 ExternalRef=Ref. vanjski
-RefSupplier=Ref. dobavljač
+RefSupplier=Ref. vendor
 RefPayment=Ref. plaćanje
 CommercialProposalsShort=Poslovni prijedlozi
 Comment=Komentar
@@ -501,7 +495,7 @@ Received=Primljeno
 Paid=Plaćeno
 Topic=Tema
 ByCompanies=Po subjektu
-ByUsers=od korisnika
+ByUsers=By user
 Links=Veze
 Link=Veza
 Rejects=Odbijeno
@@ -627,9 +621,9 @@ BuildDoc=Napravi dok.
 Entity=Okruženje
 Entities=entiteti
 CustomerPreview=Pregled kupca
-SupplierPreview=Pregled dobavljača
+SupplierPreview=Vendor preview
 ShowCustomerPreview=Pokaži sažetak kupca
-ShowSupplierPreview=Pokaži sažetak dobavljača
+ShowSupplierPreview=Show vendor preview
 RefCustomer=Ref. kupca
 Currency=valuta
 InfoAdmin=Informacije za administratore
@@ -874,11 +868,7 @@ FileNotShared=Datoteka nije dijeljena vanjskim korisnicima
 Project=Projekt
 Projects=Projekti
 Rights=Dozvole
-<<<<<<< HEAD
-LineNb=Line no.
-=======
 LineNb=Red br.
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 IncotermLabel=Incoterms
 # Week day
 Monday=Ponedjeljak
@@ -927,11 +917,11 @@ SearchIntoProductsOrServices=Proizvodi ili usluge
 SearchIntoProjects=Projekti
 SearchIntoTasks=Zadaci
 SearchIntoCustomerInvoices=Fakture kupaca
-SearchIntoSupplierInvoices=Fakture dobavljača
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Narudžbe kupaca
-SearchIntoSupplierOrders=Narudžbe dobavljačima
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=Ponude kupcima
-SearchIntoSupplierProposals=Ponude dobavljača
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Intervencije
 SearchIntoContracts=Ugovori
 SearchIntoCustomerShipments=Slanje kupcu
@@ -953,3 +943,5 @@ Remote=Udaljeni
 LocalAndRemote=Lokalni i udaljeni
 KeyboardShortcut=Prečica na tastaturi
 AssignedTo=Dodijeljeno korisniku
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/bs_BA/margins.lang b/htdocs/langs/bs_BA/margins.lang
index 9f590ef3718..b9d52dcfdc6 100644
--- a/htdocs/langs/bs_BA/margins.lang
+++ b/htdocs/langs/bs_BA/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=As a service
 UseDiscountOnTotal=On subtotal
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
 MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best supplier price
+MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Cost price
 UnitCharges=Unit charges
 Charges=Charges
diff --git a/htdocs/langs/bs_BA/members.lang b/htdocs/langs/bs_BA/members.lang
index a937baddc92..7b57e4d21d3 100644
--- a/htdocs/langs/bs_BA/members.lang
+++ b/htdocs/langs/bs_BA/members.lang
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
diff --git a/htdocs/langs/bs_BA/opensurvey.lang b/htdocs/langs/bs_BA/opensurvey.lang
index d7c30a2a61d..f4491d6879d 100644
--- a/htdocs/langs/bs_BA/opensurvey.lang
+++ b/htdocs/langs/bs_BA/opensurvey.lang
@@ -58,3 +58,4 @@ MoreChoices=Enter more choices for the voters
 SurveyExpiredInfo=The poll has been closed or voting delay has expired.
 EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
 ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/bs_BA/orders.lang b/htdocs/langs/bs_BA/orders.lang
index 8c1fc8c05c5..6d1762aaf80 100644
--- a/htdocs/langs/bs_BA/orders.lang
+++ b/htdocs/langs/bs_BA/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Customers orders area
-SuppliersOrdersArea=Suppliers orders area
+SuppliersOrdersArea=Purchase orders area
 OrderCard=Order card
 OrderId=Order Id
 Order=Narudžba
@@ -13,18 +13,18 @@ OrderToProcess=Order to process
 NewOrder=New order
 ToOrder=Make order
 MakeOrder=Make order
-SupplierOrder=Supplier order
-SuppliersOrders=Suppliers orders
-SuppliersOrdersRunning=Current suppliers orders
-CustomerOrder=Customer order
-CustomersOrders=Narudžbe kupaca
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=Narudžba za kupca
+CustomersOrders=Customer Orders
 CustomersOrdersRunning=Current customer orders
 CustomersOrdersAndOrdersLines=Customer orders and order lines
 OrdersDeliveredToBill=Customer orders delivered to bill
 OrdersToBill=Customer orders delivered
 OrdersInProcess=Customer orders in process
 OrdersToProcess=Customer orders to process
-SuppliersOrdersToProcess=Supplier orders to process
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=Otkazan
 StatusOrderDraftShort=Nacrt
 StatusOrderValidatedShort=Potvrđeno
@@ -75,15 +75,15 @@ ShowOrder=Show order
 OrdersOpened=Orders to process
 NoDraftOrders=No draft orders
 NoOrder=No order
-NoSupplierOrder=No supplier order
+NoSupplierOrder=No purchase order
 LastOrders=Latest %s customer orders
 LastCustomerOrders=Latest %s customer orders
-LastSupplierOrders=Latest %s supplier orders
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=Latest %s modified orders
 AllOrders=All orders
 NbOfOrders=Number of orders
 OrdersStatistics=Order's statistics
-OrdersStatisticsSuppliers=Supplier order's statistics
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Number of orders by month
 AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
 ListOfOrders=List of orders
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</
 GenerateBill=Generate invoice
 ClassifyShipped=Classify delivered
 DraftOrders=Draft orders
-DraftSuppliersOrders=Draft suppliers orders
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=In process orders
 RefOrder=Ref. order
 RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for supplier
-RefOrderSupplierShort=Ref. order supplier
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=Send order by mail
 ActionsOnOrder=Events on order
 NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
 DispatchSupplierOrder=Receiving supplier order %s
 FirstApprovalAlreadyDone=First approval already done
 SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=Supplier order %s received %s
-SupplierOrderSubmitedInDolibarr=Supplier order %s submited
-SupplierOrderClassifiedBilled=Supplier order %s set billed
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Other orders
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
@@ -125,11 +125,11 @@ TypeContact_commande_internal_SHIPPING=Representative following-up shipping
 TypeContact_commande_external_BILLING=Kontakt za fakturu kupca
 TypeContact_commande_external_SHIPPING=Kontakt za otpremanje kupcu
 TypeContact_commande_external_CUSTOMER=Customer contact following-up order
-TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
-TypeContact_order_supplier_external_BILLING=Kontakt za fakturu dobavljača
-TypeContact_order_supplier_external_SHIPPING=Kontakt za otpremanje dobavljaču
-TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
 Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
 Error_OrderNotChecked=No orders to invoice selected
diff --git a/htdocs/langs/bs_BA/other.lang b/htdocs/langs/bs_BA/other.lang
index 3e54ae37590..16661c1b72e 100644
--- a/htdocs/langs/bs_BA/other.lang
+++ b/htdocs/langs/bs_BA/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=Files is too big
 PleaseBePatient=Please be patient...
 NewPassword=New password
 ResetPassword=Reset password
-RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
@@ -233,6 +233,8 @@ PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=Exports area
 AvailableFormats=Available formats
@@ -246,8 +248,4 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Titula
 WEBSITE_DESCRIPTION=Opis
 WEBSITE_KEYWORDS=Keywords
-<<<<<<< HEAD
-LinesToImport=Lines to import
-=======
 LinesToImport=Linija za uvoz
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
diff --git a/htdocs/langs/bs_BA/productbatch.lang b/htdocs/langs/bs_BA/productbatch.lang
index 7729354dcb8..80b78d893bc 100644
--- a/htdocs/langs/bs_BA/productbatch.lang
+++ b/htdocs/langs/bs_BA/productbatch.lang
@@ -16,7 +16,7 @@ printEatby=Eat-by: %s
 printSellby=Sell-by: %s
 printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic increase/decrease stock mode is forced to shipping validate and manual dispatching for reception and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
 ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
diff --git a/htdocs/langs/bs_BA/products.lang b/htdocs/langs/bs_BA/products.lang
index 48421c18acb..3b273415404 100644
--- a/htdocs/langs/bs_BA/products.lang
+++ b/htdocs/langs/bs_BA/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
 MinPrice=Min. selling price
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
 ContractStatusClosed=Zatvoreno
 ErrorProductAlreadyExists=A product with reference %s already exists.
@@ -155,7 +156,7 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Supplier prices
 SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
-CustomCode=Customs/Commodity/HS code
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
 Nature=Nature
 ShortLabel=Short label
diff --git a/htdocs/langs/bs_BA/projects.lang b/htdocs/langs/bs_BA/projects.lang
index 1abc7a6b648..b89b8365936 100644
--- a/htdocs/langs/bs_BA/projects.lang
+++ b/htdocs/langs/bs_BA/projects.lang
@@ -77,6 +77,7 @@ Time=Vrijeme
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=Lista poslovnih prijedloga u vezi s projektom
 ListOrdersAssociatedProject=List of customer orders associated with the project
@@ -226,8 +227,4 @@ AllowCommentOnProject=Allow user comments on projects
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-<<<<<<< HEAD
-SendProjectRef=About project %s
-=======
-SendProjectRef=O projektu %s
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/bs_BA/stocks.lang b/htdocs/langs/bs_BA/stocks.lang
index 9db682cf5b8..e19025507ed 100644
--- a/htdocs/langs/bs_BA/stocks.lang
+++ b/htdocs/langs/bs_BA/stocks.lang
@@ -8,17 +8,9 @@ WarehouseEdit=Modifikovanje skladišta
 MenuNewWarehouse=Novo skladište
 WarehouseSource=Izvorno skladište
 WarehouseSourceNotDefined=Nema definisanog skladišta,
-<<<<<<< HEAD
-AddWarehouse=Create warehouse
-=======
 AddWarehouse=Napravi skladište
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 AddOne=Dodaj jedno
-<<<<<<< HEAD
-DefaultWarehouse=Default warehouse
-=======
 DefaultWarehouse=Glavno skladište
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 WarehouseTarget=Ciljano skladište
 ValidateSending=Obriši slanje
 CancelSending=Poništi slanje
@@ -32,11 +24,7 @@ Movements=Kretanja
 ErrorWarehouseRefRequired=Referentno ime skladište je potrebno
 ListOfWarehouses=Lista skladišta
 ListOfStockMovements=Lista kretanja zaliha
-<<<<<<< HEAD
-ListOfInventories=List of inventories
-=======
 ListOfInventories=Spisak inventara
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
@@ -215,3 +203,4 @@ RegulateStock=Regulate Stock
 ListInventory=Spisak
 StockSupportServices=Stock management support services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/bs_BA/stripe.lang b/htdocs/langs/bs_BA/stripe.lang
index 9de79efff45..38cda02ce58 100644
--- a/htdocs/langs/bs_BA/stripe.lang
+++ b/htdocs/langs/bs_BA/stripe.lang
@@ -58,8 +58,8 @@ NameOnCard=Name on card
 CardNumber=Card Number
 ExpiryDate=Expiry Date
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/bs_BA/supplier_proposal.lang b/htdocs/langs/bs_BA/supplier_proposal.lang
index 930e23e5ca9..0e50265f936 100644
--- a/htdocs/langs/bs_BA/supplier_proposal.lang
+++ b/htdocs/langs/bs_BA/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Supplier commercial proposals
-supplier_proposalDESC=Manage price requests to suppliers
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
 SupplierProposalNew=New price request
 CommRequest=Price request
 CommRequests=Zahtjev za cijenu
 SearchRequest=Find a request
 DraftRequests=Draft requests
-SupplierProposalsDraft=Draft supplier proposals
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=Latest %s modified price requests
 RequestsOpened=Open price requests
-SupplierProposalArea=Supplier proposals area
-SupplierProposalShort=Supplier proposal
-SupplierProposals=Ponude dobavljača
-SupplierProposalsShort=Ponude dobavljača
+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=Supplier ref
+SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=Datum dostave
 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>?
@@ -47,9 +47,9 @@ CommercialAsk=Price request
 DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposals=List of supplier proposal requests
-ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
-SupplierProposalsToClose=Supplier proposals to close
-SupplierProposalsToProcess=Supplier proposals to process
+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
diff --git a/htdocs/langs/bs_BA/suppliers.lang b/htdocs/langs/bs_BA/suppliers.lang
index 7493b7fd3e1..2131b7bfec6 100644
--- a/htdocs/langs/bs_BA/suppliers.lang
+++ b/htdocs/langs/bs_BA/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Dobavljači
-SuppliersInvoice=Faktura dobavljača
-ShowSupplierInvoice=Show Supplier Invoice
-NewSupplier=Novi dobavljač
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=Historija
-ListOfSuppliers=Lista dobavljača
-ShowSupplier=Prikaži dobavljača
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=Datum narudžbe
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Neki podproizvodi nemaju definisanu cijenu
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
-SupplierPrices=Supplier prices
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Ova referentni dobavljač je već povezan sa referencom: %s
-NoRecordedSuppliers=Nijedan dobavljač snimljen
-SupplierPayment=Plaćanje dobavljača
-SuppliersArea=Područje za dobavljača
-RefSupplierShort=Ref. dobavljač
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=Dostupnost
-ExportDataset_fournisseur_1=Lista faktura dobavljača i tekstovi faktura
-ExportDataset_fournisseur_2=Fakture i plačanja dobavljača
-ExportDataset_fournisseur_3=Narudžbe za dobavljača i tekst narudžbe
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=Odobri ovu narudžbu
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
 ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
 ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
-AddSupplierOrder=Kreiraj narudžbu za dobavljača
-AddSupplierInvoice=Kreiraj fakturu za dobavljača
-ListOfSupplierProductForSupplier=Lista proizvoda i cijena za dobavljača <b>%s</b>
-SentToSuppliers=Poslano prema dobavljačima
-ListOfSupplierOrders=List of supplier orders
-MenuOrdersSupplierToBill=Supplier orders to invoice
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-SupplierReputation=Supplier reputation
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
 AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=Supplier prices
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/bs_BA/website.lang b/htdocs/langs/bs_BA/website.lang
index 82654522a03..c1e886b1fbb 100644
--- a/htdocs/langs/bs_BA/website.lang
+++ b/htdocs/langs/bs_BA/website.lang
@@ -73,7 +73,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
diff --git a/htdocs/langs/bs_BA/workflow.lang b/htdocs/langs/bs_BA/workflow.lang
index f06847238a5..d2b25e8b01a 100644
--- a/htdocs/langs/bs_BA/workflow.lang
+++ b/htdocs/langs/bs_BA/workflow.lang
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source custome
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/ca_ES/accountancy.lang b/htdocs/langs/ca_ES/accountancy.lang
index dd7fb9db672..73248baedfa 100644
--- a/htdocs/langs/ca_ES/accountancy.lang
+++ b/htdocs/langs/ca_ES/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Comptabilitat experta
 ACCOUNTING_EXPORT_SEPARATORCSV=Separador de columna pel fitxer d'exportació
 ACCOUNTING_EXPORT_DATE=Format de data pel fitxer d'exportació
 ACCOUNTING_EXPORT_PIECE=Export the number of piece
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Comptes amb valors no nuls
 ListOfAccounts=Llista de comptes
 
 MainAccountForCustomersNotDefined=Compte comptable per a clients no definida en la configuració
-MainAccountForSuppliersNotDefined=Compte comptable per a proveïdors no definit en la configuració
+MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
 MainAccountForUsersNotDefined=Compte comptable per a usuaris no de definit en la configuració
 MainAccountForVatPaymentNotDefined=Compte comptable per a IVA no definida en la configuració
 
-AccountancyArea=Àrea de comptabilitat
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=L'ús del mòdul de comptabilitat es realitza en diverses etapes:
 AccountancyAreaDescActionOnce=Les següents accions s'executen normalment per una sola vegada, o un cop l'any ...
 AccountancyAreaDescActionOnceBis=Els passos següents s'han de fer per estalviar-vos temps en el futur suggerint-vos el compte comptable per defecte correcte al fer els diaris (escriptura dels registres en els diaris i el Llibre Major)
@@ -89,7 +90,7 @@ MenuProductsAccounts=Comptes comptables de producte
 ProductsBinding=Comptes de producte
 Ventilation=Comptabilitzar en comptes
 CustomersVentilation=Comptabilització de factura de client
-SuppliersVentilation=Comptabilització de factura de proveïdor
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Comptabilització d'informes de despeses
 CreateMvts=Crea una nova transacció
 UpdateMvts=Modificació d'una transacció
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=Diari de compra
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Diari varis
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Diari de l'informe de despeses
 ACCOUNTING_SOCIAL_JOURNAL=Diari social
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Compte comptable de transferència
 ACCOUNTING_ACCOUNT_SUSPENSE=Compte comptable d'espera
@@ -185,11 +187,12 @@ ListeMvts=Llista de moviments
 ErrorDebitCredit=El dèbit i el crèdit no poden tenir valors alhora
 AddCompteFromBK=Afegeix comptes comptables al grup
 ReportThirdParty=Llista el compte del tercer
-DescThirdPartyReport=Consulti aquí la llista de tercers (cliente i proveïdors) i els seus corresponents comptes  comptables
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=Llistat dels comptes comptables
 UnknownAccountForThirdparty=Compte comptable de tercer desconeguda, utilitzarem %s
 UnknownAccountForThirdpartyBlocking=Compte comptable de tercer desconegut. Error de bloqueig
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Compte de tercers desconegut i compte d'espera no definit. Error de bloqueig
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Grup de compte
 Pcgsubtype=Subgrup de compte
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Consulta aquí la llista de línies de factures de client
 DescVentilTodoCustomer=Comptabilitza les línies de factura encara no comptabilitzades amb un compte comptable de producte
 ChangeAccount=Canvia el compte comptable de producte/servei per les línies seleccionades amb el següent compte comptable:
 Vide=-
-DescVentilSupplier=Consulta aquí la llista de línies de factura de proveïdor comptabilitzades o no comptabilitzades en un compte comptable de producte
-DescVentilDoneSupplier=Consulta aquí el llistat de línies de factures de proveïdors i els seus comptes comptables
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Línies d'informes de despeses comptabilitzades encara no comptabilitzades amb un compte comptable de tarifa
 DescVentilExpenseReport=Consulteu aquí la llista de les línies d'informe de despeses vinculada (o no) a un compte comptable corresponent a tarifa
 DescVentilExpenseReportMore=Si tu poses el compte comptable sobre les línies del informe per tipus de despesa, l'aplicació serà capaç de fer tots els vincles entre les línies del informe i els comptes comptables del teu pla comptable, només amb un clic amb el botó <strong>"%s"</strong>. Si el compte no estava al diccionari de tarifes o si encara hi ha línies no vinculades a cap compte, hauràs de fer-ho manualment a partir del menú "<strong>%s</strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Comptabilitza automàticament
 AutomaticBindingDone=Comptabilització automàtica realitzada
 
 ErrorAccountancyCodeIsAlreadyUse=Error, no pots eliminar aquest compte comptable perquè està en ús
-MvtNotCorrectlyBalanced=Registre comptabilitzat incorrectament. Deure=%s. Haver=%s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Fitxa de comptabilització
 GeneralLedgerIsWritten=Les transaccions s'han escrit al llibre major
 GeneralLedgerSomeRecordWasNotRecorded=Algunes de les transaccions no van poder ser registrats al diari. Si no hi ha cap altre missatge d'error, probablement és perquè ja es van publicar.
@@ -234,11 +237,7 @@ AccountingJournal=Diari comptable
 NewAccountingJournal=Nou diari comptable
 ShowAccoutingJournal=Mostrar diari comptable
 Nature=Caràcter
-<<<<<<< HEAD
-AccountingJournalType1=Miscellaneous operations
-=======
 AccountingJournalType1=Operacions diverses
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 AccountingJournalType2=Vendes
 AccountingJournalType3=Compres
 AccountingJournalType4=Banc
@@ -246,7 +245,7 @@ AccountingJournalType5=Informe de despeses
 AccountingJournalType8=Inventari
 AccountingJournalType9=Haver
 ErrorAccountingJournalIsAlreadyUse=Aquest diari ja està en ús
-AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
+AccountingAccountForSalesTaxAreDefinedInto=Nota: el compte de comptes de l'impost de vendes es defineix al menú <b> %s </b> - <b> %s </b>
 
 ## Export
 ExportDraftJournal=Exportar esborranys del llibre 
@@ -297,4 +296,9 @@ Binded=Línies comptabilitzades
 ToBind=Línies a comptabilitzar
 UseMenuToSetBindindManualy=No es possible auto-detectar, utilitzeu el menú <a href="%s">%s</a> per fer l'enllaç manualment
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Avís, aquest informe no està basat en el Ledger, de manera que no conté transaccions manuals modificades en el Ledger. Si la vostra publicació diària està actualitzada, la vista de comptes és més precisa.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index c9649df73f0..448a1ec12cc 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=Nom host o ip del servidor SMTP (Per defecte en php.ini: <
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Port del servidor SMTP (No definit en PHP en sistemes de tipus Unix)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Nom servidor o ip del servidor SMTP (No definit en PHP en sistemes de tipus Unix)
 MAIN_MAIL_EMAIL_FROM=Remitent del correu per a correus automàtics (Valor per defecte a php.ini: <b>1%s</b>)
-MAIN_MAIL_ERRORS_TO=E-mail a utilitzar per als e-mails d'error enviats
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= Envia automàticament una còpia oculta de tots els e-mails enviats a
 MAIN_DISABLE_ALL_MAILS=Deshabilitar l'enviament de tots els correus (per fer proves o en llocs tipus demo)
 MAIN_MAIL_FORCE_SENDTO=Envieu tots els correus electrònics a (en lloc de destinataris reals, amb finalitats d'assaig)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=Mètode d'enviament d'e-mails
 MAIN_MAIL_SMTPS_ID=ID d'autenticació SMTP si es requereix autenticació SMTP
 MAIN_MAIL_SMTPS_PW=Contrasenya autentificació SMTP si es requereix autenticació SMTP
@@ -291,7 +292,7 @@ ModuleSetup=Configuració del mòdul
 ModulesSetup=Configuració de mòduls/aplicacions
 ModuleFamilyBase=Sistema
 ModuleFamilyCrm=Gestió client (CRM)
-ModuleFamilySrm=Gestió de seguiment de proveïdors (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Gestió de productes (PM)
 ModuleFamilyHr=Gestió de recursos humans (HR)
 ModuleFamilyProjects=Projectes/Treball cooperatiu
@@ -373,7 +374,8 @@ NoSmsEngine=No hi ha cap gestor d'enviament de SMS. Els gestors d'enviament de S
 PDF=PDF
 PDFDesc=Defineix les opcions globals relacionades a la generació de PDF
 PDFAddressForging=Regles de visualització d'adreces
-HideAnyVATInformationOnPDF=Amaga tota la informació relacionada amb l'IVA en els PDF generats
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Regles per %s
 HideLocalTaxOnPDF=Amagar la tasa %s a la columna d'impostos de venda del pdf
 HideDescOnPDF=Amagar descripció dels productes en la generació dels PDF
@@ -445,12 +447,13 @@ DisplayCompanyInfo=Mostra l'adreça de l'empresa
 DisplayCompanyManagers=Mostra el gestor de noms
 DisplayCompanyInfoAndManagers=Mostra l'adreça de l'empresa i els noms del gerència
 EnableAndSetupModuleCron=Si vols tenir aquesta factura recurrent generada automàticament, el mòdul *%s* s'ha d'habilitar i configurar correctament. D'altra banda, la generació de factures s'ha de fer manualment des d'aquesta plantilla amb el bóto "Crea". Tingues en compte que si actives la generació automàtica, pots continuar generant factures manuals. No és possible la generació de duplicitats pel mateix període. 
-ModuleCompanyCodeAquarium=Retorna un codi comptable construït per:<br>%s seguit pel codi d'un tercer proveïdor per a obtenir un codi comptable de proveïdor,<br>%s seguit pel codi d'un tercer client per a obtenir un codi comptable de client.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Retorna un codi comptable buit.
 ModuleCompanyCodeDigitaria=El codi comptable depèn del codi del Tercer. El codi està format pel caràcter "C" a la primera posició seguit dels 5 primers caràcters del codi del Tercer.
 Use3StepsApproval=Per defecte, les comandes de compra necessiten ser creades i aprovades per 2 usuaris diferents (el primer pas/usuari és per a crear i un altre pas/usuari per aprovar. Noteu que si un usuari te permisos tant per crear com per aprovar, un sol pas/usuari serà suficient). Amb aquesta opció, tens la possibilitat d'introduir un tercer pas/usuari per a l'aprovació, si l'import es superior a un determinat valor (d'aquesta manera són necessaris 3 passos: 1=validació, 2=primera aprovació i 3=segona aprovació si l'import és suficient).<br>Deixa-ho en blanc si només vols un nivell d'aprovació (2 passos); posa un valor encara que sigui molt baix (0,1) si vols una segona aprovació (3 passos).
 UseDoubleApproval=Utilitza una aprovació en 3 passos quan l'import (sense impostos) sigui més gran que...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail=ADVERTIMENT: sovint és millor configurar correus electrònics de sortida per utilitzar el servidor de correu electrònic del vostre proveïdor en comptes de la configuració predeterminada. Alguns proveïdors de correu electrònic (com Yahoo) no us permeten enviar un correu electrònic des d'un altre servidor que el seu propi servidor. La seva configuració actual utilitza el servidor de l'aplicació per enviar correus electrònics i no el servidor del vostre proveïdor de correu electrònic, de manera que alguns destinataris (el que sigui compatible amb el protocol restrictiu de DMARC), us preguntaran al vostre proveïdor de correu electrònic si poden acceptar el vostre correu electrònic i alguns proveïdors de correu electrònic (com Yahoo) pot respondre "no" perquè el servidor no és un servidor d'ells, així que pocs dels vostres correus electrònics enviats no es poden acceptar (tingueu cura també de la quota d'enviament del vostre proveïdor de correu electrònic). Si el vostre proveïdor de correu electrònic (com Yahoo) té aquesta restricció, heu de canviar la configuració de correu electrònic per triar l'altre mètode "servidor SMTP" i introduir el servidor SMTP i les credencials proporcionades pel vostre proveïdor de correu electrònic (demaneu al proveïdor d'EMail que obtingui credencials SMTP per al vostre compte).
 WarningPHPMail2=Si el vostre proveïdor SMTP de correu electrònic necessita restringir el client de correu electrònic a algunes adreces IP (molt poc freqüent), aquesta és l'adreça IP de la vostra aplicació ERP CRM: <strong>%s</strong>.
 ClickToShowDescription=Clica per mostrar la descripció
 DependsOn=Aquest mòdul necesita el/s mòdul/s
@@ -470,11 +473,10 @@ WatermarkOnDraftExpenseReports=Marca d'aigua en informes de despeses esborrany
 AttachMainDocByDefault=Establiu-lo a 1 si voleu adjuntar el document principal al correu electrònic de manera predeterminada (si escau)
 FilesAttachedToEmail=Adjuntar fitxer
 SendEmailsReminders=Enviar recordatoris d'agenda per correu electrònic
-<<<<<<< HEAD
-davDescription=Add a component to be a DAV server
-=======
 davDescription=Afegeix un component per ser un servidor DAV
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=Usuaris i grups
 Module0Desc=Gestió d'usuaris / empleats i grups
@@ -483,7 +485,7 @@ Module1Desc=Gestió d'empreses i contactes (clients, clients potencials...)
 Module2Name=Comercial
 Module2Desc=Gestió comercial
 Module10Name=Comptabilitat
-Module10Desc=Activació d'informes simples de comptabilitat (diaris, vendes) basats en el contingut de la base de dades. Sense desglossaments.
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=Pressupostos
 Module20Desc=Gestió de pressupostos/propostes comercials
 Module22Name=E-Mailings
@@ -550,8 +552,8 @@ Module400Name=Projectes/Oportunitats/Leads
 Module400Desc=Gestió de projectes, oportunitats/leads i/o tasques. Pots asignar també qualsevol element (factura, comanda, pressupost, intervenció...) a un projecte i obtindre una vista transversal del projecte.
 Module410Name=Webcalendar
 Module410Desc=Interface amb el calendari webcalendar
-Module500Name=Pagaments especials
-Module500Desc=Gestió de despeses especials (impostos varis, dividends)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Pagament de salaris dels empleats
 Module510Desc=Registre i seguiment del pagament dels salaris dels empleats
 Module520Name=Préstec
@@ -565,14 +567,14 @@ Module700Name=Donacions
 Module700Desc=Gestió de donacions
 Module770Name=Informes de despeses
 Module770Desc=Informes de despeses de gestió i reclamació (transport, menjar, ...)
-Module1120Name=Pressupost de proveïdor
-Module1120Desc=Sol·licitud pressupost i preus a proveïdor
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Interface amb el sistema de seguiment d'incidències Mantis
 Module1520Name=Generar document
 Module1520Desc=Generació de documents de correu massiu
 Module1780Name=Etiquetes
-Module1780Desc=Crea etiquetes (productes, clients, proveïdors, contactes o socis)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=Editor WYSIWYG
 Module2000Desc=Permet editar algunes àrees de text utilitzant un editor avançat (basat en CKEditor)
 Module2200Name=Multi-preus
@@ -580,7 +582,7 @@ Module2200Desc=Activar l'ús d'expressions matemàtiques per als preus
 Module2300Name=Tasques programades
 Module2300Desc=Gestió de tasques programades (alias cron o taula chrono)
 Module2400Name=Esdeveniments/Agenda
-Module2400Desc=Segueix els esdeveniments realitzats o propers. Permet a l'aplicació registrar esdeveniments automàtics per seguiment o registra manualment els esdeveniments o cites.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 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.
 Module2600Name=Serveis API/WEB (servidor SOAP)
@@ -617,7 +619,7 @@ Module50100Desc=Mòdul Terminal Punt Venda (TPV)
 Module50200Name=Paypal
 Module50200Desc=Mòdul per oferir una pàgina de pagament en línia que accepti pagaments mitjançant PayPal (targeta de crèdit o amb crèdit PayPal). Això es pot utilitzar per permetre als vostres clients fer pagaments lliures o el pagament d'un objecte particular de Dolibarr (factura, comanda, ...)
 Module50400Name=Comptabilitat (avançat)
-Module50400Desc=Gestió comptable (entrades dobles, suport a llibres major i auxiliar)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=PrintIPP
 Module54000Desc=L'impressió directa (sense obrir els documents) utilitza l'interfície Cups IPP (L'impressora té que ser visible pel servidor i CUPS té que estar instal·lat en el servidor)
 Module55000Name=Enquesta o votació
@@ -842,21 +844,11 @@ Permission1251=Llançar les importacions en massa a la base de dades (càrrega d
 Permission1321=Exporta factures de clients, atributs i cobraments
 Permission1322=Reobrir una factura pagada
 Permission1421=Exporta comandes de clients i atributs
-<<<<<<< HEAD
-Permission20001=Read leave requests (your leaves and the one of your subordinates)
-Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
-=======
 Permission20001=Consulta els dies de lliure disposició (els propis i els dels teus subordinats)
 Permission20002=Crea/modifica els teus dies de lliure disposició (els propis i els dels teus subordinats)
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 Permission20003=Elimina les peticions de dies lliures retribuïts
-<<<<<<< HEAD
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-=======
 Permission20004=Consulta tots els dies de lliure disposició (inclòs els usuaris no subordinats)
 Permission20005=Crea/modifica els dies de lliure disposició per tothom (inclòs els usuaris no subordinats)
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 Permission20006=Administra els dies de lliure disposició (configura i actualitza el balanç)
 Permission23001=Consulta les tasques programades
 Permission23002=Crear/Modificar les tasques programades
@@ -1047,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerància de retard abans de l'alerta (en dies) sobr
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerància de retard abans de l'alerta (en dies) sobre xecs a ingressar
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerància de retard (en dies) abans d'alertar d'informes de despeses pendents d'aprovar
 SetupDescription1=L'àrea de configuració són pels paràmetres de configuració inicials abans de començar a utilitzar Dolibarr.
-SetupDescription2=Els dos passos de configuració obligatoris són els dos primers en el menú d'instal·lació de l'esquerra: %s pàgina de configuració i %s pàgina de configuració:
-SetupDescription3=Paràmetres del menú <a href="%s"> %s -> %s </a> són obligatoris perquè les dades definides són utilitzades a les pantalles Dolibarr i per personalitzar el comportament predeterminat del programa (per exemple, funcionalitats relacionades amb el país).
-SetupDescription4=Paràmetres del menú <a href="%s"> %s -> %s </a> són obligatoris perquè l'ERP/CRM Dolibarr és una col·lecció de diversos mòduls/aplicacions, més o menys independents. Les noves funcionalitats s'afegiran als menús per cada mòdul que activeu.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=Les altres entrades de configuració gestionen paràmetres opcionals.
 LogEvents=Auditoria de la seguretat d'esdeveniments
 Audit=Auditoria
@@ -1068,8 +1060,9 @@ LogEventDesc=Podeu habilitar el registre d'esdeveniments de seguretat Dolibarr a
 AreaForAdminOnly=Els paràmetres de configuració només poden ser establerts per <b>usuaris administradors</b>.
 SystemInfoDesc=La informació del sistema és informació tècnica accessible només en només lectura als administradors.
 SystemAreaForAdminOnly=Aquesta àrea només és accessible als usuaris de tipus administradors. Cap permís Dolibarr permet estendre el cercle de usuaris autoritzats a aquesta áera.
-CompanyFundationDesc=Edita en aquesta pàgina tota la informació coneguda sobre l'empresa o entitat a administrar (Fes clic al botó "Modificar" o "Desar" a peu de pàgina)
-AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
+AccountantDesc=Editeu en aquesta pàgina tota la informació coneguda sobre el vostre comptable
+AccountantFileNumber=File number
 DisplayDesc=Selecciona els paràmetres relacionats amb l'aparença de Dolibarr
 AvailableModules=Mòduls/complements disponibles
 ToActivateModule=Per activar els mòduls, aneu a l'àrea de Configuració (Inici->Configuració->Mòduls).
@@ -1202,11 +1195,11 @@ UserMailRequired=E-mail necessari per crear un usuari nou
 HRMSetup=Configuració de mòdul de gestió de recursos humans
 ##### Company setup #####
 CompanySetup=Configuració del mòdul empreses
-CompanyCodeChecker=Mòdul de generació i control dels codis de tercers (clients/proveïdors)
-AccountCodeManager=Mòdul per generació de codis comptables (clients o proveïdors)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=La funció de les notificacions permet enviar automàticament un e-mail per alguns esdeveniments de Dolibarr. Els destinataris de les notificacions poden definir-se:
 NotificationsDescUser=* per usuaris, un usuari cada vegada
-NotificationsDescContact=* per contactes de tercers (clients o proveïdors), un contacte cada vegada
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* o definint un destí global de correu electrònic en la pàgina de configuració del mòdul
 ModelModules=Models de documents
 DocumentModelOdt=Generació des dels documents amb format OpenDocument (Arxiu .ODT OpenOffice, KOffice, TextEdit,...)
@@ -1217,6 +1210,9 @@ MustBeUnique=Ha de ser únic?
 MustBeMandatory=Obligatori per a crear tercers?
 MustBeInvoiceMandatory=Obligatori per validar factures?
 TechnicalServicesProvided=Prestació de serveis tècnics
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Un vincle d'exportació del calendari en format <b>%s</b> estarà disponible a la url: %s
 ##### Invoices #####
@@ -1243,15 +1239,15 @@ FreeLegalTextOnProposal=Text lliure en pressupostos
 WatermarkOnDraftProposal=Marca d'aigua en pressupostos esborrany (en cas d'estar buit)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Preguntar compte bancari del pressupost
 ##### SupplierProposal #####
-SupplierProposalSetup=Configuració del mòdul Sol·licituds a proveïdor
-SupplierProposalNumberingModules=Models de numeració de sol·licitud de preus a proveïdor
-SupplierProposalPDFModules=Models de documents de sol·licituts de preus a proveïdors
-FreeLegalTextOnSupplierProposal=Text lliure en sol·licituds de preus a proveïdors
-WatermarkOnDraftSupplierProposal=Marca d'aigua en sol·licituds de preus a proveïdors (en cas d'estar buit)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Preguntar per compte bancari per utilitzar en el pressupost
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Preguntar per el magatzem d'origen per a la comanda
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Demanar el compte bancari destí de la comanda de proveïdor
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=Configuració del mòdul comandes
 OrdersNumberingModules=Models de numeració de comandes
@@ -1462,15 +1458,9 @@ SyslogFilename=Nom i ruta de l'arxiu
 YouCanUseDOL_DATA_ROOT=Utilitza DOL_DATA_ROOT/dolibarr.log per un fitxer de registre en la carpeta documents de Dolibarr. Tanmateix, es pot definir una carpeta diferent per guardar aquest fitxer.
 ErrorUnknownSyslogConstant=La constant %s no és una constant syslog coneguda
 OnlyWindowsLOG_USER=Windows només suporta LOG_USER
-<<<<<<< HEAD
-CompressSyslogs=Syslog files compression and backup
-SyslogFileNumberOfSaves=Còpies del log
-ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
-=======
 CompressSyslogs=Compressió i còpia de seguretat d'arxius Syslog
 SyslogFileNumberOfSaves=Còpies del log
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configura la tasca programada de neteja per establir la freqüència de còpia de seguretat del registre
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 ##### Donations #####
 DonationsSetup=Configuració del mòdul donacions
 DonationsReceiptModel=Plantilla de rebut de donació
@@ -1535,7 +1525,7 @@ OSCommerceTestOk=La connexió al servidor '%s' sobre la base '%s' per l'usuari '
 OSCommerceTestKo1=La connexió al servidor '%s' s'ha completat però amb la base de dades '%s' no s'ha pogut assolir.
 OSCommerceTestKo2=La connexió al servidor '%s'  per l'usuari '%s' ha fallat.
 ##### Stock #####
-StockSetup=Configuració del mòdul de magatzem
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=Si utilitza un mòdul de Punt de Venda (mòdul TPV per defecte o un altre mòdul extern), aquesta configuració pot ser ignorada pel seu mòdul de Punt de Venda. La major part de mòduls TPV estan dissenyats per crear immediatament una factura i disminuir l'estoc amb qualsevol d'aquestes opcions. Per tant, si vostè necessita o no disminuir l'estoc en el registre d'una venda del seu punt de venda, controli també la configuració del seu mòdul de TPV.
 ##### Menu #####
 MenuDeleted=Menú eliminat
@@ -1567,20 +1557,12 @@ FailedToInitializeMenu=Error al inicialitzar el menú
 ##### Tax #####
 TaxSetup=Configuració del mòdul d'impostos varis i dividends
 OptionVatMode=Opció de càrrega d'IVA
-<<<<<<< HEAD
-OptionVATDefault=Standard basis
-=======
 OptionVATDefault=Base estàndard
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 OptionVATDebitOption=Dèbit
 OptionVatDefaultDesc=La càrrega de l'IVA és: <br>-en l'enviament dels béns (en la pràctica s'usa la data de la factura)<br>-sobre el pagament pels serveis
 OptionVatDebitOptionDesc=La càrrega de l'IVA és: <br>-en l'enviament dels béns en la pràctica s'usa la data de la factura<br>-sobre la facturació dels serveis
-<<<<<<< HEAD
-OptionPaymentForProductAndServices=Cash basis for products and services
-=======
 OptionPaymentForProductAndServices=Base de caixa de productes i serveis
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
-OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
+OptionPaymentForProductAndServicesDesc=L'IVA es deu: <br> - pel pagament de béns <br> - sobre els pagaments per serveis
 SummaryOfVatExigibilityUsedByDefault=Moment d'exigibilitat per defecte l'IVA per a l'opció escollida:
 OnDelivery=Al lliurament
 OnPayment=Al pagament
@@ -1655,8 +1637,8 @@ ChequeReceiptsNumberingModule=Mòdul de numeració de rebut de xec
 MultiCompanySetup=Configuració del mòdul Multi-empresa
 ##### Suppliers #####
 SuppliersSetup=Configuració del mòdul Proveïdors
-SuppliersCommandModel=Model de comandes a proveïdors complet (logo...)
-SuppliersInvoiceModel=Model de factures de proveïdors complet (logo...)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Models de numeració de factures de proveïdor
 IfSetToYesDontForgetPermission=Si esta seleccionat, no oblideu de modificar els permisos en els grups o usuaris per permetre la segona aprovació
 ##### GeoIPMaxmind #####
@@ -1693,7 +1675,7 @@ NoAmbiCaracAutoGeneration=No utilitzar caràcters semblants ("1", "l", "i", "|",
 SalariesSetup=Configuració dels sous dels mòduls
 SortOrder=Ordre de classificació
 Format=Format
-TypePaymentDesc=0:Forma de pagament a client, 1:Forma de pagament a proveïdor, 2:Mateixa forma de pagament per clients i proveïdors
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Incloure ruta (que es defineix a la variable %s)
 ExpenseReportsSetup=Configuració del mòdul Informe de Despeses
 TemplatePDFExpenseReports=Mòdels de documentació per generar informes de despeses
@@ -1715,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=La instal·lació de mòduls externs d
 ConfFileMustContainCustom=Per instal·lar o crear un mòdul extern desde l'aplicació es necessita desar els fitxers del mòdul en el directori <strong>%s</strong>. Per permetre a Dolibarr el processament d'aquest directori, has de configurar el teu <strong>conf/conf.php</strong> afegint aquestes 2 línies:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Remarca línies de la taula quan el ratolí passi per sobre
 HighlightLinesColor=Remarca el color de la línia quan el ratolí hi passa per sobre (deixa-ho buit per a no remarcar)
-TextTitleColor=Color de títol de pàgina
+TextTitleColor=Text color of Page title
 LinkColor=Color dels enllaços
 PressF5AfterChangingThis=Prem CTRL+F5 en el teclat o neteja la memòria cau del navegador després de canviar aquest valor per fer-ho efectiu
 NotSupportedByAllThemes=Funcionarà amb els temes del nucli, però pot no estar suportat per temes externs
@@ -1724,6 +1706,7 @@ TopMenuBackgroundColor=Color de fons pel menú superior
 TopMenuDisableImages=Oculta les imatges en el menú superior
 LeftMenuBackgroundColor=Color de fons pel menú de l'esquerra
 BackgroundTableTitleColor=Color de fons per línies de títol en taules
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Color de fons per les línies senars de les taules
 BackgroundTableLineEvenColor=Color de fons per les línies parells de les taules
 MinimumNoticePeriod=Període mínim de notificació (La solicitud de dia lliure serà donada abans d'aquest període)
@@ -1746,23 +1729,19 @@ FillFixTZOnlyIfRequired=Exemple: +2 (omple'l només si tens problemes)
 ExpectedChecksum=Checksum esperat
 CurrentChecksum=Checksum actual
 ForcedConstants=Valors de constants requerits
-MailToSendProposal=Enviar pressupost de client
-MailToSendOrder=Enviar comanda de client
-MailToSendInvoice=Enviar factura de client
-MailToSendShipment=Enviar expedició
-MailToSendIntervention=Enviar intervenció
-MailToSendSupplierRequestForQuotation=Enviar pressupost de proveïdor
-MailToSendSupplierOrder=Enviar comanda de proveïdor
-MailToSendSupplierInvoice=Enviar factura de proveïdor
-MailToSendContract=Per a enviar un contracte
-MailToThirdparty=Per enviar correu electrònic des de la pàgina del tercer
-MailToMember=Enviar correu electrònic des de la pàgina del membre
-MailToUser=Enviar correu electrònic des de la pàgina d'usuari
-<<<<<<< HEAD
-MailToProject= To send email from project page
-=======
-MailToProject= Enviar correu electrònic des de la pàgina de projecte
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
+MailToSendProposal=Pressupostos
+MailToSendOrder=Comandes de client
+MailToSendInvoice=Factures a clients
+MailToSendShipment=Enviaments
+MailToSendIntervention=Intervencions
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Contractes
+MailToThirdparty=Tercers
+MailToMember=Socis
+MailToUser=Usuaris
+MailToProject=Projects page
 ByDefaultInList=Mostra per defecte en la vista del llistat
 YouUseLastStableVersion=Estàs utilitzant l'última versió estable
 TitleExampleForMajorRelease=Exemple de missatge que es pot utilitzar per anunciar aquesta actualització de versió (ets lliure d'utilitzar-ho a les teves webs)
@@ -1811,12 +1790,11 @@ MAIN_PDF_MARGIN_TOP=Marge superior al PDF
 MAIN_PDF_MARGIN_BOTTOM=Marge inferior al PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Estableixi a SÍ si aquest grup és un càlcul d'altres grups
 EnterCalculationRuleIfPreviousFieldIsYes=Introduïu la regla de càlculs si el camp anterior ha estat posat a SÍ (Per exemple 'CODEGRP1 + CODEGRP2')
-<<<<<<< HEAD
-SeveralLangugeVariatFound=Several language variants found
-=======
 SeveralLangugeVariatFound=S'ha trobat diverses variants d'idiomes
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Configuració del mòdul Recurs
 UseSearchToSelectResource=Utilitza un formulari de cerca per a seleccionar un recurs (millor que una llista desplegable)
diff --git a/htdocs/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang
index 220d5a62766..e5bf8f7395d 100644
--- a/htdocs/langs/ca_ES/bills.lang
+++ b/htdocs/langs/ca_ES/bills.lang
@@ -67,7 +67,7 @@ PaidBack=Reemborsat
 DeletePayment=Elimina el pagament
 ConfirmDeletePayment=Esteu segur de voler eliminar aquest pagament?
 ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will so 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 absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReducSupplier=Voleu convertir aquest %s en un descompte absolut? <br> L'import es guardarà entre tots els descomptes i es podria utilitzar com a descompte per a una factura actual o futura per a aquest proveïdor.
 SupplierPayments=Pagaments a proveïdors
 ReceivedPayments=Pagaments rebuts
 ReceivedCustomersPayments=Cobraments rebuts de clients
@@ -92,7 +92,7 @@ PaymentAmount=Import pagament
 ValidatePayment=Validar aquest pagament
 PaymentHigherThanReminderToPay=Pagament superior a la resta a pagar
 HelpPaymentHigherThanReminderToPay=Atenció, l'import del pagament d'una o més factures és superior a la resta a pagar.<br>Corregiu la entrada, en cas contrari, confirmeu i pensi en crear un abonament d'allò percebut en excés per cada factura sobrepagada.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Atenció, l'import del pagament d'una o més factures és superior al de la resta a pagar. <br> Editeu la vostra entrada, en cas contrari confirmeu i penseu a crear una nota de crèdit de l'excés pagat per cada factura pagada.
 ClassifyPaid=Classificar 'Pagat'
 ClassifyPaidPartially=Classificar 'Pagat parcialment'
 ClassifyCanceled=Classificar 'Abandonat'
@@ -109,9 +109,9 @@ CancelBill=Anul·lar una factura
 SendRemindByMail=Envia recordatori per e-mail
 DoPayment=Enter payment
 DoPaymentBack=Enter refund
-ConvertToReduc=Convertir en reducció futura
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into future discount
-ConvertExcessPaidToReduc=Convert excess paid into future discount
+ConvertExcessPaidToReduc=Convertir l'excés pagat en un descompte futur
 EnterPaymentReceivedFromCustomer=Afegir cobrament rebut del client
 EnterPaymentDueToCustomer=Fer pagament del client
 DisabledBecauseRemainderToPayIsZero=Desactivar ja que la resta a pagar és 0
@@ -120,7 +120,7 @@ BillStatus=Estat de la factura
 StatusOfGeneratedInvoices=Estat de factures generades
 BillStatusDraft=Esborrany (a validar)
 BillStatusPaid=Pagada
-BillStatusPaidBackOrConverted=Reemborsada o convertida en descompte
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Pagada (llesta per utilitzar-se en factura final)
 BillStatusCanceled=Abandonada
 BillStatusValidated=Validada (a pagar)
@@ -222,7 +222,7 @@ RemainderToPayBack=Import pendent per reemborsar
 Rest=Pendent
 AmountExpected=Import reclamat
 ExcessReceived=Rebut en excés
-ExcessPaid=Excess paid
+ExcessPaid=Excés de pagament
 EscompteOffered=Descompte (pagament aviat)
 EscompteOfferedShort=Descompte
 SendBillRef=Enviament de la factura %s
@@ -286,8 +286,8 @@ Deposit=Bestreta
 Deposits=Bestretes
 DiscountFromCreditNote=Descompte resultant del abonament %s
 DiscountFromDeposit=Pagaments de la factura de bestreta %s
-DiscountFromExcessReceived=Payments in excess of invoice %s
-DiscountFromExcessPaid=Payments in excess of invoice %s
+DiscountFromExcessReceived=Pagaments superiors a la factura %s
+DiscountFromExcessPaid=Pagaments superiors a la factura %s
 AbsoluteDiscountUse=Aquest tipus de crèdit no es pot utilitzar en una factura abans de la seva validació
 CreditNoteDepositUse=La factura deu estar validada per a utilitzar aquest tipus de crèdits
 NewGlobalDiscount=Nou descompte fixe
@@ -296,10 +296,10 @@ DiscountType=Tipus de descompte
 NoteReason=Nota/Motiu
 ReasonDiscount=Motiu
 DiscountOfferedBy=Acordat per
-DiscountStillRemaining=Descomptes disponibles
-DiscountAlreadyCounted=Descomptes ja consumits
-CustomerDiscounts=Customer discounts
-SupplierDiscounts=Descomptes de proveïdor
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
+CustomerDiscounts=Descomptes de clients
+SupplierDiscounts=Vendors discounts
 BillAddress=Direcció de facturació
 HelpEscompte=Un <b>descompte</b> és un descompte acordat sobre una factura donada, a un client que va realitzar el seu pagament molt abans del venciment.
 HelpAbandonBadCustomer=Aquest import es va abandonar (client jutjat com morós) i es considera com una pèrdua excepcional.
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Permet fer pagaments en factures de diferents terce
 PaymentNote=Nota de pagament
 ListOfPreviousSituationInvoices=Llista de factures de situació anteriors
 ListOfNextSituationInvoices=Llista de factures de situació següents
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Cada %s dies
 FrequencyPer_m=Cada %s mesos
 FrequencyPer_y=Cada %s anys
@@ -348,17 +354,10 @@ NextDateToExecution=Data de la propera generació de factures
 NextDateToExecutionShort=Data següent gen.
 DateLastGeneration=Data de l'última generació
 DateLastGenerationShort=Data última gen.
-<<<<<<< HEAD
-MaxPeriodNumber=Max number of invoice generation
-NbOfGenerationDone=Number of invoice generation already done
-NbOfGenerationDoneShort=Number of generation done
-MaxGenerationReached=Maximum number of generations reached
-=======
 MaxPeriodNumber=Número màxim de generació de factures
 NbOfGenerationDone=Número de generació de factura ja realitzat
 NbOfGenerationDoneShort=Número de generació realitzat
 MaxGenerationReached=Número màxim de generacions aconseguides
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 InvoiceAutoValidate=Valida les factures automàticament
 GeneratedFromRecurringInvoice=Generat des de la plantilla de factura recurrent %s
 DateIsNotEnough=Encara no s'ha arribat a la data
@@ -512,9 +511,14 @@ SituationAmount=Import (sense IVA) de la factura de situació
 SituationDeduction=Situació d'exportació
 ModifyAllLines=Modificar totes les línies
 CreateNextSituationInvoice=Crea la següent situació
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=Aquesta factura no és l'última en el cicle i no es pot modificar.
 DisabledBecauseNotLastInCycle=Ja existeix la següent situació.
 DisabledBecauseFinal=Aquesta situació és definitiva.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=S
 CantBeLessThanMinPercent=El progrés no pot ser menor que el seu valor en la situació anterior.
 NoSituations=No hi ha situacions obertes
 InvoiceSituationLast=Factura final i general
@@ -535,7 +539,8 @@ BillCreated=%s càrrec(s) creats
 StatusOfGeneratedDocuments=Estat de la generació de documents
 DoNotGenerateDoc=No generar cap fitxer de document
 AutogenerateDoc=Genera automàticament el fitxer del document
-AutoFillDateFrom=Set start date for service line with invoice date
-AutoFillDateFromShort=Set start date
-AutoFillDateTo=Set end date for service line with next invoice date
-AutoFillDateToShort=Set end date
+AutoFillDateFrom=Estableix la data d'inici de la línia de serveis amb la data de la factura
+AutoFillDateFromShort=Estableix la data d'inici
+AutoFillDateTo=Estableix la data de finalització de la línia de serveis amb la següent data de la factura
+AutoFillDateToShort=Estableix la data de finalització
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/ca_ES/categories.lang b/htdocs/langs/ca_ES/categories.lang
index 3df8410cbbf..d9b7bae161c 100644
--- a/htdocs/langs/ca_ES/categories.lang
+++ b/htdocs/langs/ca_ES/categories.lang
@@ -85,3 +85,4 @@ CategorieRecursivHelp=Si esta activat, el producte s'enllaçara a la categoria p
 AddProductServiceIntoCategory=Afegir el següent producte/servei
 ShowCategory=Mostra etiqueta
 ByDefaultInList=Per defecte en el llistat
+ChooseCategory=Choose category
diff --git a/htdocs/langs/ca_ES/commercial.lang b/htdocs/langs/ca_ES/commercial.lang
index 4135dceebce..b46f3bbcea0 100644
--- a/htdocs/langs/ca_ES/commercial.lang
+++ b/htdocs/langs/ca_ES/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=Tancament
 ActionAC_EMAILING=Envia mailing massiu
 ActionAC_COM=Envia comanda de client per e-mail
 ActionAC_SHIP=Envia expedició per e-mail
-ActionAC_SUP_ORD=Envia comanda a proveïdor per e-mail
-ActionAC_SUP_INV=Envia factura de proveïdor per e-mail
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=Altres
 ActionAC_OTH_AUTO=Esdeveniments creats automàticament
 ActionAC_MANUAL=Esdeveniments creats manualment
diff --git a/htdocs/langs/ca_ES/companies.lang b/htdocs/langs/ca_ES/companies.lang
index 684b87aa3f5..53c93f0baf7 100644
--- a/htdocs/langs/ca_ES/companies.lang
+++ b/htdocs/langs/ca_ES/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Esteu segur de voler eliminar aquest contacte i tota la sev
 MenuNewThirdParty=Nou tercer
 MenuNewCustomer=Nou client
 MenuNewProspect=Nou client potencial
-MenuNewSupplier=Nou proveïdor
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=Nou particular
-NewCompany=Nova empresa (client potencial, client, proveïdor)
-NewThirdParty=Nou tercer (client potencial, client, proveïdor)
-CreateDolibarrThirdPartySupplier=Crea un tercer (proveïdor)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=Crea tercer
 CreateThirdPartyAndContact=Crea un tercer + un contacte fill
 ProspectionArea=Àrea de pressupostos
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=Clients potencials
 ThirdPartyCustomers=Clients
 ThirdPartyCustomersStats=Clients
 ThirdPartyCustomersWithIdProf12=Clients amb %s o %s
-ThirdPartySuppliers=Proveïdors
+ThirdPartySuppliers=Vendors
 ThirdPartyType=Tipus de tercer
 Individual=Particular
 ToCreateContactWithSameName=Es crearà un contacte/adreça automàticament amb la mateixa informació que el tercer d'acord amb el propi tercer. En la majoria de casos, fins i tot si el tercer és una persona física, la creació d'un sol tercer ja és suficient.
@@ -77,11 +77,11 @@ Web=Web
 Poste= Càrrec
 DefaultLang=Idioma per defecte
 VATIsUsed=IVA està utilitzant-se
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=IVA no està utilitzant-se
 CopyAddressFromSoc=Omple l'adreça amb l'adreça del tercer
-ThirdpartyNotCustomerNotSupplierSoNoRef=Tercer ni client ni proveïdor, no hi ha objectes vinculats disponibles
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Compte bancari de pagament
 OverAllProposals=Pressupostos
 OverAllOrders=Comandes
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=Tipus de RE
 TypeLocaltax2ES=Tipus de IRPF
 WrongCustomerCode=Codi client incorrecte
-WrongSupplierCode=Códi proveïdor incorrecte
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Model de codi client
-SupplierCodeModel=Model de codi proveïdor
+SupplierCodeModel=Vendor code model
 Gencod=Codi de barra
 ##### Professional ID #####
 ProfId1Short=CIF/NIF
@@ -267,42 +267,25 @@ Prospect=Client potencial
 CustomerCard=Fitxa client
 Customer=Client
 CustomerRelativeDiscount=Descompte client relatiu
-<<<<<<< HEAD
-SupplierRelativeDiscount=Relative supplier discount
-=======
-SupplierRelativeDiscount=Descompte relatiu de proveïdor
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=Descompte relatiu
 CustomerAbsoluteDiscountShort=Descompte fixe
 CompanyHasRelativeDiscount=Aquest client té un descompte per defecte de <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Aquest client no té descomptes relatius per defecte
-HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
-<<<<<<< HEAD
-HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
-=======
+HasRelativeDiscountFromSupplier=Teniu un descompte predeterminat de <b> %s%% </b> d'aquest proveïdor
 HasNoRelativeDiscountFromSupplier=No tens descomptes relatius per defecte d'aquest proveïdor
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 CompanyHasAbsoluteDiscount=Aquest client té descomptes disponibles (notes de crèdit o bestretes) per <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=Aquest client té un descompte disponible (comercial, de pagament) per a <b>%s</b>%s
 CompanyHasCreditNote=Aquest client encara té abonaments per <b>%s</b> %s
-<<<<<<< HEAD
-HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
-=======
 HasNoAbsoluteDiscountFromSupplier=No tens crèdit disponible per descomptar d'aquest proveïdor
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
-HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
-HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
-HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
+HasAbsoluteDiscountFromSupplier=Disposes de descomptes (notes de crèdits o pagaments pendents) per a <b> %s </b> %s d'aquest proveïdor
+HasDownPaymentOrCommercialDiscountFromSupplier=Teniu descomptes disponibles (comercials, pagaments inicials) de <b> %s </b> %s d'aquest proveïdor
+HasCreditNoteFromSupplier=Teniu notes de crèdit per a <b> %s </b> %s d'aquest proveïdor
 CompanyHasNoAbsoluteDiscount=Aquest client no té més descomptes fixos disponibles
-<<<<<<< HEAD
-CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
-CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-=======
 CustomerAbsoluteDiscountAllUsers=Descomptes absoluts dels clients (concedits per tots els usuaris)
 CustomerAbsoluteDiscountMy=Descomptes absoluts dels clients (concedits per tu mateix)
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=Cap
 Supplier=Proveïdor
 AddContact=Crear contacte
@@ -321,13 +304,13 @@ DeleteACompany=Eliminar una empresa
 PersonalInformations=Informació personal
 AccountancyCode=Compte comptable
 CustomerCode=Codi client
-SupplierCode=Codi proveïdor
+SupplierCode=Vendor code
 CustomerCodeShort=Codi client
-SupplierCodeShort=Codi proveïdor
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=Codi únic client per a cada client
-SupplierCodeDesc=Codi únic proveïdor per a cada proveïdor
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=Requerida si el tercer és un client o client potencial
-RequiredIfSupplier=Requerida si el tercer és un proveïdor
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=Validació controlada pel mòdul
 ThisIsModuleRules=Aquesta és la regla per aquest mòdul
 ProspectToContact=Client potencial a contactar
@@ -355,7 +338,7 @@ MyContacts=Els meus contactes
 Capital=Capital
 CapitalOf=Capital de %s
 EditCompany=Modificar empresa
-ThisUserIsNot=Aquest usuari no és ni un client potencial, ni un client, ni un proveïdor
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=Verificar
 VATIntraCheckDesc=L'enllaç <b>%s</b> permet consultar el NIF intracomunitari al servei de control europeu. Es requereix accés a internet per a que el servei funcioni.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -407,17 +390,13 @@ NoDolibarrAccess=Sense accés d'usuari
 ExportDataset_company_1=Tercers (empreses/entitats/persones físiques) i propietats
 ExportDataset_company_2=Contactes de tercers i atributs
 ImportDataset_company_1=Tercers (empreses/entitats/persones físiques) i propietats
-<<<<<<< HEAD
-ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
-=======
 ImportDataset_company_2=Contactes/Adreces (de tercers o no) i atributs
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 ImportDataset_company_3=Comptes bancaris de tercers
 ImportDataset_company_4=Tercers/Comercials (Assigna usuaris comercials a tercers)
 PriceLevel=Nivell de preus
 DeliveryAddress=Adreça d'enviament
 AddAddress=Afegeix adreça
-SupplierCategory=Categoria de proveïdor
+SupplierCategory=Vendor category
 JuridicalStatus200=Independent
 DeleteFile=Elimina el fitxer
 ConfirmDeleteFile=Esteu segur de voler eliminar aquest fitxer?
@@ -427,7 +406,7 @@ FiscalYearInformation=Informació de l'any fiscal
 FiscalMonthStart=Mes d'inici d'exercici
 YouMustAssignUserMailFirst=Has de crear un correu electrònic per aquest usuari abans d'afegir notificacions de correu electrònic per ell.
 YouMustCreateContactFirst=Per poder afegir notificacions de correu electrònic, en primer lloc s'ha de definir contactes amb correu electrònic vàlid pel tercer
-ListSuppliersShort=Llistat de proveïdors
+ListSuppliersShort=List of vendors
 ListProspectsShort=Llistat de clients potencials
 ListCustomersShort=Llistat de clients
 ThirdPartiesArea=Àrea de tercers i contactes
@@ -441,7 +420,7 @@ CurrentOutstandingBill=Factura pendent actual
 OutstandingBill=Max. de factures pendents
 OutstandingBillReached=S'ha arribat al màx. de factures pendents
 OrderMinAmount=Import mínim per comanda
-MonkeyNumRefModelDesc=Retorna un número sota el format %syymm-nnnn per als codis de clients  i %syymm-nnnn per als codis dels proveïdors, on yy és l'any, mm el mes i nnnn un comptador seqüencial sense ruptura i sense tornar a 0.
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=Codi de client/proveïdor lliure sense verificació. Pot ser modificat en qualsevol moment.
 ManagingDirectors=Nom del gerent(s) (CEO, director, president ...)
 MergeOriginThirdparty=Duplicar tercer (tercer que vols eliminar)
@@ -451,5 +430,5 @@ ThirdpartiesMergeSuccess=S'han fusionat els tercers
 SaleRepresentativeLogin=Nom d'usuari de l'agent comercial
 SaleRepresentativeFirstname=Nom de l'agent comercial
 SaleRepresentativeLastname=Cognoms de l'agent comercial
-ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=Nou codi de client o proveïdor proposat en cas de codi duplicat
+ErrorThirdpartiesMerge=S'ha produït un error en suprimir els tercers. Verifiqueu el registre. S'han revertit els canvis.
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/ca_ES/compta.lang b/htdocs/langs/ca_ES/compta.lang
index c6a94b93fb1..d96663a70ec 100644
--- a/htdocs/langs/ca_ES/compta.lang
+++ b/htdocs/langs/ca_ES/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=Total pagat
 VATToPay=IVA vendes
 VATReceived=Impost rebut
 VATToCollect=Impost de compres
-VATSummary=Saldo tributari
+VATSummary=Tax monthly
+VATBalance=Saldo tributari
 VATPaid=Impost pagat
 LT1Summary=Resum d'impostos 2
 LT2Summary=Resum fiscal 3
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=Àrea comptabilitat/tresoreria
 NewPayment=Nou pagament
 Payments=Pagaments
 PaymentCustomerInvoice=Cobrament factura a client
-PaymentSupplierInvoice=Pagament factura de proveïdor
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Pagament d'impost varis
 PaymentVat=Pagament IVA
 ListPayment=Llistat de pagaments
 ListOfCustomerPayments=Llistat de cobraments de clients
-ListOfSupplierPayments=Llistat de pagaments a proveïdors
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Data d'inici del periode
 DateEndPeriod=Data final del periode
 newLT1Payment=Nou pagament de RE
@@ -103,14 +104,14 @@ LT2PaymentsES=Pagaments IRPF
 VATPayment=Pagament d'impost de vendes
 VATPayments=Pagaments d'impost de vendes
 VATRefund=Devolució IVA
-NewVATPayment=New sales tax payment
+NewVATPayment=Nou pagament d'impostos a les vendes
 Refund=Devolució
 SocialContributionsPayments=Pagaments d'impostos varis
 ShowVatPayment=Veure pagaments IVA
 TotalToPay=Total a pagar
 BalanceVisibilityDependsOnSortAndFilters=El balanç es visible en aquest llistat només si la taula està ordenada de manera ascendent sobre %s i filtrada per 1 compte bancari
 CustomerAccountancyCode=Codi de comptable del client
-SupplierAccountancyCode=Codi comptable del proveïdor
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Codi compt. cli.
 SupplierAccountancyCodeShort=Codi compt. prov.
 AccountNumber=Número de compte
@@ -158,40 +159,36 @@ RulesResultDue=- Inclou les factures pendents, despeses, IVA, donacions estiguen
 RulesResultInOut=- Inclou els pagaments reals realitzats en les factures, les despeses, l'IVA i els salaris. <br> - Es basa en les dates de pagament de les factures, les despeses, l'IVA i els salaris. La data de la donació per a la donació.
 RulesCADue=- Inclou les factures degudes del client estiguen pagades o no. <br> - Es basa en la data de la validació d'aquestes factures. <br>
 RulesCAIn=- Inclou els pagaments efectuats de les factures a clients.<br>- Es basa en la data de pagament de les mateixes<br>
-RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesCATotalSaleJournal=Inclou totes les línies de crèdit del diari Venda.
 RulesAmountOnInOutBookkeepingRecord=Inclou un registre al vostre Llibre amb comptes comptables que tenen el grup "DESPESA" o "INGRÉS"
 RulesResultBookkeepingPredefined=Inclou un registre al vostre Llibre amb comptes comptables que tenen el grup "DESPESA" o "INGRÉS"
 RulesResultBookkeepingPersonalized=Mostra un registre al vostre Llibre amb comptes comptables <b> agrupats per grups personalitzats </b>
 SeePageForSetup=Veure el menú <a href="%s"> %s </a> per configurar-lo
 DepositsAreNotIncluded=- Les factures de bestreta no estan incloses
 DepositsAreIncluded=- Les factures de bestreta estan incloses
-LT1ReportByCustomers=Report tax 2 by third party
-LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomers=Informe impost 2 per part de tercers
+LT2ReportByCustomers=Informe impost 3 per part de tercers
 LT1ReportByCustomersES=Informe de RE per tercers
 LT2ReportByCustomersES=Informe per tercer del IRPF
-<<<<<<< HEAD
-VATReport=Sale tax report
-VATReportByPeriods=Sale tax report by period
-VATReportByCustomers=Sale tax report by customer
-=======
 VATReport=Informe d'IVA de vendes
-VATReportByPeriods=Sale tax report by period
+VATReportByPeriods=Informe d'impostos sobre vendes per període
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Informe d'IVA sobre vendes per client
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 VATReportByCustomersInInputOutputMode=Informe per clients d'IVA cobrat i pagat
-VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
-LT1ReportByQuarters=Report tax 2 by rate
-LT2ReportByQuarters=Report tax 3 by rate
+VATReportByQuartersInInputOutputMode=Taxa impositiva d'informe per vendes de l'impost recaptat i pagat
+LT1ReportByQuarters=Informe impost 2 per tipus
+LT2ReportByQuarters=Informe impost 3 per tipus
 LT1ReportByQuartersES=Informe per taxa de RE
 LT2ReportByQuartersES=Informe per taxa de IRPF
 SeeVATReportInInputOutputMode=Veure l'informe <b>%sIVA pagat%s </b> per a un mode de càlcul estàndard
 SeeVATReportInDueDebtMode=Veure l'informe <b>%s IVA degut%s </b> per a un mode de càlcul amb l'opció sobre el degut
 RulesVATInServices=- Per als serveis, l'informe inclou la normativa de l'IVA rebuts o emesos en base a la data de pagament.
-RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
+RulesVATInProducts=- Per a actius materials, l'informe inclou l'IVA rebut o emès a partir de la data de pagament.
 RulesVATDueServices=- Per als serveis, l'informe inclou l'IVA de les factures degudes, pagades o no basant-se en la data d'aquestes factures.
-RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
+RulesVATDueProducts=- Pel que fa als béns materials, l'informe inclou les factures de l'IVA, segons la data de facturació.
 OptionVatInfoModuleComptabilite=Nota: Per als béns materials, caldria utilitzar la data de lliurament per per ser més just.
-ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
+ThisIsAnEstimatedValue=Aquesta és una vista prèvia, basada en esdeveniments empresarials i no des de la taula de la llista final, de manera que els resultats finals poden diferir d'aquests valors de visualització prèvia
 PercentOfInvoice=%%/factura
 NotUsedForGoods=No utilitzat per als béns
 ProposalStats=Estadístiques de pressupostos
@@ -213,7 +210,7 @@ Pcg_version=Models de pla de comptes
 Pcg_type=Tipus de compte
 Pcg_subtype=Subtipus de compte
 InvoiceLinesToDispatch=Línies de factures a desglossar
-ByProductsAndServices=Per productes i serveis
+ByProductsAndServices=By product and service
 RefExt=Ref. externa
 ToCreateAPredefinedInvoice=Per crear una plantilla de factura, crea una factura estàndard, i després, sense validar-la, fes clic al botó "%s".
 LinkedOrder=Enllaçar a una comanda
@@ -221,15 +218,16 @@ Mode1=Mètode 1
 Mode2=Mètode 2
 CalculationRuleDesc=Per calcular la totalitat de l'IVA, hi ha dos mètodes:<br>Mètode 1 és l'arrodoniment de l'IVA en cada línia, llavors es sumen-<br>Mètode 2 és la suma de tot l'IVA en cada línia, a continuació, arrodonint el resultat.<br>.El resultat final pot difereix uns pocs centaus. El mètode per defecte és <b>% s</b>.
 CalculationRuleDescSupplier=D'acord amb el proveïdor, tria el mètode apropiat per aplicar la mateixa regla de càlcul i aconseguir el mateix resultat esperat pel teu proveïdor.
-TurnoverPerProductInCommitmentAccountingNotRelevant=l'Informe Facturació per producte, quan s'utilitza el mode <b>comptabilitat de caixa </b> no és rellevant. Aquest informe només està disponible quan s'utilitza el mode <b>compromís comptable</b>(consulteu la configuració del mòdul de comptabilitat).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Mode de càlcul
 AccountancyJournal=Diari de codi de comptable
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Compte de comptabilitat per defecte per l'IVA en vendes (s'utilitza si no es defineix en la configuració del diccionari d'IVA)
+ACCOUNTING_VAT_BUY_ACCOUNT=Compte de comptabilitat per defecte per l'IVA en les compres (s'utilitza si no es defineix en la configuració del diccionari d'IVA)
 ACCOUNTING_VAT_PAY_ACCOUNT=Compte comptable per defecte per IVA pagat
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=El compte comptable dedicat definit a la fitxa de tercers només s'utilitzarà per al Llibre Major. Aquest serà utilitzat pel Llibre Major i com a valor predeterminat del subcompte si no es defineix un compte comptable a la fitxa del tercer.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=S'utilitzarà un compte comptable dedicat definit a la fitxa de tercers per omplir el Llibre Major, o com a valor predeterminat de la comptabilitat del Llibre Major si no es defineix un compte comptable de proveïdor a la fitxa del tercer.
 CloneTax=Duplica un impost varis
 ConfirmCloneTax=Confirma la duplicació del pagament de l'impost varis
@@ -247,4 +245,11 @@ ErrorBankAccountNotFound=Error: no s'ha trobat el compte bancari
 FiscalPeriod=Període comptable
 ListSocialContributionAssociatedProject=Llista de contribucions socials associades al projecte
 DeleteFromCat=Elimina del grup comptable
-AccountingAffectation=Accounting assignement
+AccountingAffectation=Assignació de comptes
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/ca_ES/dict.lang b/htdocs/langs/ca_ES/dict.lang
index badfc41f25d..2f78416bb81 100644
--- a/htdocs/langs/ca_ES/dict.lang
+++ b/htdocs/langs/ca_ES/dict.lang
@@ -5,7 +5,8 @@ CountryIT=Itàlia
 CountryES=Espanya
 CountryDE=Alemanya
 CountryCH=Suïssa
-CountryGB=Regne Unit
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=Regne unit
 CountryUK=Regne unit
 CountryIE=Irlanda
 CountryCN=Xina
diff --git a/htdocs/langs/ca_ES/ecm.lang b/htdocs/langs/ca_ES/ecm.lang
index 8c0807cc464..53676bb22e7 100644
--- a/htdocs/langs/ca_ES/ecm.lang
+++ b/htdocs/langs/ca_ES/ecm.lang
@@ -39,9 +39,10 @@ ShowECMSection=Mostrar carpeta
 DeleteSection=Eliminació carpeta
 ConfirmDeleteSection=Vols eliminar el directori <b>%s</b>?
 ECMDirectoryForFiles=Carpeta relativa per a fitxers
-CannotRemoveDirectoryContainsFiles=No es pot eliminar perquè té arxius
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=Explorador de fitxers
-ECMSelectASection=Seleccioneu una carpeta en l'arbre de l'esquerra
+ECMSelectASection=Seleccioneu una carpeta en l'arbre...
 DirNotSynchronizedSyncFirst=Aquest directori sembla que s'ha creat o modificat fora del mòdul ECM. Heu de prémer el botó "Resincronitzar" per sincronitzar el disc i la base de dades per obtenir el contingut d'aquest directori.
 ReSyncListOfDir=Resincronitzar la llista de directoris
 HashOfFileContent=Resum matemàtic ("hash") del contingut del fitxer
diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang
index 567fbe97d15..3c23600ad91 100644
--- a/htdocs/langs/ca_ES/errors.lang
+++ b/htdocs/langs/ca_ES/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Codi de barres requerit
 ErrorCustomerCodeAlreadyUsed=Codi de client ja utilitzat
 ErrorBarCodeAlreadyUsed=El codi de barres ja és utilitzat
 ErrorPrefixRequired=Prefix obligatori
-ErrorBadSupplierCodeSyntax=La sintaxi del codi proveïdor és incorrecta
-ErrorSupplierCodeRequired=Codi proveïdor obligatori
-ErrorSupplierCodeAlreadyUsed=Codi de proveïdor ja utilitzat
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Paràmetres incorrectes
 ErrorBadValueForParameter=Valor incorrecte '%s' del paràmetre '%s'
 ErrorBadImageFormat=L'arxiu de la imatge no és un format suportat (El seu PHP no suporta les funciones de conversió d'aquest format d'imatge)
@@ -87,7 +87,7 @@ ErrorsOnXLines=Errors a <b>%s</b> línies font
 ErrorFileIsInfectedWithAVirus=L'antivirus no ha pogut validar aquest arxiu (és probable que estigui infectat per un virus)!
 ErrorSpecialCharNotAllowedForField=Els caràcters especials no són admesos pel camp "%s"
 ErrorNumRefModel=Hi ha una referència a la base de dades (%s) i és incompatible amb aquesta numeració. Elimineu la línia o renomeneu la referència per activar aquest mòdul.
-ErrorQtyTooLowForThisSupplier=Quantitat insuficient per aquest proveïdor
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=La configuració de mòduls sembla incompleta. Ves a Inici - Configuració - Mòduls a completar.
 ErrorBadMask=Error en la màscara
 ErrorBadMaskFailedToLocatePosOfSequence=Error, sense número de seqüència en la màscara
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Definició incorrecta del menú
 ErrorSavingChanges=Hi ha hagut un error al salvar els canvis
 ErrorWarehouseRequiredIntoShipmentLine=El magatzem és obligatori en la línia a enviar
 ErrorFileMustHaveFormat=El fitxer té format %s
-ErrorSupplierCountryIsNotDefined=El país d'aquest proveïdor no està definit. Corregeix-lo primer.
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=No es poden combinar els dos registres. Petició cancelada.
 ErrorStockIsNotEnoughToAddProductOnOrder=No hi ha suficient estoc del producte %s per afegir-ho en una nova comanda.
 ErrorStockIsNotEnoughToAddProductOnInvoice=No hi ha suficient estoc del producte %s per afegir-ho en una nova factura.
@@ -230,4 +230,4 @@ WarningSomeLinesWithNullHourlyRate=Algunes vegades es van registrar per alguns u
 WarningYourLoginWasModifiedPleaseLogin=El teu login s'ha modificat. Per seguretat has de fer login amb el nou login abans de la següent acció.
 WarningAnEntryAlreadyExistForTransKey=Ja existeix una entrada per la clau de traducció d'aquest idioma
 WarningNumberOfRecipientIsRestrictedInMassAction=Advertència: el nombre de destinataris diferents està limitat a <b>%s</b> quan s'utilitzen les accions massives sobre llistes
-WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningDateOfLineMustBeInExpenseReportRange=Advertència, la data de la línia no està dins del rang de l'informe de despeses
diff --git a/htdocs/langs/ca_ES/install.lang b/htdocs/langs/ca_ES/install.lang
index 9146bb74e45..7bc3a07cf31 100644
--- a/htdocs/langs/ca_ES/install.lang
+++ b/htdocs/langs/ca_ES/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=El fitxer de configuració <b>%s</b> n
 ConfFileCouldBeCreated=L'arxiu de configuració <b>%s</b> s'ha creat.
 ConfFileIsNotWritable=L'arxiu de configuració <b>%s</b> no és modificable. Comprova els permisos. Per a una primera instal·lació, el servidor web ha de tenir el dret a modificar aquest fitxer durant el procés de configuració (per exemple "chmod 666" sobre un SO compatible UNIX).
 ConfFileIsWritable=L'arxiu <b>%s</b> és modificable.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Recarregar tota la informació de l'arxiu de configuració.
 PHPSupportSessions=Aquest PHP suporta sessions
 PHPSupportPOSTGETOk=Aquest PHP suporta bé les variables POST i GET.
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=No s'ha pogut crear el compte d'administrador de Doliba
 WarningRemoveInstallDir=Atenció, per raons de seguretat, amb la finalitat de bloquejar un nou ús de les eines d'instal·lació/actualització, és aconsellable crear en el directori arrel de Dolibarr un arxiu anomenat <b>install.lock </b> en només lectura.
 FunctionNotAvailableInThisPHP=No disponible en aquest PHP
 ChoosedMigrateScript=Elecció de l'script de migració
-DataMigration=Migració de les dades
-DatabaseMigration=Migració del format de la base de dades
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Execució del script
 ChooseYourSetupMode=Tria el teu mètode d'instal·lació i fes clic a "Començar"
 FreshInstall=Nova instal·lació
@@ -146,7 +147,7 @@ NothingToDo=No hi ha res a fer
 # upgrade
 MigrationFixData=Correcció de dades desnormalitzades
 MigrationOrder=Migració de dades de les comandes clients
-MigrationSupplierOrder=Migració de dades de les comandes a proveïdors
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Migració de dades de pressupostos
 MigrationInvoice=Migració de dades de les factures a clients
 MigrationContract=Migració de dades dels contractes
@@ -196,6 +197,8 @@ MigrationEvents=Migració d'esdeveniments per afegir propietari a la taula d'asi
 MigrationEventsContact=Migració d'esdeveniments per afegir contacte d'esdeveniments a la taula d'assignacions
 MigrationRemiseEntity=Actualitza el valor del camp entity de llx_societe_remise
 MigrationRemiseExceptEntity=Actualitza el valor del camp entity de llx_societe_remise_except
+MigrationUserRightsEntity=Actualitza el valor del camp de l'entitat llx_user_rights
+MigrationUserGroupRightsEntity=Actualitza el valor del camp de l'entitat llx_usergroup_rights
 MigrationReloadModule=Recarrega el mòdul %s
 MigrationResetBlockedLog=Restablir el mòdul BlockedLog per l'algoritme v7
 ShowNotAvailableOptions=Mostra opcions no disponibles
diff --git a/htdocs/langs/ca_ES/ldap.lang b/htdocs/langs/ca_ES/ldap.lang
index 8b47bc5b455..0edd3aacbd0 100644
--- a/htdocs/langs/ca_ES/ldap.lang
+++ b/htdocs/langs/ca_ES/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Contrasenya del domini
 YouMustChangePassNextLogon=La contrasenya de <b>%s </b> en el domini <b>%s </b> ha de ser modificada.
 UserMustChangePassNextLogon=L'usuari ha de canviar de contrasenya en la propera connexió
 LDAPInformationsForThisContact=Informació de la base de dades LDAP d'aquest contacte
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Tipus de membre sincronitzat
 ContactSynchronized=Contacte sincronitzat
 ForceSynchronize=Forçar sincronització Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Error de la lectura de l'anuari LDAP. Comprovar la configuració del mòdul LDAP i l'accessibilitat de l'anuari.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/ca_ES/loan.lang b/htdocs/langs/ca_ES/loan.lang
index a759cfa5cfc..1b1a10660a6 100644
--- a/htdocs/langs/ca_ES/loan.lang
+++ b/htdocs/langs/ca_ES/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=Capital
 Insurance=Assegurança
 Interest=Interessos
 Nbterms=Nombre de termes
+Term=Term
 LoanAccountancyCapitalCode=Compte comptable del capital
 LoanAccountancyInsuranceCode=Compte comptable de l'assegurança
 LoanAccountancyInterestCode=Compte comptable per al interès
@@ -17,43 +18,14 @@ ConfirmDeleteLoan=Confirma la eliminació del préstec
 LoanDeleted=Préstec eliminat correctament
 ConfirmPayLoan=Confirma la classificació del préstec com a pagat
 LoanPaid=Préstec pagat
-# Calc
-LoanCalc=Calculadora de prèstecs del banc
-PurchaseFinanceInfo=Informació de compres i finançament
-SalePriceOfAsset=Preu de venda d'actius
-PercentageDown=Percentatge inferior
-LengthOfMortgage=Durada del préstec
-AnnualInterestRate=Taxa d'interès anual
-ExplainCalculations=Explicació de càlculs
-ShowMeCalculationsAndAmortization=Mostra els càlculs i l'amortització
-MortgagePaymentInformation=Informació de pagament d'hipoteca
-DownPayment=Dipòsit
-DownPaymentDesc=El <b>baix pagament</b> = El preu de l'habitatge multiplicat pel baix percentatge dividit per 100 (el 5% arriba a ser fins 5/100 o 0.05 )
-InterestRateDesc=La <b>taxa d'interès</b> = El percentatge d'interès anual dividit per 100
-MonthlyFactorDesc=El <b>factor mensual</b> = El resultat de la següent fórmula
-MonthlyInterestRateDesc=La <b>taxa d'interès mensual</b> = La taxa d'interès anual dividida per 12 (pels 12 mesos de l'any)
-MonthTermDesc=El <b>terme mensual</b> del préstec en mesos = El nombre d'anys que ha pres el préstec per 12 vegades
-MonthlyPaymentDesc=El pagament mensual és genera utilitzant la següent fórmula
-AmortizationPaymentDesc=L'<a href="#amortization">amortització</a> trenca la quantitat del pagament mensual cap al interès del banc, i com pagarà el capital principal del préstec.
-AmountFinanced=Import finançat
-AmortizationMonthlyPaymentOverYears=Amortització per pagaments mensuals: <b>%s</b> durant %s anys
-Totalsforyear=Totals per any
-MonthlyPayment=Pagament mensual
-LoanCalcDesc=Aquesta <b>calculadora d'hipoteques</ b> es pot utilitzar per calcular el pagament mensual d'una prestatària, d'acord amb la quantitat prestada, el termini del préstec desitjat i el tipus d'interés.<br> Aquesta calculadora inclou també AHP (Assegurança Hipotecària Privada) per als préstecs en els quals menys del 20 %% es posa com a pagament inicial. També es tenen en compte els impostos sobre la propietat de la ciutat, i el seu efecte sobre el total del pagament mensual de la hipoteca.<br>
-GoToInterest=%s es destinaran a INTERÈS
-GoToPrincipal=%s es destinaran a PRINCIPAL
-YouWillSpend=Gastaràs %s en l'any %s
 ListLoanAssociatedProject=Llistat de prèstecs associats al projecte
 AddLoan=Crea un préstec
+FinancialCommitment=Compromís financer
+InterestAmount=Interessos
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=Configuració del mòdul de préstecs
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Compte comptable del capital per defecte
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Compte comptable per al interès per defecte
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Compte comptable de l'assegurança per defecte
-FinancialCommitment=Financial commitment
-CreateCalcSchedule=Edit financial commitment
-<<<<<<< HEAD
-InterestAmount=Interest amount
-=======
-InterestAmount=Import d'interès
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
+CreateCalcSchedule=Edita el compromís financer
diff --git a/htdocs/langs/ca_ES/mails.lang b/htdocs/langs/ca_ES/mails.lang
index 12f60619fa8..36e097ae97c 100644
--- a/htdocs/langs/ca_ES/mails.lang
+++ b/htdocs/langs/ca_ES/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Remitent
 MailErrorsTo=Errors a
 MailReply=Respondre a
 MailTo=Destinatari(s)
+MailToUsers=To user(s)
 MailCC=Còpia a
+MailToCCUsers=Copy to users(s)
 MailCCC=Adjuntar còpia a
 MailTopic=Assumpte de l'e-mail
 MailText=Missatge
@@ -78,11 +80,7 @@ ResultOfMailSending=Resultat de l'enviament massiu d'e-mails
 NbSelected=Nº seleccionats
 NbIgnored=Nº ignorats
 NbSent=Nº enviats
-<<<<<<< HEAD
-SentXXXmessages=%s message(s) sent.
-=======
 SentXXXmessages=%s missatge(s) enviat(s).
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contacte amb filtres de client
 MailingModuleDescContactsByCompanyCategory=Contactes per categoria de tercer
@@ -140,7 +138,7 @@ NbOfTargetedContacts=Número actual de contactes destinataris d'e-mails
 UseFormatFileEmailToTarget=El fitxer importat ha de tenir el format <strong>email;nom;cognom;altre</strong>
 UseFormatInputEmailToTarget=Entra una cadena amb el format <strong>email;nom;cognom;altre</strong>
 MailAdvTargetRecipients=Destinataris (selecció avançada)
-AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
+AdvTgtTitle=Ompliu els camps d'entrada per seleccionar prèviament els tercers o contactes / adreces a destinació
 AdvTgtSearchTextHelp=Utilitza %% com a caràcter màgic. Per exemple per trobar tots els registres que siguin com <b>josefina, jordina, joana</b> pots posar <b>jo%%</b>. També pots utilitzar el separador ; pels valors, i utilitzar ! per excepcions de valors. Per exemple <b>josefina;jordina;joa%%;!joan;!joaq%</b> mostrarà totes les josefina, jordina, i els noms que comencin per joa excepte els joan i els que comencin per joaq
 AdvTgtSearchIntHelp=Utilitza un interval per seleccionar un valor enter o decimal
 AdvTgtMinVal=Valor mínim
@@ -168,4 +166,4 @@ InGoingEmailSetup=Configuració de correus electrònics entrants
 OutGoingEmailSetupForEmailing=Configuració del correu electrònic sortint (per enviament de correus massiu)
 DefaultOutgoingEmailSetup=Configuració per defecte del correu electrònic sortint 
 Information=Informació
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang
index 57aeb431d9a..c302d62e406 100644
--- a/htdocs/langs/ca_ES/main.lang
+++ b/htdocs/langs/ca_ES/main.lang
@@ -64,22 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=Error, cap tipus d'IVA definit per al paí
 ErrorNoSocialContributionForSellerCountry=Error, cap tipus d'impost varis definit per al país '%s'.
 ErrorFailedToSaveFile=Error, el registre del fitxer ha fallat.
 ErrorCannotAddThisParentWarehouse=Està intentant afegir un magatzem pare que ja és fill de l'actual
-<<<<<<< HEAD
-MaxNbOfRecordPerPage=Max number of record per page
-=======
 MaxNbOfRecordPerPage=Número màxim de registres per pàgina
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 NotAuthorized=No està autoritzat per fer-ho.
 SetDate=Indica la data
 SelectDate=Seleccioneu una data
 SeeAlso=Veure també %s
 SeeHere=Mira aquí
 ClickHere=Fes clic aquí
-<<<<<<< HEAD
-Here=Here
-=======
 Here=Aquí
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 Apply=Aplicar
 BackgroundColorByDefault=Color de fons
 FileRenamed=L'arxiu s'ha renombrat correctament
@@ -100,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr està configurat en mode
 Administrator=Administrador
 Undefined=No definit
 PasswordForgotten=Heu oblidat la contrasenya?
+NoAccount=No account?
 SeeAbove=Esmentar anteriorment
 HomeArea=Àrea inici
 LastConnexion=Última connexió
@@ -195,7 +188,7 @@ ToLink=Enllaç
 Select=Seleccionar
 Choose=Escollir
 Resize=Redimensionar
-ResizeOrCrop=Resize or Crop
+ResizeOrCrop=Canviar la mida o tallar
 Recenter=Enquadrar
 Author=Autor
 User=Usuari
@@ -239,7 +232,7 @@ Limit=Límit
 Limits=Límits
 Logout=Desconnexió
 NoLogoutProcessWithAuthMode=No s'ha pogut desconnectar amb el mètode de autenticació <b>%s</b>
-Connection=Connexió
+Connection=Usuari
 Setup=Configuració
 Alert=Alerta
 MenuWarnings=Alertes
@@ -336,14 +329,10 @@ Default=Defecte
 DefaultValue=Valor per defecte
 DefaultValues=Valors per defecte
 Price=Preu
-<<<<<<< HEAD
-PriceCurrency=Price (currency)
-=======
 PriceCurrency=Preu (moneda)
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 UnitPrice=Preu unitari
 UnitPriceHT=Preu base
-UnitPriceHTCurrency=Unit price (net) (currency)
+UnitPriceHTCurrency=Preu unitari (net) (moneda)
 UnitPriceTTC=Preu unitari total
 PriceU=P.U.
 PriceUHT=P.U.
@@ -371,7 +360,7 @@ AmountLT2ES=Import IRPF
 AmountTotal=Import total
 AmountAverage=Import mitjà
 PriceQtyMinHT=Preu quantitat min total
-PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
+PriceQtyMinHTCurrency=Quantitat de preu min. (net de l'impost) (moneda)
 Percentage=Percentatge
 Total=Total
 SubTotal=Subtotal
@@ -414,6 +403,7 @@ DefaultTaxRate=Tipus impositiu per defecte
 Average=Mitja
 Sum=Suma
 Delta=Diferència
+RemainToPay=Remain to pay
 Module=Mòdul/Aplicació
 Modules=Mòduls/Aplicacions
 Option=Opció
@@ -426,7 +416,7 @@ Favorite=Favorit
 ShortInfo=Info.
 Ref=Ref.
 ExternalRef=Ref. externa
-RefSupplier=Ref. proveïdor
+RefSupplier=Ref. vendor
 RefPayment=Ref. pagament
 CommercialProposalsShort=Pressupostos
 Comment=Comentari
@@ -441,7 +431,7 @@ ActionDoneShort=Acabat
 ActionUncomplete=Incomplet
 LatestLinkedEvents=Darrers %s esdeveniments vinculats
 CompanyFoundation=Empresa/Organització
-Accountant=Accountant
+Accountant=Comptador
 ContactsForCompany=Contactes d'aquest tercer
 ContactsAddressesForCompany=Contactes/adreces d'aquest tercer
 AddressesForCompany=Adreces d'aquest tercer
@@ -450,11 +440,7 @@ ActionsOnMember=Esdeveniments d'aquest soci
 ActionsOnProduct=Esdeveniments sobre aquest producte
 NActionsLate=%s en retard
 ToDo=A realitzar
-<<<<<<< HEAD
-Completed=Completed
-=======
 Completed=Finalitzat
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 Running=En progrés
 RequestAlreadyDone=Sol·licitud ja recollida
 Filter=Filtre
@@ -509,7 +495,7 @@ Received=Rebut
 Paid=Pagat
 Topic=Assumpte
 ByCompanies=Per empresa
-ByUsers=Per usuari
+ByUsers=By user
 Links=Links
 Link=Link
 Rejects=Devolucions
@@ -635,9 +621,9 @@ BuildDoc=Generar el doc
 Entity=Entitat
 Entities=Entitats
 CustomerPreview=Historial client
-SupplierPreview=Historial proveïdor
+SupplierPreview=Vendor preview
 ShowCustomerPreview=Veure historial client
-ShowSupplierPreview=Veure historial proveïdor
+ShowSupplierPreview=Show vendor preview
 RefCustomer=Ref. client
 Currency=Divisa
 InfoAdmin=Informació per als administradors
@@ -695,7 +681,7 @@ Color=Color
 Documents=Documents
 Documents2=Documents
 UploadDisabled=Pujada desactivada
-MenuAccountancy=Comptabilitat
+MenuAccountancy=Comptabilitat experta
 MenuECM=Documents
 MenuAWStats=AWStats
 MenuMembers=Socis
@@ -882,11 +868,7 @@ FileNotShared=Fitxer no compartit amb el públic extern
 Project=Projecte
 Projects=Projectes
 Rights=Permisos
-<<<<<<< HEAD
-LineNb=Line no.
-=======
 LineNb=Núm. línia
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 IncotermLabel=Incoterms
 # Week day
 Monday=Dilluns
@@ -935,11 +917,11 @@ SearchIntoProductsOrServices=Productes o serveis
 SearchIntoProjects=Projectes
 SearchIntoTasks=Tasques
 SearchIntoCustomerInvoices=Factures a clients
-SearchIntoSupplierInvoices=Factures de proveïdors
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Comandes de clients
-SearchIntoSupplierOrders=Comandes a proveïdors
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=Pressupostos
-SearchIntoSupplierProposals=Pressupost de proveïdor
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Intervencions
 SearchIntoContracts=Contractes
 SearchIntoCustomerShipments=Enviaments de client
@@ -953,20 +935,13 @@ CommentDeleted=Comentari suprimit
 Everybody=Projecte compartit
 PayedBy=Pagat per
 PayedTo=Pagat a
-<<<<<<< HEAD
-Monthly=Monthly
-Quarterly=Quarterly
-Annual=Annual
-Local=Local
-Remote=Remote
-LocalAndRemote=Local and Remote
-=======
 Monthly=Mensual
 Quarterly=Trimestral
 Annual=Anual
 Local=Local
 Remote=Remot
 LocalAndRemote=Local i remota
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
-KeyboardShortcut=Keyboard shortcut
+KeyboardShortcut=Tecla de drecera
 AssignedTo=Assignada a
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/ca_ES/margins.lang b/htdocs/langs/ca_ES/margins.lang
index 7a0d17b53a0..5b42c3ea844 100644
--- a/htdocs/langs/ca_ES/margins.lang
+++ b/htdocs/langs/ca_ES/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=Com un servei
 UseDiscountOnTotal=Sobre el total
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Indica si un descompte global es pren en compte com un producte, servei o només en el total a l'hora de calcular els marges.
 MARGIN_TYPE=Preu de cost suggerit per defecte pel càlcul de marge
-MargeType1=Marge en el millor preu de proveïdor
+MargeType1=Margin on Best vendor price
 MargeType2=Marge en Preu mitjà ponderat (PMP)
 MargeType3=Marge en preu de cost
-MarginTypeDesc=* Marge en el millor preu de venda = Preu de venda - Millor preu de proveïdor definit en la fitxa de producte<br>* Marge en Preu Mig Ponderat (PMP) = Preu de venda - Preu Mig Ponderat de producte (PMP) o millor preu de proveïdor si el PMP no està definit<br>* Marge en Preu de cost = Preu de venda - Preu de cost definit en la fitxa de producte o PMP si el preu de cost no està definit, o el millor preu de proveïdor si el PMP no està definit
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Preu de compra
 UnitCharges=Càrrega unitària
 Charges=Càrreges
@@ -41,4 +41,4 @@ rateMustBeNumeric=El marge ha de ser un valor numèric
 markRateShouldBeLesserThan100=El marge té que ser menor que 100
 ShowMarginInfos=Mostrar info de marges
 CheckMargins=Detall de marges
-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 ddiated sale representative and some thirdparties 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=L'informe de marge per usuari utilitza el vincle entre tercers i representants de vendes per calcular el marge de cada representant de venda. Com que algunes terceres parts no poden tenir cap representant de venda i algunes terceres parts poden estar vinculades a diverses, és possible que no s'incloguin alguns imports en aquest informe (si no hi ha representant de venda) i alguns poden aparèixer en diferents línies (per a cada representant de la venda).
diff --git a/htdocs/langs/ca_ES/members.lang b/htdocs/langs/ca_ES/members.lang
index 050d74521bd..4c07b1bfdd6 100644
--- a/htdocs/langs/ca_ES/members.lang
+++ b/htdocs/langs/ca_ES/members.lang
@@ -107,36 +107,32 @@ SubscriptionNotRecorded=Subscripció no registrada
 AddSubscription=Crear afiliació
 ShowSubscription=Mostrar afiliació
 # Label of email templates
-SendingAnEMailToMember=Sending information email to member
-SendingEmailOnAutoSubscription=Sending email on auto registration
-SendingEmailOnMemberValidation=Sending email on new member validation
-SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
-SendingEmailOnCancelation=Sending email on cancelation
+SendingAnEMailToMember=Enviant informació per correu electrònic a membre
+SendingEmailOnAutoSubscription=Enviament de correu electrònic amb registre automàtic
+SendingEmailOnMemberValidation=S'està enviant un correu electrònic amb la validació de membre nou
+SendingEmailOnNewSubscription=S'està enviant un correu electrònic amb una nova subscripció
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
+SendingEmailOnCancelation=Enviant correu electrònic de cancel·lació
 # Topic of email templates
-YourMembershipRequestWasReceived=Your membership was received.
-YourMembershipWasValidated=Your membership was validated
-YourSubscriptionWasRecorded=Your new subscription was recorded
-<<<<<<< HEAD
-SubscriptionReminderEmail=Subscription reminder
-=======
+YourMembershipRequestWasReceived=S'ha rebut la vostra subscripció.
+YourMembershipWasValidated=S'ha validat la vostra subscripció
+YourSubscriptionWasRecorded=S'ha registrat la vostra nova subscripció
 SubscriptionReminderEmail=Recordatori de subscripció
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
-YourMembershipWasCanceled=Your membership was canceled
+YourMembershipWasCanceled=S'ha cancel·lat la vostra pertinença
 CardContent=Contingut de la seva fitxa de soci
 # Text of email templates
-ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
-ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
-ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
-ThisIsContentOfYourCard=This is a remind of the information we get about you. Feel free to contact us if something looks wrong.<br><br>
+ThisIsContentOfYourMembershipRequestWasReceived=Volem informar-li que s'ha rebut la vostra sol·licitud de subscripció. <br> <br>
+ThisIsContentOfYourMembershipWasValidated=Volem informar-vos que la vostra subscripció s'ha validat amb la informació següent: <br> <br>
+ThisIsContentOfYourSubscriptionWasRecorded=Volem informar-vos que s'ha registrat la vostra nova subscripció. <br> <br>
+ThisIsContentOfSubscriptionReminderEmail=Volem informar-vos que la vostra subscripció està a punt de caducar. Esperem que la vulgueu renovar.<br><br>
+ThisIsContentOfYourCard=Això és un recordatori de la informació que obtenim sobre vostè. No dubti en contactar-nos si hi ha alguna cosa que sembla malament. <br> <br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Assumpte del e-mail rebut en cas d'auto-inscripció d'un convidat
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail rebut en cas d'auto-inscripció d'un convidat
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Template Email to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Correu electrònic de plantilla per utilitzar per enviar correus electrònics a un membre de la subscripció automàtica de membres
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Plantilla de correu electrònic per utilitzar per enviar correus electrònics a un membre en la validació de membre
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Plantilla de correu electrònic per utilitzar per enviar correus electrònics a un membre sobre la nova gravació de la subscripció
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Plantilla de correu electrònic per utilitzar per enviar correus electrònics quan la subscripció està a punt de caducar
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Plantilla de correu electrònic per utilitzar per enviar en la cancel·lació de membres
 DescADHERENT_MAIL_FROM=E-mail emissor per als e-mails automàtics
 DescADHERENT_ETIQUETTE_TYPE=Format pàgines etiquetes
 DescADHERENT_ETIQUETTE_TEXT=Text a imprimir a la direcció de les etiquetes de soci
@@ -195,8 +191,8 @@ NoVatOnSubscription=Sense IVA per a les afiliacions
 MEMBER_PAYONLINE_SENDEMAIL=E-Mail per advertir en cas de recepció de confirmació d'un pagament validat d'una afiliació (Exemple: pagament-fet@exemple.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Producte utilitzat per la línia de subscripció a la factura: %s
 NameOrCompany=Nom o empresa
-SubscriptionRecorded=Subscription recorded
-NoEmailSentToMember=No email sent to member
-EmailSentToMember=Email sent to member at %s
-SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
+SubscriptionRecorded=S'ha registrat la subscripció
+NoEmailSentToMember=No s'ha enviat un correu electrònic al membre
+EmailSentToMember=Correu electrònic enviat a membre a %s
+SendReminderForExpiredSubscriptionTitle=Enviar recordatori per correu electrònic per subscripció caducada
+SendReminderForExpiredSubscription=Enviar un recordatori per correu electrònic als membres quan la subscripció estigui a punt de caducar (el paràmetre és el nombre de dies abans de la finalització de la subscripció per enviar el recordatori)
diff --git a/htdocs/langs/ca_ES/opensurvey.lang b/htdocs/langs/ca_ES/opensurvey.lang
index 8111659f00b..d4f5ef421e2 100644
--- a/htdocs/langs/ca_ES/opensurvey.lang
+++ b/htdocs/langs/ca_ES/opensurvey.lang
@@ -58,3 +58,4 @@ MoreChoices=Introdueixi més opcions pels votants
 SurveyExpiredInfo=L'enquesta s'ha tancat o el temps de votació s'ha acabat.
 EmailSomeoneVoted=%s ha emplenat una línia.\nPot trobar la seva enquesta en l'enllaç:\n%s
 ShowSurvey=Mostra l'enquesta
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/ca_ES/orders.lang b/htdocs/langs/ca_ES/orders.lang
index a7ad18af446..0a7cc7afbc7 100644
--- a/htdocs/langs/ca_ES/orders.lang
+++ b/htdocs/langs/ca_ES/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Àrea comandes de clients
-SuppliersOrdersArea=Àrea comandes a proveïdors
+SuppliersOrdersArea=Purchase orders area
 OrderCard=Fitxa comanda
 OrderId=Id comanda
 Order=Comanda
@@ -13,18 +13,18 @@ OrderToProcess=Comanda a processar
 NewOrder=Nova comanda
 ToOrder=Realitzar comanda
 MakeOrder=Realitzar comanda
-SupplierOrder=Comanda a proveïdor
-SuppliersOrders=Comandes a proveïdors
-SuppliersOrdersRunning=Comandes a proveïdors en curs
-CustomerOrder=Comanda de client
-CustomersOrders=Comandes de client
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=Compte bloquejat
+CustomersOrders=Comandes de clients
 CustomersOrdersRunning=Comandes de clients en curs
 CustomersOrdersAndOrdersLines=Comandes de clients i línies de comanda
 OrdersDeliveredToBill=Comandes de client entregades per a facturar
 OrdersToBill=Comandes de clients entregades
 OrdersInProcess=Comandes de client en procés
 OrdersToProcess=Comandes de client a processar
-SuppliersOrdersToProcess=Comandes a proveïdors a processar
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=Anul·lada
 StatusOrderDraftShort=Esborrany
 StatusOrderValidatedShort=Validada
@@ -75,15 +75,15 @@ ShowOrder=Mostrar comanda
 OrdersOpened=Comandes a processar
 NoDraftOrders=Sense comandes esborrany
 NoOrder=Sense comanda
-NoSupplierOrder=Sense comanda a proveïdor
+NoSupplierOrder=No purchase order
 LastOrders=Últimes %s comandes de client
 LastCustomerOrders=Últimes %s comandes de client
-LastSupplierOrders=Últimes %s comandes de proveïdor
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=Últimes %s comandes modificades
 AllOrders=Totes les comandes
 NbOfOrders=Nombre de comandes
 OrdersStatistics=Estadístiques de comandes
-OrdersStatisticsSuppliers=Estadístiques de comandes a proveïdors
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Nombre de comandes per mes
 AmountOfOrdersByMonthHT=Import total de comandes per mes (Sense IVA)
 ListOfOrders=Llistat de comandes
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Vols confirmar la creació d'aquesta comanda a data de <b>%s</b
 GenerateBill=Facturar
 ClassifyShipped=Classificar enviat
 DraftOrders=Esborranys de comandes
-DraftSuppliersOrders=Comandes a proveïdors esborrany
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=Comandes en procés
 RefOrder=Ref. comanda
 RefCustomerOrder=Ref. comanda pel client
-RefOrderSupplier=Ref. comanda pel proveïdor
-RefOrderSupplierShort=Ref. comanda proveïdor
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=Envia comanda per e-mail
 ActionsOnOrder=Esdeveniments sobre la comanda
 NoArticleOfTypeProduct=No hi ha articles de tipus 'producte' i per tant enviables en aquesta comanda
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Vols clonar aquesta comanda <b>%s</b>?
 DispatchSupplierOrder=Recepció de la comanda a proveïdor %s
 FirstApprovalAlreadyDone=Primera aprovació realitzada
 SecondApprovalAlreadyDone=Segona aprovació realitzada
-SupplierOrderReceivedInDolibarr=Comanda de proveïdor %s rebuda %s
-SupplierOrderSubmitedInDolibarr=Comanda de proveïdor %s enviada
-SupplierOrderClassifiedBilled=Comanda de proveïdor %s facturada
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Altres comandes
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Agent comercial del seguiment comanda de client
@@ -125,11 +125,11 @@ TypeContact_commande_internal_SHIPPING=Responsable del seguiment de l'enviament
 TypeContact_commande_external_BILLING=Contacte client facturació comanda
 TypeContact_commande_external_SHIPPING=Contacte client lliurament comanda
 TypeContact_commande_external_CUSTOMER=Contacte client seguiment comanda
-TypeContact_order_supplier_internal_SALESREPFOLL=Responsable del seguiment comanda a proveïdor
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Responsable del seguiment de la recepció
-TypeContact_order_supplier_external_BILLING=Contacte proveïdor facturació comanda
-TypeContact_order_supplier_external_SHIPPING=Contacte proveïdor lliurament comanda
-TypeContact_order_supplier_external_CUSTOMER=Contacte proveïdor seguiment comanda
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON no definida
 Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON no definida
 Error_OrderNotChecked=No s'han seleccionat comandes a facturar
diff --git a/htdocs/langs/ca_ES/other.lang b/htdocs/langs/ca_ES/other.lang
index d410724304e..3e8f9243162 100644
--- a/htdocs/langs/ca_ES/other.lang
+++ b/htdocs/langs/ca_ES/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nAquest és un correu electrònic de prova enviat
 PredefinedMailTestHtml=__(Hello)__\nAquest és un correu electrònic de <b>prova</b> (la paraula prova ha d'estar en negreta). <br> Les dues línies es separen amb un salt de línia. <br> <br> __USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nAquí trobareu la factura __REF__\n\nAquest es l'enllaç per realitzar el pagament en línia en cas de que la factura encara no esitga pagada:\n__ONLINE_PAYMENT_URL__\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nEns agradaria advertir-vos que la factura __REF__ sembla que no està pagada. Així que adjuntem de nou la factura en el fitxer adjunt, com a recordatori.\n\n__ONLINE_PAYMENT_URL__\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nTrobareu aquí la proposta comercial __PREF__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nTrobareu aquí la sol·licitud de cotització __REF__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nTrobareu aquí la comanda __REF__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nTrobareu aquí la nostra comanda __REF__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=L'arxiu és massa gran
 PleaseBePatient=Preguem esperi uns instants...
 NewPassword=Nova contrasenya
 ResetPassword=Restablir la contrasenya
-RequestToResetPasswordReceived=S'ha rebut una sol·licitud per canviar la contrasenya de Dolibarr
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=Aquesta és la nova contrasenya per iniciar sessió
 NewKeyWillBe=La seva nova contrasenya per iniciar sessió en el software serà
 ClickHereToGoTo=Clica aquí per anar a %s
@@ -233,6 +233,8 @@ PermissionsDelete=Permisos eliminats
 YourPasswordMustHaveAtLeastXChars=La teva contrasenya ha de tenir almenys <strong>%s</strong> \ncaràcters
 YourPasswordHasBeenReset=La teva contrasenya s'ha restablert correctament
 ApplicantIpAddress=Adreça IP del sol·licitant
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=Àrea d'exportacions
 AvailableFormats=Formats disponibles
@@ -246,8 +248,4 @@ WEBSITE_PAGEURL=URL de pàgina
 WEBSITE_TITLE=Títol
 WEBSITE_DESCRIPTION=Descripció
 WEBSITE_KEYWORDS=Paraules clau
-<<<<<<< HEAD
-LinesToImport=Lines to import
-=======
 LinesToImport=Línies per importar
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
diff --git a/htdocs/langs/ca_ES/productbatch.lang b/htdocs/langs/ca_ES/productbatch.lang
index 8d74fd47544..25e72af8dfb 100644
--- a/htdocs/langs/ca_ES/productbatch.lang
+++ b/htdocs/langs/ca_ES/productbatch.lang
@@ -16,7 +16,7 @@ printEatby=Caducitat: %s
 printSellby=Límit venda: %s
 printQty=Quant.: %d
 AddDispatchBatchLine=Afegir una línia per despatx per caducitat
-WhenProductBatchModuleOnOptionAreForced=Quan el mòdul de gestió de lots/sèries està activat, l'increment o decrement automàtic del estoc es veu forçat a la validació del enviament de mercaderies i al despatx manual per la recepció, i no pot ser editat. Altres opcions poden ser definides com tu vulguis.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=Aquest producte no utilitza lot/número de sèrie
 ProductLotSetup=Configuració del mòdul lot/sèries
 ShowCurrentStockOfLot=Mostra l'estoc actual de la parella producte/lot
diff --git a/htdocs/langs/ca_ES/products.lang b/htdocs/langs/ca_ES/products.lang
index aa1a205b2f3..c619a0c6428 100644
--- a/htdocs/langs/ca_ES/products.lang
+++ b/htdocs/langs/ca_ES/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Import venut
 PurchasedAmount=Import comprat
 NewPrice=Nou preu
 MinPrice=Preu de venda mín.
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=El preu de venda no ha de ser inferior al mínim per a aquest producte (%s sense IVA). Aquest missatge pot estar causat per un descompte molt gran.
 ContractStatusClosed=Tancat
 ErrorProductAlreadyExists=Un producte amb la referència %s ja existeix.
@@ -123,7 +124,7 @@ ConfirmDeleteProductLine=Esteu segur de voler eliminar aquesta línia de product
 ProductSpecial=Especial
 QtyMin=Quantitat mínima
 PriceQtyMin=Preu per aquesta quantitat mínima (sense descompte)
-PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
+PriceQtyMinCurrency=Preu per aquest mínim. Quantitat (sense descompte) (moneda)
 VATRateForSupplierProduct=Taxa IVA (per aquest producte/proveïdor)
 DiscountQtyMin=Descompte per defecte per aquesta quantitat
 NoPriceDefinedForThisSupplier=Cap preu/quant. definit per a aquest proveïdor/producte
@@ -155,7 +156,7 @@ BuyingPrices=Preus de compra
 CustomerPrices=Preus de client
 SuppliersPrices=Preus de proveïdor
 SuppliersPricesOfProductsOrServices=Preus de proveïdors (productes o serveis)
-CustomCode=Duana/mercaderia/codi HS
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=País d'origen
 Nature=Caràcter
 ShortLabel=Etiqueta curta
diff --git a/htdocs/langs/ca_ES/projects.lang b/htdocs/langs/ca_ES/projects.lang
index b97e5315228..7edf092062c 100644
--- a/htdocs/langs/ca_ES/projects.lang
+++ b/htdocs/langs/ca_ES/projects.lang
@@ -77,6 +77,7 @@ Time=Temps
 ListOfTasks=Llistat de tasques
 GoToListOfTimeConsumed=Ves al llistat de temps consumit
 GoToListOfTasks=Ves al llistat de tasques
+GoToGanttView=Go to Gantt view
 GanttView=Vista de Gantt
 ListProposalsAssociatedProject=Llistat de pressupostos associats al projecte
 ListOrdersAssociatedProject=Llista de comandes de client associades al projecte
@@ -140,11 +141,7 @@ ProjectReportDate=Canvia les dates de les tasques en funció de la nova data d'i
 ErrorShiftTaskDate=S'ha produït un error en el canvi de les dates de les tasques
 ProjectsAndTasksLines=Projectes i tasques
 ProjectCreatedInDolibarr=Projecte %s creat
-<<<<<<< HEAD
-ProjectValidatedInDolibarr=Project %s validated
-=======
 ProjectValidatedInDolibarr=Projecte %s validat
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 ProjectModifiedInDolibarr=Projecte %s modificat
 TaskCreatedInDolibarr=La tasca %s a sigut creada
 TaskModifiedInDolibarr=La tasca %s a sigut modificada
@@ -227,12 +224,7 @@ NoAssignedTasks=No hi ha tasques assignades (assigni el projecte / tasques a l'u
 # Comments trans
 AllowCommentOnTask=Permet comentaris dels usuaris a les tasques
 AllowCommentOnProject=Permetre comentaris dels usuaris als projectes
-DontHavePermissionForCloseProject=You do not have permissions to close the project %s
-DontHaveTheValidateStatus=The project %s must be open to be closed
-<<<<<<< HEAD
-RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
-=======
+DontHavePermissionForCloseProject=No teniu permisos per tancar el projecte %s
+DontHaveTheValidateStatus=El projecte %s ha de ser obert per tancar
 RecordsClosed=%s projecte(s) tancat(s)
-SendProjectRef=Sobre el projecte %s
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/ca_ES/stocks.lang b/htdocs/langs/ca_ES/stocks.lang
index 48ca7fd499d..33747a9f57e 100644
--- a/htdocs/langs/ca_ES/stocks.lang
+++ b/htdocs/langs/ca_ES/stocks.lang
@@ -8,17 +8,9 @@ WarehouseEdit=Edició magatzem
 MenuNewWarehouse=Nou magatzem
 WarehouseSource=Magatzem origen
 WarehouseSourceNotDefined=Sense magatzems definits,
-<<<<<<< HEAD
-AddWarehouse=Create warehouse
-=======
 AddWarehouse=Crea un magatzem
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 AddOne=Afegir un
-<<<<<<< HEAD
-DefaultWarehouse=Default warehouse
-=======
 DefaultWarehouse=Magatzem predeterminat
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 WarehouseTarget=Magatzem destinació
 ValidateSending=Elimina l'enviament
 CancelSending=Cancel·la l'enviament
@@ -32,11 +24,7 @@ Movements=Moviments
 ErrorWarehouseRefRequired=El nom de referència del magatzem és obligatori
 ListOfWarehouses=Llistat de magatzems
 ListOfStockMovements=Llistat de moviments de estoc
-<<<<<<< HEAD
-ListOfInventories=List of inventories
-=======
 ListOfInventories=Llista d'inventaris
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 MovementId=ID del moviment
 StockMovementForId=ID de moviment %d
 ListMouvementStockProject=Llista de moviments d'estoc associats al projecte
@@ -215,3 +203,4 @@ RegulateStock=Regula l'estoc
 ListInventory=Llistat
 StockSupportServices=Serveis de suport a la gestió d'estoc
 StockSupportServicesDesc=De manera predeterminada, només es pot assignar estoc als productes del tipus "producte". Si està activat i si el mòdul Serveis està activat, també podeu assignar estoc als productes del tipus "servei"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/ca_ES/stripe.lang b/htdocs/langs/ca_ES/stripe.lang
index 4fea61fd51a..ca8c83725cb 100644
--- a/htdocs/langs/ca_ES/stripe.lang
+++ b/htdocs/langs/ca_ES/stripe.lang
@@ -35,36 +35,18 @@ NewStripePaymentReceived=S'ha rebut un nou pagament de Stripe
 NewStripePaymentFailed=S'ha intentat el pagament de Stripe però, ha fallat
 STRIPE_TEST_SECRET_KEY=Clau secreta de test
 STRIPE_TEST_PUBLISHABLE_KEY=Clau de test publicable
-STRIPE_TEST_WEBHOOK_KEY=Webhook test key
+STRIPE_TEST_WEBHOOK_KEY=Clau de prova de Webhook
 STRIPE_LIVE_SECRET_KEY=Clau secreta
 STRIPE_LIVE_PUBLISHABLE_KEY=Clau pubiclable
-STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
-ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
+STRIPE_LIVE_WEBHOOK_KEY=Webhook clau en directe
+ONLINE_PAYMENT_WAREHOUSE=Les existències per utilitzar per disminuir les existències quan es fa el pagament en línia <br> (Pendent de fer Quan es fa una opció per reduir l'estoc en una acció a la factura i es genera la factura el pagament en línia?)
 StripeLiveEnabled=Stripe live activat (del contrari en mode test/sandbox)
 StripeImportPayment=Importar pagaments per Stripe
 ExampleOfTestCreditCard=Exemple de targeta de crèdit per a prova: %s (vàlid), %s (error CVC), %s (vençut), %s (falla de càrrega)
-StripeGateways=Stripe gateways
-OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
-OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
-BankAccountForBankTransfer=Bank account for fund payouts
-<<<<<<< HEAD
-StripeAccount=Stripe account
-StripeChargeList=List of Stripe charges
-StripeTransactionList=List of Stripe transactions
-StripeCustomerId=Stripe customer id
-StripePaymentModes=Stripe payment modes
-LocalID=Local ID
-StripeID=Stripe ID
-NameOnCard=Name on card
-CardNumber=Card Number
-ExpiryDate=Expiry Date
-CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
-CreateCustomerOnStripe=Create customer on Stripe
-CreateCardOnStripe=Create card on Stripe
-ShowInStripe=Show in Stripe
-=======
+StripeGateways=Passarel·les Stripe
+OAUTH_STRIPE_TEST_ID=Identificador de client de Stripe Connect (ca _...)
+OAUTH_STRIPE_LIVE_ID=Identificador de client de Stripe Connect (ca _...)
+BankAccountForBankTransfer=Compte bancari per als pagaments de fons
 StripeAccount=Compte de Stripe
 StripeChargeList=Llista de càrregues de Stripe
 StripeTransactionList=Llista de transaccions de Stripe
@@ -76,9 +58,8 @@ NameOnCard=Nom a la targeta
 CardNumber=Número de targeta
 ExpiryDate=Data de caducitat
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Estàs segur que vols eliminar aquest registre de la targeta?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Crea un client a Stripe
 CreateCardOnStripe=Crea una targeta a Stripe
 ShowInStripe=Mostra a Stripe
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
diff --git a/htdocs/langs/ca_ES/supplier_proposal.lang b/htdocs/langs/ca_ES/supplier_proposal.lang
index 3bfd58af4d4..e6774a2642d 100644
--- a/htdocs/langs/ca_ES/supplier_proposal.lang
+++ b/htdocs/langs/ca_ES/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Pressupostos de proveïdor
-supplier_proposalDESC=Gestiona les peticions de preu de proveïdors
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
 SupplierProposalNew=Nova petició de preu
 CommRequest=Petició de preu
 CommRequests=Peticions de preu
 SearchRequest=Busca una petició
 DraftRequests=Peticions esborrany
-SupplierProposalsDraft=Pressupost de proveïdor esborrany
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=Últimes %s peticions de preu modificades
 RequestsOpened=Obre una petició de preu
-SupplierProposalArea=Àrea de pressupostos de proveïdor
-SupplierProposalShort=Pressupost de proveïdor
-SupplierProposals=Pressupost de proveïdor
-SupplierProposalsShort=Pressupostos de proveïdor
+SupplierProposalArea=Vendor proposals area
+SupplierProposalShort=Vendor proposal
+SupplierProposals=Vendor proposals
+SupplierProposalsShort=Vendor proposals
 NewAskPrice=Nova petició de preu
 ShowSupplierProposal=Mostra una petició de preu
 AddSupplierProposal=Crea una petició de preu
-SupplierProposalRefFourn=Ref. proveïdor
+SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=Data de lliurament
 SupplierProposalRefFournNotice=Abans de tancar-ho com a "Acceptat", pensa en captar les referències del proveïdor.
 ConfirmValidateAsk=Estàs segur que vols validar aquest preu de sol·licitud sota el nom <b>%s</b>?
@@ -47,9 +47,9 @@ CommercialAsk=Petició de preu
 DefaultModelSupplierProposalCreate=Model de creació per defecte
 DefaultModelSupplierProposalToBill=Model per defecte en tancar una petició de preu (acceptada)
 DefaultModelSupplierProposalClosed=Model per defecte en tancar una petició de preu (rebutjada)
-ListOfSupplierProposals=Llistat de peticions de preu a proveïdor
-ListSupplierProposalsAssociatedProject=Llista de pressupostos de proveïdor associats al projecte
-SupplierProposalsToClose=Pressupostos de proveïdor a tancar
-SupplierProposalsToProcess=Pressupostos de proveïdor a processar
+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=Últims %s preus de sol·licitud
 AllPriceRequests=Totes les peticions
diff --git a/htdocs/langs/ca_ES/suppliers.lang b/htdocs/langs/ca_ES/suppliers.lang
index ca81f0dd61d..ae2dbc1708e 100644
--- a/htdocs/langs/ca_ES/suppliers.lang
+++ b/htdocs/langs/ca_ES/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Proveïdors
-SuppliersInvoice=Factura proveïdor
-ShowSupplierInvoice=Mostrar factura de proveïdor
-NewSupplier=Nou proveïdor
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=Històric
-ListOfSuppliers=Llistat de proveïdors
-ShowSupplier=Mostrar proveïdor
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=Data comanda
 BuyingPriceMin=El millor preu de compra
 BuyingPriceMinShort=El millor preu de compra
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Total dels preus de venda de subproductes
 SomeSubProductHaveNoPrices=Alguns subproductes no tenen preus definits
 AddSupplierPrice=Afegeix preu de compra
 ChangeSupplierPrice=Canvia el preu de compra
-SupplierPrices=Preus de proveïdor
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Aquesta referència de proveïdor ja està associada a la referència: %s
-NoRecordedSuppliers=Sense proveïdors registrats
-SupplierPayment=Pagament a proveïdor
-SuppliersArea=Àrea proveïdors
-RefSupplierShort=Ref. proveïdor
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=Disponibilitat
-ExportDataset_fournisseur_1=Factures de proveïdors i línies de factura
-ExportDataset_fournisseur_2=Factures proveïdors i pagaments
-ExportDataset_fournisseur_3=Comandes de proveïdors i línies de comanda
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=Aprovar aquesta comanda
 ConfirmApproveThisOrder=Vols aprovar la comanda <b>%s</b>?
 DenyingThisOrder=Denegar aquesta comanda
 ConfirmDenyingThisOrder=Vols denegar la comanda <b>%s</b>?
 ConfirmCancelThisOrder=Vols cancel·lar la comanda <b>%s</b>?
-AddSupplierOrder=Crear comanda a proveïdor
-AddSupplierInvoice=Crear factura de proveïdor
-ListOfSupplierProductForSupplier=Llistat de productes i preus del proveïdor <b>%s</b>
-SentToSuppliers=Enviat a proveïdors
-ListOfSupplierOrders=Llista de comandes a proveïdors
-MenuOrdersSupplierToBill=Comandes a proveïdors a facturar
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Temps d'entrega en dies
 DescNbDaysToDelivery=El retard més gran d'entrega dels productes d'aquesta comanda
-SupplierReputation=Reputació del proveïdor
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=No demanar
 NotTheGoodQualitySupplier=Qualitat incorrecte
 ReputationForThisProduct=Reputació
 BuyerName=Nom del comprador
 AllProductServicePrices=Tots els preus de producte / servei
 AllProductReferencesOfSupplier=Totes les referències dels productes/serveis del proveïdor
-BuyingPriceNumShort=Preus de proveïdor
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/ca_ES/website.lang b/htdocs/langs/ca_ES/website.lang
index 1c18f49dbe7..9c986cc367c 100644
--- a/htdocs/langs/ca_ES/website.lang
+++ b/htdocs/langs/ca_ES/website.lang
@@ -38,13 +38,9 @@ RealURL=URL real
 ViewWebsiteInProduction=Mostra la pàgina web utilitzant les URLs d'inici
 SetHereVirtualHost=Si pots crear, al teu servidor web (Apache, Nginx...), un Host Virtual amb PHP habilitat i un directori Root a <strong>%s</strong><br><br>, llavors introduïu aquí el nom del host virtual que has creat, d'aquesta manera es pot fer una vista prèvia utilitzant aquest accés directe al servidor web, i no només utilitzant el servidor Dolibarr.
 YouCanAlsoTestWithPHPS=En l'entorn de desenvolupament, és possible que preferiu provar el lloc amb el servidor web incrustat de PHP (requereix PHP 5.5) executant-se<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+CheckVirtualHostPerms=Comproveu també que l'amfitrió virtual té permisos <strong> %s </strong> en fitxers a <strong> %s </strong>
 ReadPerm=Llegit
-<<<<<<< HEAD
-WritePerm=Write
-=======
 WritePerm=Escriu
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 PreviewSiteServedByWebServer=<LI>Vista prèvia %s en una nova pestanya.</LI><br><br>El %s serà servit per un servidor web extern (com ara Apache, Nginx, IIS). Heu d'instal·lar i configurar aquest servidor abans d'apuntar al directori:<br><strong>%s</strong><br> URL servit per un servidor extern:<br><strong>%s</strong><br>
 PreviewSiteServedByDolibarr=<u> Previsualitza  %s en una nova pestanya. </li> <br> <br> El servidor %s serà servit pel servidor Dolibarr d'aquesta manera no es necessita instal·la cap servidor web addicional (com ara Apache, Nginx, IIS).<br>L'inconvenient és que l'URL de les pàgines no son amigables i començen per la ruta del vostre Dolibarr. <br>URL servit per Dolibarr:<br><strong> %s </strong> <br> <br> Per utilitzar el vostre propi servidor web extern per a servir a aquest lloc web, creeu un amfitrió ('host') virtual al vostre servidor web que apunti al directori<br><strong> %s </strong><br>, llavors introduïu el nom d'aquest servidor virtual i feu clic a l'altre botó de vista prèvia (botó de 'preview').
 VirtualHostUrlNotDefined=No s'ha definit la URL de l'amfitrió virtual que serveix el servidor web extern
@@ -77,7 +73,7 @@ AnotherContainer=Un altre contenidor
 WEBSITE_USE_WEBSITE_ACCOUNTS=Activa la taula del compte del lloc web
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Activeu la taula per emmagatzemar comptes del lloc web (login/contrasenya) per a cada lloc web de tercers
 YouMustDefineTheHomePage=Primer heu de definir la pàgina d'inici predeterminada
-OnlyEditionOfSourceForGrabbedContentFuture=Nota: només es pot editar el codi HTML quan el contingut de la pàgina estigui inicialitzada i agafant-lo des d'una pàgina externa (l'editor WYSIWYG no estarà disponible)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Només l'edició de codi HTML és possible quan el contingut s'ha capturat d'un lloc extern
 GrabImagesInto=Agafa també imatges trobades dins del css i a la pàgina.
 ImagesShouldBeSavedInto=Les imatges s'han de desar al directori
diff --git a/htdocs/langs/ca_ES/workflow.lang b/htdocs/langs/ca_ES/workflow.lang
index 4ff216fcafa..781ccf16af9 100644
--- a/htdocs/langs/ca_ES/workflow.lang
+++ b/htdocs/langs/ca_ES/workflow.lang
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classifica les comandes de cli
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classifica les comandes de client vinculades d'origen com a facturades quan la factura del client es posi com a pagada (i si l'import de la factura és igual a l'import total de les comandes vinculades)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classifiqueu com a "Enviada" la comanda de client original enllaçada quan es validi un enviament (sempre que la quantitat d'articles enviada per tots els enviaments sigui la mateixa que la de la comanda)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classifiqueu com a "Facturada" la proposta (o propostes) del proveïdor originals enllaçades quan es validi la factura del proveïdor (sempre i quan l'import de la factura sigui igual a la quantitat total de propostes enllaçades)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classifiqueu com a "Facturada" la comanda (o comandes) de proveïdor originals enllaçades quan es validi la factura del proveïdor (sempre i quan l'import de la factura sigui igual al total de les comandes vinculades)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=Creació automàtica
 AutomaticClassification=Classificació automàtica
diff --git a/htdocs/langs/cs_CZ/accountancy.lang b/htdocs/langs/cs_CZ/accountancy.lang
index dab4263959e..7801c25f32d 100644
--- a/htdocs/langs/cs_CZ/accountancy.lang
+++ b/htdocs/langs/cs_CZ/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Účetnictví
 ACCOUNTING_EXPORT_SEPARATORCSV=Oddělovač sloupců pro export souboru
 ACCOUNTING_EXPORT_DATE=Formát data pro export souboru
 ACCOUNTING_EXPORT_PIECE=Exportovat počet kusů
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Accounts with non zero values
 ListOfAccounts=List of accounts
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers 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
 
-AccountancyArea=Oblast účetnictví
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Využití evidence modulu se provádí v několika kroku:
 AccountancyAreaDescActionOnce=Tyto akce jsou obvykle prováděny pouze jednou, nebo jednou za rok ...
 AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
@@ -89,7 +90,7 @@ MenuProductsAccounts=produktové účty
 ProductsBinding=Produkty účty
 Ventilation=Vazba na účetní závěrky
 CustomersVentilation=Zákazník faktura závazná
-SuppliersVentilation=Dodavatelská faktura je závazná
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Náklady zpráva vázání
 CreateMvts=Vytvořit novou transakci
 UpdateMvts=Modifikace transakce
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=Nákupní deník
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Ostatní deník
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Rozšířený výpis deníku
 ACCOUNTING_SOCIAL_JOURNAL=Sociální deník
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Účtování v převodním účtu
 ACCOUNTING_ACCOUNT_SUSPENSE=Čekající účet
@@ -185,11 +187,12 @@ ListeMvts=Seznam pohybů
 ErrorDebitCredit=Debetní a kreditní nemůže mít hodnotu ve stejnou dobu
 AddCompteFromBK=Přidat účetní účty do skupiny
 ReportThirdParty=Seznam účtů třetí strany
-DescThirdPartyReport=Konzultujte zde seznam třetích stran, zákazníky a dodavateli a jejich účetní účty
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=Seznam účetních účtů
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Group of account
 Pcgsubtype=Subgroup of account
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Seznamte se zde se seznamem řádků faktur zákazníků
 DescVentilTodoCustomer=Prověřit fakturační řádky, které již nejsou vázány účtem účetnictví produktu
 ChangeAccount=Změnit výrobek/službu na účetnm účtu ve vybraných řádcích s následujícím účetním účtem:
 Vide=-
-DescVentilSupplier=Konzultujte zde seznam řádků dodavatelské faktury vázaných nebo nevázaných na účetní produkt účtu
-DescVentilDoneSupplier=Konzultujte zde seznam řádků faktur dodavatele a jejich účetnho účtu
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Bind zpráva náklad linky již nejsou vázány s účetním poplatek účtu
 DescVentilExpenseReport=Zde si přečtěte seznam výkazů výdajů vázaných (nebo ne) na účty účtování poplatků
 DescVentilExpenseReportMore=Máte-li nastavit účtování účtu na typ zprávy náklady linek, bude aplikace moci provádět všechny vazby mezi vaše náklady sestavy linek a účetní evidence grafu účtů jen jedním kliknutím pomocí tlačítka <strong> „%s“ </ strong>. Je-li účet nebyl nastaven na poplatcích slovníku nebo pokud má stále některé řádky není vázán na jiný účet, budete muset provést ruční vazby z menu „<strong> %s </ strong>“.
@@ -215,7 +218,7 @@ ValidateHistory=Ověřit automaticky
 AutomaticBindingDone=Automatická vazba provádí
 
 ErrorAccountancyCodeIsAlreadyUse=Chyba, nelze odstranit tento účetní účet, protože ho zrovna používáte
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Ověřovací karta
 GeneralLedgerIsWritten=Transactions are written in the Ledger
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -293,4 +296,9 @@ Binded=linky vázané
 ToBind=Linky k vazbě
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang
index 08eade87cea..b8c56d8ce2b 100644
--- a/htdocs/langs/cs_CZ/admin.lang
+++ b/htdocs/langs/cs_CZ/admin.lang
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=SMTP / SMTPS Host (Výchozí nastavení v php.ini: <b>%s</
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP / SMTPS Port (Nedefinováno v PHP na Unixových systémech)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPS Hosts (Nedefinováno v PHP na Unixových systémech)
 MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= Poslat systémovou skrytou kopii všech odeslaných e-mailů na
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=Metoda odesílání e-mailů
 MAIN_MAIL_SMTPS_ID=SMTP ID je-li vyžadováno ověření
 MAIN_MAIL_SMTPS_PW=SMTP heslo je-li vyžadováno ověření
@@ -291,7 +292,7 @@ ModuleSetup=Nastavení modulu
 ModulesSetup=Nastavení modulu/aplikace
 ModuleFamilyBase=Systém
 ModuleFamilyCrm=Řízení vztahů se zákazníky (CRM)
-ModuleFamilySrm=Dodavatel Vztah Management (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Řízení produktů
 ModuleFamilyHr=Řízení lidských zdrojů (HRM)
 ModuleFamilyProjects=Projekty / Týmové práce
@@ -373,7 +374,8 @@ NoSmsEngine=Ne odesílatel SMS manažer k dispozici. SMS odesílatele manažer n
 PDF=PDF
 PDFDesc=Můžete nastavit každý globální možnosti týkající se generování PDF
 PDFAddressForging=Pravidla se budují adresy boxy
-HideAnyVATInformationOnPDF=Skrýt všechny informace týkající se DPH na generované PDF
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=Skrýt popis produktů z vytvořeného PDF
@@ -445,7 +447,8 @@ DisplayCompanyInfo=Zobrazit adresu společnosti
 DisplayCompanyManagers=Jména display manažer
 DisplayCompanyInfoAndManagers=Zobrazte adresu firmy a jména správce
 EnableAndSetupModuleCron=Chcete-li mít tento opakující faktury soupisky generovány automaticky, modul * %s * musí být povoleno a správně nastaveny. V opačném případě, generování faktur musí být provedeno manuálně z této šablony s tlačítkem * Vytvořit *. Všimněte si, že i když jste povolili automatické generování, stále se můžete bezpečně spustit manuální generaci. Duplikáty generace za stejné období nejsou možné.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
 Use3StepsApproval=Ve výchozím nastavení musí být nákupní objednávky vytvořeny a schváleny dvěma různými uživateli (jeden krok / uživatel k vytvoření a jeden krok / uživatel ke schválení. Všimněte si, že pokud má uživatel oprávnění k vytvoření a schválení, stačí jeden krok / uživatel) . Touto volbou můžete požádat o zavedení třetího schvalovacího kroku / schválení uživatele, pokud je částka vyšší než určená hodnota (potřebujete tedy 3 kroky: 1 = ověření, 2 = první schválení a 3 = druhé schválení, pokud je dostatečné množství). <br> Pokud je zapotřebí jedno schvalování (2 kroky), nastavte jej na velmi malou hodnotu (0,1), pokud je vždy požadováno druhé schválení (3 kroky).
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Set this to 1 if you want to attach main document to emai
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=Uživatelé a skupiny
 Module0Desc=Uživatelé / zaměstnanci a vedení Skupiny
@@ -479,7 +485,7 @@ Module1Desc=Firmy a správu kontaktů (zákazníci, vyhlídky ...)
 Module2Name=Obchodní
 Module2Desc=Obchodní řízení
 Module10Name=Účetnictví
-Module10Desc=Jednoduché účetnictví zprávy (časopisy, obrat) vychází na obsahu databáze. No dispečink.
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=Návrhy
 Module20Desc=Komerční návrh řízení
 Module22Name=Mass E-mailing
@@ -546,8 +552,8 @@ Module400Name=Projekty/Příležitosti/Vedení
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=WebCalendar
 Module410Desc=WebCalendar integrace
-Module500Name=Zvláštní výdaje
-Module500Desc=Řízení zvláštních výdajů, jako jsou daně, sociální příspěvky, divideny a platy
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Platba mezd zaměstnanců
 Module510Desc=Record and follow payment of your employee wages
 Module520Name=Půjčka
@@ -561,14 +567,14 @@ Module700Name=Dary
 Module700Desc=Darování řízení
 Module770Name=Zpráva výdajů
 Module770Desc=Management a reklamace vyúčtování výdajů (doprava, jídlo, ...)
-Module1120Name=Dodavatel obchodní nabídky
-Module1120Desc=Požadavek dodavatel obchodní návrh a ceny
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Mantis integrace
 Module1520Name=Dokument Generation
 Module1520Desc=Hromadná pošta generování dokumentů
 Module1780Name=Tagy/Kategorie
-Module1780Desc=Vytvořit tagy/kategorie (produkty, zákazníci, dodavatelé, kontakty nebo členi)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Umožňují upravit některá textové pole přes pokročilý editor (na základě CKEditor)
 Module2200Name=Dynamické ceny
@@ -576,7 +582,7 @@ Module2200Desc=Povolit použití matematických výrazů pro ceny
 Module2300Name=Naplánované úlohy
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Události / Agenda
-Module2400Desc=Postupujte udělal a nadcházející události. Nechť Aplikační protokoly automatických akcí pro účely sledování nebo zaznamenávat manuální akce či Rendez-vous.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API / Webové služby (SOAP server)
@@ -613,7 +619,7 @@ Module50100Desc=Bod prodejního modulu (POS).
 Module50200Name=Paypal
 Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 Module50400Name=Účetnictví (pokročilé)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=PrintIPP
 Module54000Desc=Přímý tisk (bez otevření dokumentů) pomocí poháry IPP rozhraní (tiskárna musí být viditelné ze serveru, a CUPS musí být installe na serveru).
 Module55000Name=Anketa, průzkum nebo hlasování
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance zpoždění (ve dnech) před záznam o zpož
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance zpoždění (ve dnech) před pohotovosti pro kontrolu vklad dělat
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance zpoždění (ve dnech) před záznamem pro výkazů o výdajích schválit
 SetupDescription1=Oblast nastavení je pro počáteční nastavení parametrů ještě před začátkem užívání Dolibarr.
-SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=Ostatní položky menu spravovat volitelné parametry.
 LogEvents=Události bezpečnostní audit
 Audit=Audit
@@ -1054,8 +1060,9 @@ LogEventDesc=Můžete povolit zde protokolování událostí Dolibarr zabezpeče
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Systémové informace je různé technické informace získáte v režimu pouze pro čtení a viditelné pouze pro správce.
 SystemAreaForAdminOnly=Tato oblast je k dispozici pro správce uživatele. Žádný z Dolibarr oprávnění může snížit tento limit.
-CompanyFundationDesc=Úpravy na této stránce všechny známé informace o společnosti nebo nadace, které potřebujete spravovat (K tomu, klikněte na „Upravit“ nebo tlačítko „uložit“ v dolní části stránky)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=Můžete si vybrat každý parametr týkající se vzhledu Dolibarr a cítit se zde
 AvailableModules=Available app/modules
 ToActivateModule=Pro aktivaci modulů, přejděte na nastavení prostoru (Domů-&gt; Nastavení-&gt; Modules).
@@ -1188,11 +1195,11 @@ UserMailRequired=EMail nutné vytvořit nového uživatele
 HRMSetup=setup HRM Modul
 ##### Company setup #####
 CompanySetup=Firmy modul nastavení
-CompanyCodeChecker=Modul pro generování kódu třetích stran a přezkušování (zákazník nebo dodavatel)
-AccountCodeManager=Module for accounting code generation (customer or supplier)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=E-maily oznámení funkce vám umožní tiše odesílat automatické poštu, pro některé události Dolibarr. Cíle oznámení mohou být definovány:
 NotificationsDescUser=* Uživatelé na jeden uživatel v čase.
-NotificationsDescContact=* Za subjekty kontakty (zákazníci nebo dodavatelé), jeden kontakt v době.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* Nebo nastavením globálních cílových e-mailů na stránce nastavení modulu.
 ModelModules=Dokumenty šablony
 DocumentModelOdt=Generování dokumentů z OpenDocuments šablon (. ODT nebo ODS. Soubory OpenOffice, KOffice, TextEdit, ...)
@@ -1203,6 +1210,9 @@ MustBeUnique=Musí být jedinečný?
 MustBeMandatory=Povinné k vytvoření subjektu?
 MustBeInvoiceMandatory=Povinné ověřování faktur?
 TechnicalServicesProvided=Technické služby poskytované
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Export odkaz na <b>%s</b> formátu je k dispozici na následujícím odkazu: %s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=Volný text o obchodních návrhů
 WatermarkOnDraftProposal=Vodoznak na předloh návrhů komerčních (none-li prázdný)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Zeptejte se na umístění bankovního účtu nabídky
 ##### SupplierProposal #####
-SupplierProposalSetup=Cena požaduje nastavení dodavatelé modul
-SupplierProposalNumberingModules=Cena žádosti dodavatele číslování modelů
-SupplierProposalPDFModules=Cena požaduje dodavatelé dokumenty modely
-FreeLegalTextOnSupplierProposal=Volný text na žádosti o cenový dodavatele
-WatermarkOnDraftSupplierProposal=Vodoznak na předem požadovaných cenách dodavatelé (žádný není prázdný)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Zeptejte se na bankovní účet destinaci nabídce ceny
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Zadat zdroj datového skladu pro objednávku
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Požádat o bankovní účet určení dodavatele objednávku
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=Objednat řízení nastavení
 OrdersNumberingModules=Objednávky číslování modelů
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=Připojení k serveru &quot;%s&quot; na databázi &quot;%s&quot
 OSCommerceTestKo1=Připojení k &quot;%s&quot; serveru úspěšná, ale databáze &quot;%s&quot; by nebylo možno dosáhnout.
 OSCommerceTestKo2=Připojení k serveru &quot;%s&quot; s uživatelem &quot;%s 'se nezdařilo.
 ##### Stock #####
-StockSetup=Konfigurace modulu Sklady
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=Pokud použijete místě prodeje (POS modulu modulu stanoveného ve výchozím nebo jiným externím modulu), může být toto nastavení ignorováno vaší místě prodeje modulu. Most na prodejních místech moduly jsou navrženy tak, aby vytvořit ihned fakturu a snížit zásoby standardně bez ohledu jsou možnosti zde. Takže, pokud potřebujete mít či nemít pokles zásoby při registraci prodat ze svého Point of Sale, zkontrolujte také váš POS modul nastavit.
 ##### Menu #####
 MenuDeleted=Menu smazán
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Zkontrolujte, zda příjmy číslování modul
 MultiCompanySetup=Společnost Multi-modul nastavení
 ##### Suppliers #####
 SuppliersSetup=Dodavatel modul nastavení
-SuppliersCommandModel=Kompletní šablona se s dodavately řádu (logo. ..)
-SuppliersInvoiceModel=Kompletní šablona dodavatelské faktury (logo. ..)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Dodavatelských faktur číslování modelů
 IfSetToYesDontForgetPermission=Pokud je nastaveno na ano, nezapomeňte poskytnout oprávnění skupiny nebo uživatele povolených pro druhou schválení
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=Nepoužívejte nejednoznačné znaky ( "1", "L", "i",
 SalariesSetup=Nastavení modulu platů
 SortOrder=Řazení objedávek
 Format=Formát
-TypePaymentDesc=0: Zákazník typ platby, 1: Dodavatel typ platby, 2: Oba zákazníci a dodavatelé typ platby
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Zahrnout cestu (definováno v proměnné% s)
 ExpenseReportsSetup=Nastavení modulu Expense Reports
 TemplatePDFExpenseReports=Šablon dokumentů ke generování dokumentu sestavy výdajů
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Instalace externí modul z aplikace by
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Označte řádky tabulky, když tah myš vynechá
 HighlightLinesColor=Zvýrazněte barvu čáry, když myší prochází (držte prázdné, aby nebylo zvýrazněno)
-TextTitleColor=Barva názvu stránky
+TextTitleColor=Text color of Page title
 LinkColor=Barva odkazů
 PressF5AfterChangingThis=Stisknutím klávesy CTRL + F5 na klávesnici nebo vymazat mezipaměť prohlížeče Po změně této hodnoty, aby bylo účinné
 NotSupportedByAllThemes=Se pracuje s stěžejních témat, nemusí být podporována externími tématy
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=barva pozadí pro Top nabídky
 TopMenuDisableImages=Skrýt obrázky v Top nabídky
 LeftMenuBackgroundColor=barva pozadí na levé menu
 BackgroundTableTitleColor=Barva pozadí pro tabulku názvu linky
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Barva pozadí pro liché řádky tabulky
 BackgroundTableLineEvenColor=barva pozadí pro sudé řádky tabulky
 MinimumNoticePeriod=Minimální výpovědní lhůta (Vaše žádost dovolená musí být provedeno před tímto zpožděním)
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=Příklad: 2 (vyplnit pouze tehdy, pokud problém týkal
 ExpectedChecksum=očekává Kontrolní součet
 CurrentChecksum=Aktuální Kontrolní
 ForcedConstants=Potřebné konstanty
-MailToSendProposal=Chcete-li poslat návrh zákazníka
-MailToSendOrder=Pro odeslání objednávky zákazníka
-MailToSendInvoice=Chcete-li poslat zákazníkům faktury
-MailToSendShipment=Chcete-li poslat zásilku
-MailToSendIntervention=Chcete-li poslat zásah
-MailToSendSupplierRequestForQuotation=Chcete-li odeslat žádost o kotace pro dodavatele
-MailToSendSupplierOrder=Chcete-li poslat dodavatele objednávku
-MailToSendSupplierInvoice=Chcete-li poslat dodavatelské faktury
-MailToSendContract=Chcete-li poslat smlouvu
-MailToThirdparty=Chcete-li poslat e-mail ze strany subjektů
-MailToMember=To send email from member page
-MailToUser=To send email from user page
-MailToProject= To send email from project page
+MailToSendProposal=návrhy zákazníků
+MailToSendOrder=Objednávky zákazníků
+MailToSendInvoice=faktury zákazníků
+MailToSendShipment=Zásilky
+MailToSendIntervention=Intervence
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Smlouvy
+MailToThirdparty=Třetí strany
+MailToMember=Členové
+MailToUser=Uživatelé
+MailToProject=Projects page
 ByDefaultInList=Zobrazit výchozí zobrazení seznamu
 YouUseLastStableVersion=Používáte nejnovější stabilní verzi
 TitleExampleForMajorRelease=Příklad zprávy, kterou lze použít k oznámit tuto hlavní verzi (bez obav používat na svých webových stránkách)
@@ -1780,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Konfigurace modulu Zdroje
 UseSearchToSelectResource=Použijte vyhledávací formulář k výběru zdroje (spíše než rozevírací seznam).
diff --git a/htdocs/langs/cs_CZ/bills.lang b/htdocs/langs/cs_CZ/bills.lang
index 1e1ac5b2211..9c7173061e6 100644
--- a/htdocs/langs/cs_CZ/bills.lang
+++ b/htdocs/langs/cs_CZ/bills.lang
@@ -109,7 +109,7 @@ CancelBill=Storno faktury
 SendRemindByMail=Poslat upomínku e-mailem
 DoPayment=zadat platbu
 DoPaymentBack=Vraťte platbu
-ConvertToReduc=Převod do budoucí slevy
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Převést přebytek dostal do budoucnosti slevou
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Zadejte platbu obdrženoou od zákazníka
@@ -120,7 +120,7 @@ BillStatus=Stav faktury
 StatusOfGeneratedInvoices=Status vygenerovaných faktur
 BillStatusDraft=Návrh (musí být ověřeno)
 BillStatusPaid=Placeno
-BillStatusPaidBackOrConverted=Náhrada kreditu nebo převod na slevu
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Opuštěno
 BillStatusValidated=Ověřeno (je třeba uhradit)
@@ -296,10 +296,10 @@ DiscountType=Discount type
 NoteReason=Poznámka/důvod
 ReasonDiscount=Důvod
 DiscountOfferedBy=Poskytnuté
-DiscountStillRemaining=slevy
-DiscountAlreadyCounted=Slevy již spotřebována
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+SupplierDiscounts=Vendors discounts
 BillAddress=Účetní adresa
 HelpEscompte=Tato sleva je sleva poskytnuta zákazníkovi, protože jeho platba byla provedena před termínem splatnosti.
 HelpAbandonBadCustomer=Tato částka byla opuštěna (zákazník řekl, aby byl špatný zákazník) a je považována za výjimečně volnou.
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Povolit platby na různých subjektů účty, ale s
 PaymentNote=platba poznámka
 ListOfPreviousSituationInvoices=Seznam předchozí situace faktur
 ListOfNextSituationInvoices=Seznam dalších situace faktur
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Každých %s dny
 FrequencyPer_m=Každých %s měsíce
 FrequencyPer_y=Každých %s let
@@ -505,9 +511,14 @@ SituationAmount=Částka situace faktury (netto)
 SituationDeduction=Situace odčítání
 ModifyAllLines=Změnit všechny řádky
 CreateNextSituationInvoice=Vytvořit další situaci
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=Tato faktura není poslední v cyklu, a nesmí být změněna.
 DisabledBecauseNotLastInCycle=Další situace již existuje.
 DisabledBecauseFinal=Tato situace je konečné.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=N
 CantBeLessThanMinPercent=Pokrok nemůže být menší, než je jeho hodnota v předchozí situaci.
 NoSituations=Žádné otevřené situace
 InvoiceSituationLast=Závěrečná a hlavní faktura
@@ -532,3 +543,4 @@ AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/cs_CZ/categories.lang b/htdocs/langs/cs_CZ/categories.lang
index 7795c721afb..8edd41961dd 100644
--- a/htdocs/langs/cs_CZ/categories.lang
+++ b/htdocs/langs/cs_CZ/categories.lang
@@ -16,7 +16,7 @@ MembersCategoriesArea=Oblast uživatelské tagy/kategorie
 ContactsCategoriesArea=Oblast tagy/kategorie kontakty
 AccountsCategoriesArea=Accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
-SubCats=Podkategorie
+SubCats=Sub-categories
 CatList=Výpis tagů/kategorií
 NewCategory=Nový tag/kategorie
 ModifCat=Upravit tag/kategorii
@@ -85,3 +85,4 @@ CategorieRecursivHelp=Je-li aktivován, bude produkt spojen s nadřazenou katego
 AddProductServiceIntoCategory=Přidejte následující produkt/službu
 ShowCategory=Zobrazit tag/kategorii
 ByDefaultInList=By default in list
+ChooseCategory=Choose category
diff --git a/htdocs/langs/cs_CZ/commercial.lang b/htdocs/langs/cs_CZ/commercial.lang
index 390a15773d9..95d6bff2b0e 100644
--- a/htdocs/langs/cs_CZ/commercial.lang
+++ b/htdocs/langs/cs_CZ/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=Zavřít
 ActionAC_EMAILING=Poslat hromadný email
 ActionAC_COM=Poslat objednávky zákazníka e-mailem
 ActionAC_SHIP=Poslat přepravu na mail
-ActionAC_SUP_ORD=Poslat objednávku dodavatele e-mailem
-ActionAC_SUP_INV=Poslat dodavatelské faktury e-mailem
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=Ostatní
 ActionAC_OTH_AUTO=Automaticky vložené události
 ActionAC_MANUAL=Ručně vložené události
diff --git a/htdocs/langs/cs_CZ/companies.lang b/htdocs/langs/cs_CZ/companies.lang
index 707bb004d7b..4d11e09ad0e 100644
--- a/htdocs/langs/cs_CZ/companies.lang
+++ b/htdocs/langs/cs_CZ/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Are you sure you want to delete this contact and all inheri
 MenuNewThirdParty=Nová třetí strana
 MenuNewCustomer=Nový zákazník
 MenuNewProspect=Nový cíl
-MenuNewSupplier=Nový dodavatel
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=Nová soukromá osoba
-NewCompany=Nová společnost (cíl. zákazník, dodavatel)
-NewThirdParty=Nová třetí strana (cíl, zákazník, dodavatel)
-CreateDolibarrThirdPartySupplier=Vytvořit třetí stranu (dodavatele)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=Create thirdpary
 CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Oblast cílových kontaktů
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=Cíle
 ThirdPartyCustomers=Zákazníci
 ThirdPartyCustomersStats=Zákazníci
 ThirdPartyCustomersWithIdProf12=Zákazníci s %s nebo %s
-ThirdPartySuppliers=Dodavatelé
+ThirdPartySuppliers=Vendors
 ThirdPartyType=Typ třetí strany
 Individual=Soukromá osoba
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
@@ -77,11 +77,11 @@ Web=Web
 Poste= Pozice
 DefaultLang=Výchozí jazyk
 VATIsUsed=Sales tax is used
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
-ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Total proposals
 OverAllOrders=Total orders
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=RE Typ
 TypeLocaltax2ES=IRPF Typ
 WrongCustomerCode=Neplatný kód zákazníka
-WrongSupplierCode=Neplatný kód dodavatele
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Vzorový kód zákazníka
-SupplierCodeModel=Vzorový kód dodavatele
+SupplierCodeModel=Vendor code model
 Gencod=Čárový kód
 ##### Professional ID #####
 ProfId1Short=Prof id 1
@@ -267,7 +267,7 @@ Prospect=Cíl
 CustomerCard=Karta zákazníka
 Customer=Zákazník
 CustomerRelativeDiscount=Relativní zákaznická sleva
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=Relativní sleva
 CustomerAbsoluteDiscountShort=Absolutní sleva
 CompanyHasRelativeDiscount=Tento zákazník má výchozí slevu <b>%s%%</b>
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this suppl
 CompanyHasNoAbsoluteDiscount=Tento zákazník nemá diskontní úvěr k dispozici
 CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
 CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=Nikdo
 Supplier=Dodavatel
 AddContact=Vytvořit kontakt
@@ -304,13 +304,13 @@ DeleteACompany=Odstranit společnost
 PersonalInformations=Osobní údaje
 AccountancyCode=Účetní účet
 CustomerCode=Kód zákazníka
-SupplierCode=Kód dodavatele
+SupplierCode=Vendor code
 CustomerCodeShort=Kód zákazníka
-SupplierCodeShort=Kód dodavatele
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=Zákaznický kód, jedinečný pro všechny zákazníky
-SupplierCodeDesc=Dodavatelský kód, jedinečný pro všechny dodavatele
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=Požadováno, pokud třetí strana je zákazník či cíl
-RequiredIfSupplier=Požadováno, pokud třetí strana je dodavatel
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=Platnost řízena modulem
 ThisIsModuleRules=Toto jsou pravidla pro tento modul
 ProspectToContact=Cíl ke kontaktování
@@ -338,7 +338,7 @@ MyContacts=Moje kontakty
 Capital=Hlavní město
 CapitalOf=Hlavní město %s
 EditCompany=Upravit společnost
-ThisUserIsNot=Tento uživatel není cíl, zákazník ani dodavatel
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=Kontrola
 VATIntraCheckDesc=Odkaz <b>%s</b> umožňuje zkontrolovat DIČ/VAT. Je potřeba přístup k internetu.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -396,7 +396,7 @@ ImportDataset_company_4=Third parties/Sales representatives (Assign sales repres
 PriceLevel=Cenová hladina
 DeliveryAddress=Doručovací adresa
 AddAddress=Přidat adresu
-SupplierCategory=Kategorie dodavatele
+SupplierCategory=Vendor category
 JuridicalStatus200=Independent
 DeleteFile=Smazat soubor
 ConfirmDeleteFile=Jste si jisti, že chcete smazat tento soubor?
@@ -406,7 +406,7 @@ FiscalYearInformation=Informace o fiskálním roce
 FiscalMonthStart=Počáteční měsíc fiskálního roku
 YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
 YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
-ListSuppliersShort=Seznam dodavatelů
+ListSuppliersShort=List of vendors
 ListProspectsShort=Seznam cílů
 ListCustomersShort=Seznam zákazníků
 ThirdPartiesArea=Kontakty třetích stran
@@ -420,7 +420,7 @@ CurrentOutstandingBill=Momentální nezaplacený účet
 OutstandingBill=Max. za nezaplacený účet
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Vrátí číslo ve formátu %syymm-nnnn pro kód zákazníka a %syymm-nnnn pro kód dodavatele kde yy je rok, mm měsíc a nnnn je číselná řada bez přerušení a bez návratu k 0.
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=Kód je volný. Tento kód lze kdykoli změnit.
 ManagingDirectors=Jméno vedoucího (CEO, ředitel, předseda ...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/cs_CZ/compta.lang b/htdocs/langs/cs_CZ/compta.lang
index e654aab1c9a..0088303fe4a 100644
--- a/htdocs/langs/cs_CZ/compta.lang
+++ b/htdocs/langs/cs_CZ/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=Net placené
 VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
-VATSummary=Tax Balance
+VATSummary=Tax monthly
+VATBalance=Tax Balance
 VATPaid=Tax paid
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=Oblast Účetnictví/Pokladna
 NewPayment=Nová platba
 Payments=Platby
 PaymentCustomerInvoice=Platba zákaznické faktury
-PaymentSupplierInvoice=Platba dodavatelské faktury
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Sociální / fiskální placení daní
 PaymentVat=Platba DPH
 ListPayment=Seznam plateb
 ListOfCustomerPayments=Seznam zákaznických plateb
-ListOfSupplierPayments=Seznam plateb dodavatelům
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Datum zahájení období
 DateEndPeriod=Datum konce období
 newLT1Payment=Nová platba daň Obecné podmínky 2
@@ -110,7 +111,7 @@ ShowVatPayment=Zobrazit platbu DPH
 TotalToPay=Celkem k zaplacení
 BalanceVisibilityDependsOnSortAndFilters=pouze tehdy, pokud je řazen tabulka vzestupně na %s a filtrován 1 bankovního účtu je vidět v tomto seznamu Balance
 CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. účet. kód
 SupplierAccountancyCodeShort=Sup. účet. kód
 AccountNumber=Číslo účtu
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=Zpráva třetí strany RE
 LT2ReportByCustomersES=Zpráva o třetí straně IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Zpráva o vybrané a zaplacené DPH zákazníka
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Graf modelů účtů
 Pcg_type=Pcg typ
 Pcg_subtype=Pcg podtyp
 InvoiceLinesToDispatch=Řádky faktury pro odeslání
-ByProductsAndServices=Výrobky a služby
+ByProductsAndServices=By product and service
 RefExt=Externí ref
 ToCreateAPredefinedInvoice=Chcete-li vytvořit šablonu faktury, vytvořit standardní faktury, pak bez ověřování jej, klikněte na tlačítko „%s“.
 LinkedOrder=Odkaz na objednávku
@@ -215,7 +218,8 @@ Mode1=Metoda 1
 Mode2=Metoda 2
 CalculationRuleDesc=Chcete-li vypočítat celkovou částku DPH, jsou k dispozici dvě metody: <br> Metoda 1 je zaokrouhlení DPH na každém řádku, částky se sečtou. <br> Metoda 2 je součtem všech sum na každém řádku, pak se výsledek zaokrouhlí. <br> Konečný výsledek může se liší od několika haléřů. Výchozí režim je režim <b>%s.</b>
 CalculationRuleDescSupplier=podle dodavatele zvolte vhodnou metodu použití stejného pravidla pro výpočet a dostanete stejný výsledek, který očekáváte od svého dodavatele.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Obratová zpráva za zboží při použití režimu <b>hotovostního účetnictví</b> není relevantní. Tato zpráva je k dispozici pouze při použití režimu <b>zapojeného účetnictví</b>  (viz nastavení účetního modulu).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Výpočetní režim
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Účtovací účet pro platby DPH
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=Klonovat sociální / fiskální daň
 ConfirmCloneTax=Potvrdí klon sociálního / fiskální zaplacení daně
@@ -242,3 +246,10 @@ FiscalPeriod=Účetní období
 ListSocialContributionAssociatedProject=Seznam příspěvků na sociální zabezpečení v souvislosti s projektem
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/cs_CZ/dict.lang b/htdocs/langs/cs_CZ/dict.lang
index 78159ed9cb7..ef8e714862a 100644
--- a/htdocs/langs/cs_CZ/dict.lang
+++ b/htdocs/langs/cs_CZ/dict.lang
@@ -5,7 +5,8 @@ CountryIT=Itálie
 CountryES=Španělsko
 CountryDE=Německo
 CountryCH=Švýcarsko
-CountryGB=Velká Británie
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=Spojené Království Velká Británie
 CountryUK=Spojené Království Velká Británie
 CountryIE=Irsko
 CountryCN=Čína
diff --git a/htdocs/langs/cs_CZ/ecm.lang b/htdocs/langs/cs_CZ/ecm.lang
index 88238371d00..364e8c97546 100644
--- a/htdocs/langs/cs_CZ/ecm.lang
+++ b/htdocs/langs/cs_CZ/ecm.lang
@@ -39,9 +39,10 @@ ShowECMSection=Zobrazit adresář
 DeleteSection=Odstraňte adresář
 ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
 ECMDirectoryForFiles=Relativní adresář pro soubory
-CannotRemoveDirectoryContainsFiles=Nelze odstranit, protože obsahuje některé soubory
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=Správce souborů
-ECMSelectASection=Vyberte adresář na levé straně stromu ...
+ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
diff --git a/htdocs/langs/cs_CZ/errors.lang b/htdocs/langs/cs_CZ/errors.lang
index aff47efcaf9..140f376fa82 100644
--- a/htdocs/langs/cs_CZ/errors.lang
+++ b/htdocs/langs/cs_CZ/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Je zapotřebí čárový kód
 ErrorCustomerCodeAlreadyUsed=Zákaznický kód již používán
 ErrorBarCodeAlreadyUsed=Čárový kód je již používán
 ErrorPrefixRequired=Prefix nutné
-ErrorBadSupplierCodeSyntax=Bad syntaxe pro kód dodavatele
-ErrorSupplierCodeRequired=Dodavatel povinen kód
-ErrorSupplierCodeAlreadyUsed=Dodavatel kód již používán
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Špatné parametry. Tak takto opravdu ne ......
 ErrorBadValueForParameter=Chybná hodnota ‚%s‘ parametru ‚%s‘
 ErrorBadImageFormat=Obrázek nemá podporovaný formát (Váš PHP nepodporuje funkce pro převod obrázků z tohoto formátu)
@@ -87,7 +87,7 @@ ErrorsOnXLines=Chyby na <b>%s</b> zdrojovém záznamu (s)
 ErrorFileIsInfectedWithAVirus=Antivirový program nebyl schopen ověřit soubor (soubor může být napaden virem)
 ErrorSpecialCharNotAllowedForField=Speciální znaky nejsou povoleny pro pole &quot;%s&quot;
 ErrorNumRefModel=Existuje odkaz do databáze (%s) a není kompatibilní s tímto pravidlem číslování. Odebrat záznam nebo přejmenovat odkaz na aktivaci tohoto modulu.
-ErrorQtyTooLowForThisSupplier=Nedostatečné množství tohoto podniku, nebo není definována cena k tomuto produktu tohoto podniku
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Nastavení modulu jeví nekompletní. Jdi domů - Nastavení - Moduly dokončit.
 ErrorBadMask=Chyba na masku
 ErrorBadMaskFailedToLocatePosOfSequence=Chyba maska ​​bez pořadovým číslem
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definice Array Menu V modulu
 ErrorSavingChanges=Došlo k ocurred při ukládání změn
 ErrorWarehouseRequiredIntoShipmentLine=Sklad je zapotřebí na lince na dopravu
 ErrorFileMustHaveFormat=Soubor musí mít formát %s
-ErrorSupplierCountryIsNotDefined=Země tohoto dodavatele není definována. Napravte jako první.
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Nepodařilo se sloučit dva záznamy. Požadavek zrušen.
 ErrorStockIsNotEnoughToAddProductOnOrder=Sklad nestačí %s produkt přidat do nové objednávky.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Sklad nestačí %s produkt přidat do nové faktury.
diff --git a/htdocs/langs/cs_CZ/install.lang b/htdocs/langs/cs_CZ/install.lang
index 783f2544cfc..4c835c67ad8 100644
--- a/htdocs/langs/cs_CZ/install.lang
+++ b/htdocs/langs/cs_CZ/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=<b>%s</b> Konfigurační soubor neexis
 ConfFileCouldBeCreated=<b>%s</b> Konfigurační soubor byl vytvořen.
 ConfFileIsNotWritable=Konfigurační soubor <b>%s</b> není zapisovatelný. Zkontrolujte oprávnění. Při první instalaci musí mít Váš server právo zápisu do tohoto souboru.
 ConfFileIsWritable=Konfigurační soubor <b>%s</b> je zapisovatelný.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Aktualizuj všechny informace z konfiguračního souboru.
 PHPSupportSessions=Tato PHP instalace podporuje relace.
 PHPSupportPOSTGETOk=Tato PHP instalace podporuje proměnné POST a GET.
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
 WarningRemoveInstallDir=Pozor, z bezpečnostních důvodů po dokončení instalace či upgradu je potřeba zabránit opětovnému spuštění instalace. Přidejte soubor s názvem <b>install.lock</b> do adresáře document Dolibarr, aby jste zabránili nebezpečnému spuštění.
 FunctionNotAvailableInThisPHP=Není k dispozici na této instalaci PHP
 ChoosedMigrateScript=Vyberte migrační skript
-DataMigration=Migrace dat
-DatabaseMigration=Migrace struktury databáze
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Skript běží
 ChooseYourSetupMode=Vyberte si režim instalace a klepněte na tlačítko "Start"...
 FreshInstall=Nová instalace
@@ -146,7 +147,7 @@ NothingToDo=Nothing to do
 # upgrade
 MigrationFixData=Oprava denormalizovaných dat
 MigrationOrder=Migrace dat zákaznických objednávek
-MigrationSupplierOrder=Migrace dat dodavatelských objednávek
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Migrace dat komerčních návrhů
 MigrationInvoice=Migrace dat zákaznických faktur
 MigrationContract=Migrace dat smluv
@@ -196,6 +197,8 @@ MigrationEvents=Migrace událostí přidá vlastníka události do přiřazené
 MigrationEventsContact=Migration of events to add event contact into assignement table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
 MigrationReloadModule=Načíst modul %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 ShowNotAvailableOptions=Ukázat nedostupné možnosti
diff --git a/htdocs/langs/cs_CZ/ldap.lang b/htdocs/langs/cs_CZ/ldap.lang
index e68e5f61be0..ba6511db417 100644
--- a/htdocs/langs/cs_CZ/ldap.lang
+++ b/htdocs/langs/cs_CZ/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Heslo domény
 YouMustChangePassNextLogon=Heslo uživatele <b>%s</b> na doméně <b>%s</b> musí být změněno
 UserMustChangePassNextLogon=Uživatel musí změnit heslo v doméně %s
 LDAPInformationsForThisContact=Informace v databázi LDAP pro tento kontakt
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Member type synchronized
 ContactSynchronized=Kontakt synchronizován
 ForceSynchronize=Vynutit synchronizaci Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Nepodařilo se přečíst LDAP databázi. Zkontrolujte nastavení modulu LDAP a databázovou dostupnost.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/cs_CZ/loan.lang b/htdocs/langs/cs_CZ/loan.lang
index 6a8ea7ea774..c46ae8eff51 100644
--- a/htdocs/langs/cs_CZ/loan.lang
+++ b/htdocs/langs/cs_CZ/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=Kapitál
 Insurance=Pojištění
 Interest=Zájem
 Nbterms=Počet termínů
+Term=Term
 LoanAccountancyCapitalCode=Accounting account capital
 LoanAccountancyInsuranceCode=Accounting account insurance
 LoanAccountancyInterestCode=Accounting account interest
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=Potvrdit smazání tohoto úvěru
 LoanDeleted=Úvěr úspěšně smazán
 ConfirmPayLoan=Potvrďte klasifikaci zaplatit tento úvěr
 LoanPaid=Placený úvěr
-# Calc
-LoanCalc=Kalkulátor bankovního úvěru
-PurchaseFinanceInfo=Platební & finanční informace
-SalePriceOfAsset=Prodejní cena aktiv
-PercentageDown=Procento dlů
-LengthOfMortgage=Duration of loan
-AnnualInterestRate=Roční úroková sazba
-ExplainCalculations=Vysvětlení výpočtů
-ShowMeCalculationsAndAmortization=Ukažte mi výpočty a amortizaci
-MortgagePaymentInformation=Informace o platbě hypotéky
-DownPayment=Záloha
-DownPaymentDesc=<b>Záloha</b> = základní vynásobená procentem dolů dělená 100 (pro dolů 5% se stává 5/100 nebo 0,05)
-InterestRateDesc=<b>Úroková sazba</b> = roční úroková procena děleno 100,
-MonthlyFactorDesc=<b>Měsíční faktor</b> = výsledkem následujícího vzorce
-MonthlyInterestRateDesc=<b>Měsíční úroková sazba</b> = roční úroková sazba děleno 12 (za 12 měsíců v roce)
-MonthTermDesc=<b>Měsíc Termín</b> úvěru v měsících = počet let, na které jste vzali úvěr  - pozor na časy 12
-MonthlyPaymentDesc=Měsíční platba se počítá podle následujícího vzorce
-AmortizationPaymentDesc=<a href="#amortization">amortizace</a>se mění, jak moc vaše měsíční splátka jde vstříc zájmu banky, a kolik jde do splácení jistiny vašeho úvěru.
-AmountFinanced=Financovaná částka
-AmortizationMonthlyPaymentOverYears=Odpisy měsíční splátky: <b>%s</b> přes %s let
-Totalsforyear=Součty pro rok
-MonthlyPayment=Měsíční platby
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
-GoToInterest=%s půjde na ZÁJEM
-GoToPrincipal=%s půjde na HLAVNÍCH
-YouWillSpend=You will spend %s in year %s
 ListLoanAssociatedProject=List of loan associated with the project
 AddLoan=vytvoření úvěru
+FinancialCommitment=Financial commitment
+InterestAmount=Zájem
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=Konfigurace modulu úvěru
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-FinancialCommitment=Financial commitment
 CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/langs/cs_CZ/mails.lang b/htdocs/langs/cs_CZ/mails.lang
index 40b7115edba..d38d7e7f1dc 100644
--- a/htdocs/langs/cs_CZ/mails.lang
+++ b/htdocs/langs/cs_CZ/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Odesílatel
 MailErrorsTo=Chyby
 MailReply=Odpovědět
 MailTo=Příjemce(i)
+MailToUsers=To user(s)
 MailCC=Kopírovat do
+MailToCCUsers=Copy to users(s)
 MailCCC=Cache kopie
 MailTopic=Předmět
 MailText=Zpráva
@@ -164,4 +166,4 @@ InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Informace
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/cs_CZ/main.lang b/htdocs/langs/cs_CZ/main.lang
index d3d91dbab61..878e439f225 100644
--- a/htdocs/langs/cs_CZ/main.lang
+++ b/htdocs/langs/cs_CZ/main.lang
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Režim ověřování Dolibarr je n
 Administrator=Správce
 Undefined=Nedefinováno
 PasswordForgotten=Zapomněli jste heslo?
+NoAccount=No account?
 SeeAbove=Viz výše
 HomeArea=Hlavní oblast
 LastConnexion=poslední připojení
@@ -231,7 +232,7 @@ Limit=Omezení
 Limits=Limity
 Logout=Odhlášení
 NoLogoutProcessWithAuthMode=Žádná aplikovaná odpojená funkce s režimem ověřování <b>%s</b>
-Connection=Spojení
+Connection=Přihlášení
 Setup=Nastavení
 Alert=Upozornění
 MenuWarnings=Upozornění
@@ -402,6 +403,7 @@ DefaultTaxRate=Default tax rate
 Average=Průměr
 Sum=Součet
 Delta=Delta
+RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Volba
@@ -414,7 +416,7 @@ Favorite=Favorit
 ShortInfo=Info.
 Ref=Ref.
 ExternalRef=Ref. externí
-RefSupplier=Ref. dodavatel
+RefSupplier=Ref. vendor
 RefPayment=Ref. platba
 CommercialProposalsShort=Komerční návrhy
 Comment=Komentář
@@ -493,7 +495,7 @@ Received=Přijaté
 Paid=Placený
 Topic=Předmět
 ByCompanies=Třetími stranami
-ByUsers=Od uživatelů
+ByUsers=By user
 Links=Odkazy
 Link=Odkaz
 Rejects=Odmítnuto
@@ -619,9 +621,9 @@ BuildDoc=Vytvořit dokument
 Entity=Prostředí
 Entities=Subjekty
 CustomerPreview=Náhled zákazníka
-SupplierPreview=Náhled dodavatele
+SupplierPreview=Vendor preview
 ShowCustomerPreview=Zobrazit náhled zákazníka
-ShowSupplierPreview=Zobrazit náhled dodavatele
+ShowSupplierPreview=Show vendor preview
 RefCustomer=Ref. zákazník
 Currency=Měna
 InfoAdmin=Informace pro správce
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=Produkty nebo služby
 SearchIntoProjects=Projekty
 SearchIntoTasks=Úkoly
 SearchIntoCustomerInvoices=faktury zákazníků
-SearchIntoSupplierInvoices=Dodavatelské faktury
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Objednávky zákazníků
-SearchIntoSupplierOrders=Dodavatel objednávky
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=návrhy zákazníků
-SearchIntoSupplierProposals=Návrhy dodavatele
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Intervence
 SearchIntoContracts=Smlouvy
 SearchIntoCustomerShipments=zásilky zákazník
@@ -941,3 +943,5 @@ Remote=Remote
 LocalAndRemote=Local and Remote
 KeyboardShortcut=Keyboard shortcut
 AssignedTo=Přiřazeno
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/cs_CZ/margins.lang b/htdocs/langs/cs_CZ/margins.lang
index 4b1df89dc86..5e183d746a9 100644
--- a/htdocs/langs/cs_CZ/margins.lang
+++ b/htdocs/langs/cs_CZ/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=Jako služba
 UseDiscountOnTotal=Na mezisoučet
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Definuje, zda globální sleva je považován za výrobek, službu, nebo pouze za mezisoučet pro výpočet marže.
 MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best supplier price
+MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Náklady
 UnitCharges=Jednotkové poplatky
 Charges=Poplatky
diff --git a/htdocs/langs/cs_CZ/members.lang b/htdocs/langs/cs_CZ/members.lang
index a11c48dc9f5..2f3abe65b1f 100644
--- a/htdocs/langs/cs_CZ/members.lang
+++ b/htdocs/langs/cs_CZ/members.lang
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
diff --git a/htdocs/langs/cs_CZ/opensurvey.lang b/htdocs/langs/cs_CZ/opensurvey.lang
index 1441a72d738..86abe8c6b00 100644
--- a/htdocs/langs/cs_CZ/opensurvey.lang
+++ b/htdocs/langs/cs_CZ/opensurvey.lang
@@ -58,3 +58,4 @@ MoreChoices=Zadejte více možností pro hlasující
 SurveyExpiredInfo=Doba hlasování pro tuto anketu vypršela.
 EmailSomeoneVoted=%s vyplnilo řádek.\nMůžete si najít své hlasování v odkazu: \n%s
 ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/cs_CZ/orders.lang b/htdocs/langs/cs_CZ/orders.lang
index 1c09a81eb30..e94842fe845 100644
--- a/htdocs/langs/cs_CZ/orders.lang
+++ b/htdocs/langs/cs_CZ/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Oblast objednávek zákazníků
-SuppliersOrdersArea=Oblast objednávek dodavatelů
+SuppliersOrdersArea=Purchase orders area
 OrderCard=Karta objednávky
 OrderId=ID objednávky
 Order=Objednávka
@@ -13,18 +13,18 @@ OrderToProcess=Objednávka ve zpracování
 NewOrder=Nová objednávka
 ToOrder=Udělat objednávku
 MakeOrder=Udělat objednávku
-SupplierOrder=Dodavatelská objednávka
-SuppliersOrders=Dodavatelské objednávky
-SuppliersOrdersRunning=Aktuální dodavatelské objednávky
-CustomerOrder=Zákaznická objednávka
-CustomersOrders=Objednávky zákazníků
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=Objednávka zákazníka
+CustomersOrders=Zákaznických objednávek
 CustomersOrdersRunning=Aktuální objednávky zákazníků
 CustomersOrdersAndOrdersLines=Objednávky zákazníků a řádky objednávky
 OrdersDeliveredToBill=objednávky zákazníků dodávány na účet
 OrdersToBill=Objednávky zákazníků dodávány
 OrdersInProcess=Probíhající zákaznické objednávka
 OrdersToProcess=Zákaznické objednávky ke zpracování
-SuppliersOrdersToProcess=Dodavatelské objednávky ke zpracování
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=Zrušený
 StatusOrderDraftShort=Návrh
 StatusOrderValidatedShort=Ověřené
@@ -75,15 +75,15 @@ ShowOrder=Zobrazit objednávku
 OrdersOpened=Objednávky ve zpracování
 NoDraftOrders=Žádné návrhy objednávky
 NoOrder=Žádná objednávka
-NoSupplierOrder=Žádný dodavatel objednávka
+NoSupplierOrder=No purchase order
 LastOrders=Poslední objednávky %s zákazníků
 LastCustomerOrders=Poslední objednávky %s zákazníků
-LastSupplierOrders=Poslední %s dodavatelské objednávky
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=Poslední %s modifikované objednávky
 AllOrders=Všechny objednávky
 NbOfOrders=Počet objednávek
 OrdersStatistics=Statistiky objednávek
-OrdersStatisticsSuppliers=Statistiky dodavatelských objednávek
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Počet objednávek měsíčně
 AmountOfOrdersByMonthHT=Množství objednávek měsíčně (bez daně)
 ListOfOrders=Seznam objednávek
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Jste si jisti, že chcete potvrdit tuto objednávku na <b>%s?</
 GenerateBill=Vytvořit fakturu
 ClassifyShipped=Klasifikovat jako dodáno
 DraftOrders=Návrh objednávky
-DraftSuppliersOrders=Návrhy dodavatelé objednávky
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=Objednávka v procesu
 RefOrder=Ref. objednávka
 RefCustomerOrder=Ref. Objednat pro zákazníka
-RefOrderSupplier=Ref. Aby dodavatele
-RefOrderSupplierShort=Ref. dodavatel objednávka
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=Objednávku zašlete mailem
 ActionsOnOrder=Události objednávek
 NoArticleOfTypeProduct=Žádný článek typu 'produkt', takže není dopravován článek pro tuto objednávku
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Jste si jisti, že chcete klonovat tento příkaz <b> %s </ b>
 DispatchSupplierOrder=Příjem %s dodavatelských objednávek
 FirstApprovalAlreadyDone=První schválení již učiněno
 SecondApprovalAlreadyDone=Druhý schválení již učinili
-SupplierOrderReceivedInDolibarr=Dodavatel pořadí %s obdržel %s
-SupplierOrderSubmitedInDolibarr=Dodavatel pořadí %s odeslán
-SupplierOrderClassifiedBilled=Dodavatel pořadí %s set účtoval
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Ostatní objednávky
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Zástupce následující-up, zákaznické objednávky
@@ -125,11 +125,11 @@ TypeContact_commande_internal_SHIPPING=Zástupce následující-up dopravy
 TypeContact_commande_external_BILLING=Kontakt na zákaznické faktuře
 TypeContact_commande_external_SHIPPING=Kontakt zákazníka pro dopravu
 TypeContact_commande_external_CUSTOMER=Kontakt zákazníka následující-up objednávka
-TypeContact_order_supplier_internal_SALESREPFOLL=Zástupce následující-up, dodavatelská objednávka
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Zástupce následující-up doprava
-TypeContact_order_supplier_external_BILLING=Fakturační kontakt dodavaele
-TypeContact_order_supplier_external_SHIPPING=Dodací kontakt dodavatele
-TypeContact_order_supplier_external_CUSTOMER=Dodavatelský kontakt následující-up objednávky
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Konstanta COMMANDE_SUPPLIER_ADDON není definována
 Error_COMMANDE_ADDON_NotDefined=Konstanta COMMANDE_ADDON není definována
 Error_OrderNotChecked=Žádné objednávky do faktury nebyly vybrané
diff --git a/htdocs/langs/cs_CZ/other.lang b/htdocs/langs/cs_CZ/other.lang
index 11798dbf39b..ed2564d6c8f 100644
--- a/htdocs/langs/cs_CZ/other.lang
+++ b/htdocs/langs/cs_CZ/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=Soubor je příliš velký
 PleaseBePatient=Prosím o chvilku strpení ... dřu jako kůň ....
 NewPassword=New password
 ResetPassword=Reset password
-RequestToResetPasswordReceived=Požadavek na změnu vašeho hesla do Dolibarru byl přijat
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=To je vaše nové heslo k přihlášení
 NewKeyWillBe=Vaše nové heslo pro přihlášení do softwaru bude
 ClickHereToGoTo=Klikněte zde pro přechod na %s
@@ -233,6 +233,8 @@ PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=Exportní plocha
 AvailableFormats=Dostupné formáty
diff --git a/htdocs/langs/cs_CZ/productbatch.lang b/htdocs/langs/cs_CZ/productbatch.lang
index ca01076cee2..c4df0ba8c4b 100644
--- a/htdocs/langs/cs_CZ/productbatch.lang
+++ b/htdocs/langs/cs_CZ/productbatch.lang
@@ -16,7 +16,7 @@ printEatby=Spotřeba: %s
 printSellby=Prodej: %s
 printQty=Qty: %d
 AddDispatchBatchLine=Přidat řádek pro dispečink  skladovatelnosti
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic increase/decrease stock mode is forced to shipping validate and manual dispatching for reception and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=Tento produkt nepoužívá šarže/sériové číslo
 ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
diff --git a/htdocs/langs/cs_CZ/products.lang b/htdocs/langs/cs_CZ/products.lang
index 94b3fd5c8df..ca054b79b05 100644
--- a/htdocs/langs/cs_CZ/products.lang
+++ b/htdocs/langs/cs_CZ/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Prodat množství
 PurchasedAmount=Zakoupená částka
 NewPrice=Nová cena
 MinPrice=Min. prodejní cena
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=Prodejní cena nesmí být nižší než minimální povolená pro tento produkt (%s bez daně). Toto hlášení se může také zobrazí, pokud zadáte příliš důležitou slevu.
 ContractStatusClosed=Zavřeno
 ErrorProductAlreadyExists=Výrobek s referenčním %s již existuje.
@@ -155,7 +156,7 @@ BuyingPrices=Nákupní ceny
 CustomerPrices=Zákaznické ceny
 SuppliersPrices=Dodavatelské ceny
 SuppliersPricesOfProductsOrServices=Dodavatelské ceny (výrobků či služeb)
-CustomCode=Customs/Commodity/HS code
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=Země původu
 Nature=Příroda
 ShortLabel=Krátký štítek
diff --git a/htdocs/langs/cs_CZ/projects.lang b/htdocs/langs/cs_CZ/projects.lang
index a59077e5ff2..e5d06e2bc7b 100644
--- a/htdocs/langs/cs_CZ/projects.lang
+++ b/htdocs/langs/cs_CZ/projects.lang
@@ -77,6 +77,7 @@ Time=Čas
 ListOfTasks=Seznam úkolů
 GoToListOfTimeConsumed=Přejít na seznam času spotřebovaného
 GoToListOfTasks=Přejít na seznam úkolů
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=Seznam obchodních návrhů spojených s projektem
 ListOrdersAssociatedProject=Seznam zákaznických objednávek související s projektem
@@ -226,4 +227,4 @@ AllowCommentOnProject=Allow user comments on projects
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/cs_CZ/stocks.lang b/htdocs/langs/cs_CZ/stocks.lang
index fdc77a4beab..9d49052648f 100644
--- a/htdocs/langs/cs_CZ/stocks.lang
+++ b/htdocs/langs/cs_CZ/stocks.lang
@@ -203,3 +203,4 @@ RegulateStock=Regulate Stock
 ListInventory=Seznam
 StockSupportServices=Stock management support services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/cs_CZ/stripe.lang b/htdocs/langs/cs_CZ/stripe.lang
index b7745aa5ba7..ba128bb8d31 100644
--- a/htdocs/langs/cs_CZ/stripe.lang
+++ b/htdocs/langs/cs_CZ/stripe.lang
@@ -58,8 +58,8 @@ NameOnCard=Name on card
 CardNumber=Card Number
 ExpiryDate=Expiry Date
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/cs_CZ/supplier_proposal.lang b/htdocs/langs/cs_CZ/supplier_proposal.lang
index 449835faa6a..7d793bea34c 100644
--- a/htdocs/langs/cs_CZ/supplier_proposal.lang
+++ b/htdocs/langs/cs_CZ/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Komerční návrhy dodavatele
-supplier_proposalDESC=Správa žádostí o ceny k dodavatelům
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
 SupplierProposalNew=Nový cenový poožadavek
 CommRequest=Cenový požadavek
 CommRequests=Cenové požadavky
 SearchRequest=Najít požadavek
 DraftRequests=Návrhy žádosti
-SupplierProposalsDraft=Koncept návrhu dodavatele
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=Poslední %s modifikované cenové požadavky
 RequestsOpened=Otevřené cenové požadavky
-SupplierProposalArea=Oblast návrhů dodavatele
-SupplierProposalShort=Návrh dodavatele
-SupplierProposals=Návrhy dodavatele
-SupplierProposalsShort=Návrhy dodavatele
+SupplierProposalArea=Vendor proposals area
+SupplierProposalShort=Vendor proposal
+SupplierProposals=Vendor proposals
+SupplierProposalsShort=Vendor proposals
 NewAskPrice=Nový cenový poožadavek
 ShowSupplierProposal=Zobrazit cenový požadavek
 AddSupplierProposal=Vytvoření cenového požadavku
-SupplierProposalRefFourn=dodavatel ref
+SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=Termín dodání
 SupplierProposalRefFournNotice=Před uzavřením se „Akceptovaným“, myslí, že pochopil dodavatele reference.
 ConfirmValidateAsk=Jste si jisti, že chcete ověřit tento cenový požadavek pod jménem <b> %s </ b>?
@@ -47,9 +47,9 @@ 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)
 DefaultModelSupplierProposalClosed=Výchozí šablona při zavírání cenového požadavku (zamítnuto)
-ListOfSupplierProposals=Seznam dodavatelských žádostí o návrh
-ListSupplierProposalsAssociatedProject=Seznamy dodavatelských návrhů spojené s projektem
-SupplierProposalsToClose=Uzavřený návrh dodavatele
-SupplierProposalsToProcess=Návrh dodavatele ve zpracování
+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=Poslední žádosti %s cena
 AllPriceRequests=Všechny žádosti
diff --git a/htdocs/langs/cs_CZ/suppliers.lang b/htdocs/langs/cs_CZ/suppliers.lang
index 96f08d89e40..37ac3549c00 100644
--- a/htdocs/langs/cs_CZ/suppliers.lang
+++ b/htdocs/langs/cs_CZ/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Dodavatelé
-SuppliersInvoice=Faktura dodavatele
-ShowSupplierInvoice=Show Supplier Invoice
-NewSupplier=Nový dodavatel
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=Historie
-ListOfSuppliers=Seznam dodavatelů
-ShowSupplier=Zobrazit dodavatele
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=Datum objednávky
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Některé vedlejší produkty nemají stanovené žádné ceny
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
-SupplierPrices=Dodavatelské ceny
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Tato referenční dodavatel je již spojeno s odkazem: %s
-NoRecordedSuppliers=Žádní zaznamenaní dodavatelé
-SupplierPayment=Platba dodavatele
-SuppliersArea=Oblast dodavatelů
-RefSupplierShort=Ref. dodavatel
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=Dostupnost
-ExportDataset_fournisseur_1=Výpis dodavatelských faktur a seznam řádků
-ExportDataset_fournisseur_2=Dodavatel faktury a platby
-ExportDataset_fournisseur_3=Dodavatel objednávky a řádky objednávek
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=Schválit tuto objednávku
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Zakázat tuto objednávku
 ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
 ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
-AddSupplierOrder=Vytvoření objednávky dodavatele
-AddSupplierInvoice=Vytvoření dodavatelské faktury
-ListOfSupplierProductForSupplier=Seznam výrobků a cen pro dodavatele <b>%s</b>
-SentToSuppliers=Odeslané dodavatelům
-ListOfSupplierOrders=Seznam dodavatelských objednávek
-MenuOrdersSupplierToBill=Fakturované zakázky dodavatele
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Zpoždění dodávky  ve dnech
 DescNbDaysToDelivery=Největší zpoždění dodávek z produktů z této objednávky
-SupplierReputation=Supplier reputation
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
 AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=Dodavatelské ceny
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/cs_CZ/website.lang b/htdocs/langs/cs_CZ/website.lang
index 91c08b82723..d5b6d19be42 100644
--- a/htdocs/langs/cs_CZ/website.lang
+++ b/htdocs/langs/cs_CZ/website.lang
@@ -73,7 +73,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
diff --git a/htdocs/langs/cs_CZ/workflow.lang b/htdocs/langs/cs_CZ/workflow.lang
index 0d7c6ae755a..efd2eed1d14 100644
--- a/htdocs/langs/cs_CZ/workflow.lang
+++ b/htdocs/langs/cs_CZ/workflow.lang
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source custome
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=Automatická tvorba
 AutomaticClassification=Automatická klasifikace
diff --git a/htdocs/langs/da_DK/accountancy.lang b/htdocs/langs/da_DK/accountancy.lang
index 5c180fa544b..48075c0476c 100644
--- a/htdocs/langs/da_DK/accountancy.lang
+++ b/htdocs/langs/da_DK/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Regnskab
 ACCOUNTING_EXPORT_SEPARATORCSV=Kolonneseparator for eksportfil
 ACCOUNTING_EXPORT_DATE=Datoformat for eksportfil
 ACCOUNTING_EXPORT_PIECE=Export the number of piece
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Konti med ikke-nul-værdier
 ListOfAccounts=Liste over konti
 
 MainAccountForCustomersNotDefined=Standardkonto for kunder, der ikke er defineret i opsætningen
-MainAccountForSuppliersNotDefined=Standardkonto for leverandører, der ikke er defineret i opsætningen
+MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
 MainAccountForUsersNotDefined=Standardkonto for brugere, der ikke er defineret i opsætningen
 MainAccountForVatPaymentNotDefined=Standardkonto for momsbetaling ikke defineret i opsætningen
 
-AccountancyArea=Regnskab
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Brugen af regnskabsmodulet sker i følgende trin:
 AccountancyAreaDescActionOnce=Følgende handlinger udføres normalt kun én gang eller en gang om året ...
 AccountancyAreaDescActionOnceBis=Næste skridt skal gøres for at spare tid i fremtiden, så den korrekte standardregnskabskonto foreslås, når du bogfører (skrivning i kladder og hovedbog)
@@ -89,7 +90,7 @@ MenuProductsAccounts=Varekonti
 ProductsBinding=Varekonti
 Ventilation=Bind til konto
 CustomersVentilation=Bind kundefaktura
-SuppliersVentilation=Bind leverandørfaktura
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Bind udgiftsrapport
 CreateMvts=Opret ny transaktion
 UpdateMvts=Rediger en transaktion
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=Indkøbskladde
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Diversekladde
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Udgiftskladde
 ACCOUNTING_SOCIAL_JOURNAL=Kladde for skat/afgift
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Regnskabskonto for overførsel
 ACCOUNTING_ACCOUNT_SUSPENSE=Regnskabskonto for afventning
@@ -185,11 +187,12 @@ ListeMvts=Liste over bevægelser
 ErrorDebitCredit=Debet og kredit kan ikke have en værdi på samme tid
 AddCompteFromBK=Tilføj regnskabskonto til gruppen
 ReportThirdParty=Liste over tredjepartskonto
-DescThirdPartyReport=Her findes listen over tredjepartskunder, leverandører og deres regnskabskonti
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=Liste over regnskabskonti
 UnknownAccountForThirdparty=Ukendt tredjepartskonto. Vi vil bruge %s
 UnknownAccountForThirdpartyBlocking=Ukendt tredjepartskonto. Blokerende fejl
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Ukendt tredjepartskonto og ventekonto ikke defineret. Blokeringsfejl
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Kontoens gruppe
 Pcgsubtype=Kontoens undergruppe
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Her findes list over fakturalinjer bundet til kunder og d
 DescVentilTodoCustomer=Bind fakturaer, der ikke allerede er bundet til en varekonto
 ChangeAccount=Skift regnskabskonto for vare/ydelse for valgte linjer med følgende regnskabskonto:
 Vide=-
-DescVentilSupplier=Her findes listen over leverandørfakturalinjer, der er bundet eller endnu ikke bundet til en varekonto
-DescVentilDoneSupplier=Gå til en liste over de linjer af fakturaer leverandør og deres regnskabskonto
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Bind udgiftsrapportlinjer, der ikke allerede er bundet, til en gebyrkonto
 DescVentilExpenseReport=Her vises listen over udgiftsrapporter linjer bundet (eller ej) til en gebyrkonto
 DescVentilExpenseReportMore=Hvis du angiver en regnskabskonto for typen af linjer i udgiftsrapporter, kan systemet udføre bindingen mellem linjerne i din udgiftsrapport og kontoen fra kontoplanen med bare et enkelt klik på knappen <strong>"%s"</strong>. Hvis en linje ikke kunne tilknyttes en konto automatisk, bliver du nødt til at binde manuelt fra menuen "<strong>%s</strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Bind automatisk
 AutomaticBindingDone=Automatisk bundet
 
 ErrorAccountancyCodeIsAlreadyUse=Fejl. Du kan ikke slette denne regnskabskonto, fordi den er i brug
-MvtNotCorrectlyBalanced=Bevægelsen er ikke korrekt afstemt. Kredit = %s. Debet = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Oversigt over bindinger
 GeneralLedgerIsWritten=Transaktionerne er blevet bogført
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -293,4 +296,9 @@ Binded=Bundne linjer
 ToBind=Ubundne linjer
 UseMenuToSetBindindManualy=Auto detektion ikke muligt, brug menuen <a href="%s"> %s </a> for at gøre bogføringen manuelt
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Advarsel, denne rapport er ikke baseret på hovedbogen, så den indeholder ikke transaktioner der er ændret manuelt i hovedbogen. Hvis din kladde er opdateret, bliver bogføringsoversigten mere retvisende.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index baa01b78c96..3b05ea363c9 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=SMTP Host (Som standard i <b>php.ini: %s)</b>
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP Port (Ikke defineret i PHP på Unix-lignende systemer)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP Host (Ikke defineret i PHP på Unix-lignende systemer)
 MAIN_MAIL_EMAIL_FROM=Afsenders e-mail for automatisk e-mails (Som standard i php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=E-mail bruges som "Fejl-Til" - feltet i e-mails sendt
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= Send systematisk en skjult carbon-kopi af alle sendte e-mails til
 MAIN_DISABLE_ALL_MAILS=Deaktiver alle de e-mails sendings (til testformål eller demoer)
 MAIN_MAIL_FORCE_SENDTO=Sende alle e-mails til (i stedet for rigtige modtagere, til testformål)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=Metode til at bruge til at sende e-mails
 MAIN_MAIL_SMTPS_ID=SMTP ID hvis påkrævet
 MAIN_MAIL_SMTPS_PW=SMTP Password hvis påkrævet
@@ -291,7 +292,7 @@ ModuleSetup=Modul setup
 ModulesSetup=Moduler / Applikation sætop
 ModuleFamilyBase=System
 ModuleFamilyCrm=Kunderelationsstyring (CRM)
-ModuleFamilySrm=Leverandørrelationsstyring (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Varestyring (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projekter / samarbejde
@@ -373,7 +374,8 @@ NoSmsEngine=Ingen SMS-afsender leder til rådighed. SMS-afsender leder ikke er i
 PDF=PDF
 PDFDesc=Du kan indstille hvert globale muligheder i forbindelse med PDF-generation
 PDFAddressForging=Regler, Forge Adresse kasser
-HideAnyVATInformationOnPDF=Skjul alle oplysninger vedrørende moms på genererede PDF
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Regler for %s
 HideLocalTaxOnPDF=Skjul %s sats i pdf kolonne skat salg
 HideDescOnPDF=Skjul varebeskrivelse på genereret PDF
@@ -445,7 +447,8 @@ DisplayCompanyInfo=Vis firmaadresse
 DisplayCompanyManagers=Vis administrationsnavne
 DisplayCompanyInfoAndManagers=Vis firmaadresse og ledelsens navne
 EnableAndSetupModuleCron=Hvis du vil have denne tilbagevendende faktura, der genereres automatisk, skal modul * %s * være aktiveret og korrekt opsat. Ellers skal generering af fakturaer udføres manuelt fra denne skabelon med knappen * Opret *. Bemærk, at selvom du aktiverede automatisk generation, kan du stadig sikkert starte den manuelle generation. Duplikater generation i samme periode er ikke mulig.
-ModuleCompanyCodeAquarium=Returner en regnskabskode sammensat af: <br> %s efterfulgt af tredjepartskoden for en leverandør, <br> %s efterfulgt af en tredjepartskode for en kunde.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Returner en tom regnskabskode.
 ModuleCompanyCodeDigitaria=Regnskabskode afhænger tredjepartskode. Koden er sammensat af tegnet "C" som første tegn efterfulgt af de første 5 bogstaver af tredjepartskoden.
 Use3StepsApproval=Som standard skal indkøbsordrer oprettes og godkendes af 2 forskellige brugere (et trin / bruger til oprettelse og et trin / bruger at godkende. Bemærk at hvis brugeren har begge tilladelser til at oprette og godkende, er et trin / bruger tilstrækkeligt) . Du kan spørge med denne mulighed for at indføre et tredje trin / brugergodkendelse, hvis mængden er højere end en dedikeret værdi (så 3 trin vil være nødvendige: 1 = validering, 2 = første godkendelse og 3 = anden godkendelse, hvis mængden er tilstrækkelig). <br> Indstil dette til tomt, hvis en godkendelse (2 trin) er tilstrækkelig, angiv den til en meget lav værdi (0,1), hvis der kræves en anden godkendelse (3 trin).
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Sæt den til 1 hvis du ønsker at vedhæfte hoveddokument
 FilesAttachedToEmail=Vedhængt fil
 SendEmailsReminders=Send dagsorden påmindelser via e-mails
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=Brugere og grupper
 Module0Desc=Brugere / Medarbejdere og Grupper management
@@ -479,7 +485,7 @@ Module1Desc=Virksomheder og kontakter "forvaltning
 Module2Name=Tilbud
 Module2Desc=Tilbudshåndtering
 Module10Name=Regnskab
-Module10Desc=Simpelt regnskabssystem (kladder, omsætning) baseret på indholdet af databasen. Ingen forsendelse.
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=Tilbud
 Module20Desc=Tilbudshåndtering
 Module22Name=E-mails
@@ -546,8 +552,8 @@ Module400Name=Projekter/Muligheder/Kundeemner
 Module400Desc=Ledelse af projekter, muligheder/kundeemner og/eller opgaver. Du kan også tildele et element (faktura, ordre, forslag, intervention, ...) til et projekt og få et tværgående udsigt fra projektet udsigt.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
-Module500Name=Særlige udgifter
-Module500Desc=Håndtering af særlige udgifter (skatter/afgifter, dividender)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Betaling af medarbejderløn
 Module510Desc=Optag og følg betalingen af ​​dine medarbejderlønninger
 Module520Name=Loan
@@ -561,14 +567,14 @@ Module700Name=Donationer
 Module700Desc=Gaver 'ledelse
 Module770Name=Udgiftsrapporter
 Module770Desc=Forvaltning og krav om udgiftsrapporter (transport, måltid, ...)
-Module1120Name=Leverandørens kommercielle forslag
-Module1120Desc=Anmod om leverandørens kommercielle forslag og priser
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Mantis integration
 Module1520Name=Dokumentgenerering
 Module1520Desc=Massemail dokumentgenerering
 Module1780Name=Tags/Categories
-Module1780Desc=Opret tags/kategori (varer, kunder, leverandører, kontakter eller medlemmer)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=FCKeditor
 Module2000Desc=Giver mulighed for at redigere nogle tekst-området ved hjælp af en avanceret editor (Baseret på CKEditor)
 Module2200Name=Dynamiske Priser
@@ -576,7 +582,7 @@ Module2200Desc=Aktivér brugen af ​​matematiske udtryk til priser
 Module2300Name=Scheduled jobs
 Module2300Desc=Planlagte job management (alias cron eller chrono tabel)
 Module2400Name=Begivenheder/tidsplan
-Module2400Desc=Følg, afsluttet og kommende arrangementer. Lad program logger automatisk arrangementer for sporing eller optage manuel begivenheder eller mødesteder.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Dokument Management System / Esdh. Automatisk organisering af dit genereret eller lagrede dokumenter. Dele dem, når du har brug for.
 Module2600Name=API/webservices (SOAP-server)
@@ -613,7 +619,7 @@ Module50100Desc=Kasseapparats modul (POS)
 Module50200Name=Paypal
 Module50200Desc=Modul til at tilbyde en online-betalings side til at acceptere betalinger via PayPal (kreditkort-eller PayPal-kredit). Dette kan bruges til at give dine kunder en mulighed for at foretage betalinger eller til betaling på en særlig Dolibarr objekt (faktura, ordre, ...)
 Module50400Name=Regnskab (avanceret)
-Module50400Desc=Regnskabssystem (bogholderi, understøtter kladder og bogføring)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=PrintIPP
 Module54000Desc=Direkte udskrivning (uden at åbne dokumenterne) ved hjælp af IPP-konnektorens kopper (Printeren skal være synlig fra serveren, og CUPS skal installeres på serveren).
 Module55000Name=Afstemning, Undersøgelse eller Afstemning
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance forsinkelse (i dag), inden indberetning om f
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance forsinkelse (i dage) før alarm for checks depositum til at gøre
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance forsinkelse (i dage) før advarsel for udgiftsrapporter at godkende
 SetupDescription1=Opsætningsmenuen bruges, før du går i gang med Dolibarr.
-SetupDescription2=De to obligatoriske opsætningsstrin er de første to i opsætningsmenuen til venstre: %s opsætningsside og %s installationsside:
-SetupDescription3=Parametre i menuen <a href="%s"> %s -> %s </a> er påkrævet, fordi de definerede data bruges generelt af Dolibarr og til at tilpasse standardopførslen af softwaren (f.eks. landerelaterede funktioner).
-SetupDescription4=Parametre i menuen <a href="%s"> %s -> %s </a> er påkrævet, fordi Dolibarr ERP/CRM er en samling af flere moduler/applikationer, alle mere eller mindre uafhængige. Nye funktioner vil blive tilføjet til menuer for hvert modul, du aktiverer.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=Andre menupunkter styrer valgfrie parametre.
 LogEvents=Sikkerhed revision arrangementer
 Audit=Audit
@@ -1054,8 +1060,9 @@ LogEventDesc=Du kan gøre det muligt at logge for Dolibarr sikkerhed begivenhede
 AreaForAdminOnly=Opsætningsparametre kan kun indstilles af <b> administratorbrugere </ b>.
 SystemInfoDesc=System oplysninger er diverse tekniske oplysninger du får i read only mode og synlig kun for administratorer.
 SystemAreaForAdminOnly=Dette område er til rådighed for administratoren brugere. Ingen af de Dolibarr permissions kan reducere denne grænse.
-CompanyFundationDesc=Rediger på denne side alle kendte oplysninger om det firma eller fundament, du skal administrere (For dette klikker du på "Rediger" eller "Gem" knappen nederst på siden)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=Du kan vælge hver parameter i forbindelse med Dolibarr udseende og stemning her
 AvailableModules=Tilgængelige app / moduler
 ToActivateModule=For at  aktivere moduler, skal du gå til Opsætning (Hjem->Opsætning->Moduler).
@@ -1188,11 +1195,11 @@ UserMailRequired=EMail forpligtet til at oprette en ny bruger
 HRMSetup=HRM modul opsætning
 ##### Company setup #####
 CompanySetup=Selskaber modul opsætning
-CompanyCodeChecker=Modul for tredjemand code generation og kontrol (kunde eller leverandør)
-AccountCodeManager=Modul til kodegenerering for regnskab (kunde eller leverandør)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=E-mail-meddelelsesfunktionen giver dig mulighed for lydløst at sende automatisk mail til nogle Dolibarr-arrangementer. Mål for meddelelser kan defineres:
 NotificationsDescUser=* pr. bruger, en bruger til tiden.
-NotificationsDescContact=* pr. tredjeparts kontakter (kunder eller leverandører), en kontakt til tiden.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* eller ved at indstille globale målemails i modulopsætningssiden.
 ModelModules=Dokumenter skabeloner
 DocumentModelOdt=Generer dokumenter fra OpenDocuments skabeloner (.ODT eller .ODS filer til OpenOffice, KOffice, TextEdit, ...)
@@ -1203,6 +1210,9 @@ MustBeUnique=Skal være unikt?
 MustBeMandatory=Obligatorisk at oprette tredjeparter?
 MustBeInvoiceMandatory=Obligatorisk at validere fakturaer?
 TechnicalServicesProvided=Tekniske ydelser
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=En eksportgaranti link <b>til %s</b> format er tilgængelig på følgende link: %s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=Fri tekst på tilbud
 WatermarkOnDraftProposal=Vandmærke på udkast til tilbud (intet, hvis tom)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Anmode om en bankkonto destination for forslag
 ##### SupplierProposal #####
-SupplierProposalSetup=Prisanmodninger leverandørmodul opsætning
-SupplierProposalNumberingModules=Prisanmodninger leverandører nummerering modeller
-SupplierProposalPDFModules=Prisanmodninger leverandører dokumenter modeller
-FreeLegalTextOnSupplierProposal=Fri tekst på forespørgsler om prisforespørgsler
-WatermarkOnDraftSupplierProposal=Vandmærke på udkast pris anmodninger leverandører (ingen hvis tom)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Anmod om anmodning om bankkonto for prisanmodning
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Anmode om lagerkilde for ordre
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Anmod om en bankkonto destination for leverandør ordre
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=Ordrer «forvaltning setup
 OrdersNumberingModules=Ordrer nummerressourcer moduler
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=Forbindelse til server ' %s' på database' %s' med brugeren ' %
 OSCommerceTestKo1=Forbindelse til server ' %s' lykkes men database' %s' kunne ikke være nået.
 OSCommerceTestKo2=Forbindelse til server ' %s' med brugeren' %s' mislykkedes.
 ##### Stock #####
-StockSetup=Opsætning af lagermodul
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=Hvis du bruger et Point of Sale-modul (POS-modul, der leveres som standard eller et andet eksternt modul), kan denne opsætning ignoreres af dit Point of Sale-modul. Det meste af salgsmodulerne er designet til at skabe øjeblikkelig en faktura og reducere lager som standard, hvad der er muligheder her. Så hvis du har brug for eller ikke har et lagerfald, når du registrerer et salg fra dit Point of Sale, skal du også kontrollere dit POS-modul oprettet.
 ##### Menu #####
 MenuDeleted=Menu slettet
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Kontroller kvitterings nummereringsmodul
 MultiCompanySetup=Multi-selskab modul opsætning
 ##### Suppliers #####
 SuppliersSetup=Leverandør modul opsætning
-SuppliersCommandModel=Komplet template af leverandør orden (logo. ..)
-SuppliersInvoiceModel=Komplet template leverandør faktura (logo. ..)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Leverandør faktura nummerering modeller
 IfSetToYesDontForgetPermission=Hvis du er indstillet til ja, glem ikke at give tilladelser til grupper eller brugere tilladt til anden godkendelse
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=Brug ikke tvetydige tegn ("1", "l", "i", "|", "0", "O"
 SalariesSetup=Opsætning af lønnings modul
 SortOrder=Sorteringsrækkefølge
 Format=Format
-TypePaymentDesc=0: Kundebetalingstype, 1: Leverandørbetalingstype, 2: Både kunder og leverandører betalingstype
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Inkluder sti (defineret i variabel %s)
 ExpenseReportsSetup=Opsætning af modul Expense Reports
 TemplatePDFExpenseReports=Dokumentskabeloner til at generere regningsrapportdokument
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Installation af eksternt modul fra app
 ConfFileMustContainCustom=Installation eller opbygning af et eksternt modul fra applikationen skal gemme modulfilerne i mappen <strong> %s </strong>. Hvis du vil have denne mappe behandlet af Dolibarr, skal du konfigurere din <strong> conf / conf.php </strong> for at tilføje de to direktelinjer: <br> <strong> $ dolibarr_main_url_root_alt = '/ custom'; </strong> <br> <strong> $ dolibarr_main_document_root_alt = '%s /custom'; </strong>
 HighlightLinesOnMouseHover=Fremhæv tabel linjer, når musen flytter passerer over
 HighlightLinesColor=Fremhæv farve på linjen, når musen passerer over (hold tom for ingen fremhævning)
-TextTitleColor=Sideoverskriftets farve
+TextTitleColor=Text color of Page title
 LinkColor=Farve af links
 PressF5AfterChangingThis=Tryk på CTRL + F5 på tastaturet eller ryd din browserens cache efter at have ændret denne værdi for at få den effektiv
 NotSupportedByAllThemes=Vil arbejde med kerne temaer, kan ikke understøttes af eksterne temaer
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=Baggrundsfarve til topmenuen
 TopMenuDisableImages=Skjul billeder i topmenuen
 LeftMenuBackgroundColor=Baggrundsfarve til venstre menu
 BackgroundTableTitleColor=Baggrundsfarve til tabel titel linje
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Baggrundsfarve til ulige bord linjer
 BackgroundTableLineEvenColor=Baggrundsfarve til lige bordlinier
 MinimumNoticePeriod=Mindste opsigelsesperiode (din anmodning om orlov skal ske inden denne forsinkelse)
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=Eksempel: +2 (kun udfyld hvis der opstår problem)
 ExpectedChecksum=Forventet checksum
 CurrentChecksum=Nuværende checksum
 ForcedConstants=Påkrævede konstante værdier
-MailToSendProposal=At sende kundeforslag
-MailToSendOrder=For at sende kundeordre
-MailToSendInvoice=At sende kundefaktura
-MailToSendShipment=For at sende forsendelse
-MailToSendIntervention=At sende indgreb
-MailToSendSupplierRequestForQuotation=At sende tilbudsanmodning til leverandør
-MailToSendSupplierOrder=For at sende leverandørordre
-MailToSendSupplierInvoice=At sende leverandørfaktura
-MailToSendContract=At sende en kontrakt
-MailToThirdparty=At sende e-mail fra tredjepartsside
-MailToMember=For at sende e-mail fra medlemsstaternes side
-MailToUser=For at sende e-mail fra brugerens side
-MailToProject= To send email from project page
+MailToSendProposal=Customer proposals
+MailToSendOrder=Kundeordrer
+MailToSendInvoice=Kundefakturaer
+MailToSendShipment=Forsendelser
+MailToSendIntervention=Interventioner
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Kontrakter
+MailToThirdparty=Tredjepart
+MailToMember=Medlemmer
+MailToUser=Brugere
+MailToProject=Projects page
 ByDefaultInList=Vis som standard i listevisning
 YouUseLastStableVersion=Du bruger den seneste stabile version
 TitleExampleForMajorRelease=Eksempel på besked, du kan bruge til at annoncere denne store udgivelse (brug det gratis at bruge det på dine websteder)
@@ -1780,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=Bundmargen på PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Konfiguration du modul Ressource
 UseSearchToSelectResource=Brug en søgeformular til at vælge en ressource (i stedet for en rullemenu).
diff --git a/htdocs/langs/da_DK/bills.lang b/htdocs/langs/da_DK/bills.lang
index 7a6bc198e05..344ef461144 100644
--- a/htdocs/langs/da_DK/bills.lang
+++ b/htdocs/langs/da_DK/bills.lang
@@ -109,7 +109,7 @@ CancelBill=Annuller en faktura
 SendRemindByMail=Send påmindelse via e-mail
 DoPayment=Angiv betaling
 DoPaymentBack=Angiv tilbagebetaling
-ConvertToReduc=Konverter til fremtidig rabat
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Konverter overskud modtaget til fremtidig rabat
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Angive betaling modtaget fra kunden
@@ -120,7 +120,7 @@ BillStatus=Fakturastatus
 StatusOfGeneratedInvoices=Status for genererede fakturaer
 BillStatusDraft=Udkast (skal valideres)
 BillStatusPaid=Betalt
-BillStatusPaidBackOrConverted=Kreditnota refunderet eller konverteret til rabat
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Tabt
 BillStatusValidated=Godkendt (skal betales)
@@ -296,10 +296,10 @@ DiscountType=Discount type
 NoteReason=Bemærk / Grund
 ReasonDiscount=Årsag
 DiscountOfferedBy=Ydet af
-DiscountStillRemaining=Rabatter til rådighed
-DiscountAlreadyCounted=Rabatter allerede forbrugt
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+SupplierDiscounts=Vendors discounts
 BillAddress=Faktura adresse
 HelpEscompte=Denne rabat er en rabat, der ydes til kunden, fordi dens paiement blev foretaget før sigt.
 HelpAbandonBadCustomer=Dette beløb er blevet opgivet (kunde siges at være en dårlig kunde) og betragtes som en exceptionnal løs.
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Tillad betalinger på forskellige tredjeparts regni
 PaymentNote=Betalingsnota
 ListOfPreviousSituationInvoices=Liste over tidligere status fakturaer
 ListOfNextSituationInvoices=Liste over næste status fakturaer
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Hver %s dage
 FrequencyPer_m=Hver %s måneder
 FrequencyPer_y=Hver %s år
@@ -505,9 +511,14 @@ SituationAmount=Kontoudtog beløb (netto)
 SituationDeduction=Kontoudtog udtræk
 ModifyAllLines=Rediger alle linjer
 CreateNextSituationInvoice=Opret næste situation
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=Denne faktura er ikke den seneste i cyklus og må ikke ændres.
 DisabledBecauseNotLastInCycle=Den næste situation eksisterer allerede.
 DisabledBecauseFinal=Denne situation er endelig.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=S
 CantBeLessThanMinPercent=Værdien kan ikke være mindre end dets værdi i den foregående situation.
 NoSituations=Ingen åbne situationer
 InvoiceSituationLast=Endelig faktura
@@ -532,3 +543,4 @@ AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/da_DK/categories.lang b/htdocs/langs/da_DK/categories.lang
index 0f2ae50745f..4d52d7785a7 100644
--- a/htdocs/langs/da_DK/categories.lang
+++ b/htdocs/langs/da_DK/categories.lang
@@ -1,87 +1,88 @@
 # Dolibarr language file - Source file is en_US - categories
-Rubrique=Tag/Category
-Rubriques=Tags/Categories
-RubriquesTransactions=Tags/Categories of transactions
-categories=tags/categories
-NoCategoryYet=No tag/category of this type created
+Rubrique=Tag/Kategori
+Rubriques=Tags/Kategorier
+RubriquesTransactions=Tags/Kategorier af transaktioner
+categories=tags/kategorier
+NoCategoryYet=Ingen tag/Kategorier af denne type oprettet
 In=I
 AddIn=Tilføj i
 modify=rette
 Classify=Klassificere
-CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Products/Services tags/categories area
-SuppliersCategoriesArea=Suppliers tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-MembersCategoriesArea=Members tags/categories area
-ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Accounts tags/categories area
-ProjectsCategoriesArea=Projects tags/categories area
-SubCats=Underkategorier
-CatList=List of tags/categories
-NewCategory=New tag/category
+CategoriesArea=Tags/Kategorier område
+ProductsCategoriesArea=Produkter/Tjenester tags/kategorier område 
+SuppliersCategoriesArea=Leverandører tags/kategorier
+CustomersCategoriesArea=Kunder tags/kategorier
+MembersCategoriesArea=Medlemmer tags/kategorier
+ContactsCategoriesArea=Kontakter tags/kategorier område
+AccountsCategoriesArea=Konti tags/kategorier område
+ProjectsCategoriesArea=Projekter tags/kategorier område
+SubCats=Sub-categories
+CatList=Liste over tags/kategorier
+NewCategory=Nyt tag/kategori
 ModifCat=Rediger tag/kategori
-CatCreated=Tag/category created
-CreateCat=Create tag/category
-CreateThisCat=Create this tag/category
+CatCreated=Tag/kategori oprettet
+CreateCat=Opret tag/kategori
+CreateThisCat=Opret dette tag/kategori
 NoSubCat=Ingen underkategori.
 SubCatOf=Underkategori
-FoundCats=Found tags/categories
-ImpossibleAddCat=Impossible to add the tag/category %s
+FoundCats=Fandt tags/kategorier
+ImpossibleAddCat=Umuligt at tilføje tag/kategori %s
 WasAddedSuccessfully=<b> %s</b> blev tilføjet med succes.
-ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-ProductIsInCategories=Product/service is linked to following tags/categories
-CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
-MemberIsInCategories=This member is linked to following members tags/categories
-ContactIsInCategories=This contact is linked to following contacts tags/categories
-ProductHasNoCategory=This product/service is not in any tags/categories
-CompanyHasNoCategory=This third party is not in any tags/categories
-MemberHasNoCategory=This member is not in any tags/categories
-ContactHasNoCategory=This contact is not in any tags/categories
-ProjectHasNoCategory=This project is not in any tags/categories
-ClassifyInCategory=Add to tag/category
-NotCategorized=Without tag/category
+ObjectAlreadyLinkedToCategory=Element er allerede knyttet til denne tag/kategori.
+ProductIsInCategories=Produkt/service er knyttet til følgende tags/kategorier
+CompanyIsInCustomersCategories=Denne tredjepart er knyttet til følgende kunder/udsigter tags/kategorier
+CompanyIsInSuppliersCategories=Denne tredjepart er knyttet til følgende leverandører tags/kategorier
+MemberIsInCategories=Dette medlem er knyttet til følgende medlemmer tags/kategorier
+ContactIsInCategories=Denne kontakt er knyttet til følgende kontaktmærker/kategorier
+ProductHasNoCategory=Dette produkt/tjeneste er ikke i nogen tags/kategorier
+CompanyHasNoCategory=Denne tredjepart findes ikke i nogen tags/kategorier
+MemberHasNoCategory=Dette medlem er ikke i nogen tags/kategorier
+ContactHasNoCategory=Denne kontakt er ikke i nogen tags/kategorier
+ProjectHasNoCategory=Dette projekt er ikke indeholdt i nogen tags/kategorier
+ClassifyInCategory=Tilføj til tag/kategori
+NotCategorized=Uden tag/kategori
 CategoryExistsAtSameLevel=Denne kategori allerede findes på samme sted
 ContentsVisibleByAllShort=Indhold synlige fra alle
 ContentsNotVisibleByAllShort=Indholdet ikke er synligt fra alle
-DeleteCategory=Delete tag/category
-ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tag/category
-CustomersCategoryShort=Customers tag/category
+DeleteCategory=Slet tag/kategori
+ConfirmDeleteCategory=Er du sikker på, at du vil slette dette tag/kategori?
+NoCategoriesDefined=Ingen tag/kategori defineret
+SuppliersCategoryShort=Leverandør tag/kategori
+CustomersCategoryShort=Kunder tag/kategori
 ProductsCategoryShort=Tag/kategori for varer
-MembersCategoryShort=Members tag/category
-SuppliersCategoriesShort=Suppliers tags/categories
-CustomersCategoriesShort=Customers tags/categories
-ProspectsCategoriesShort=Prospects tags/categories
-CustomersProspectsCategoriesShort=Custo. / prosp. kategorier
+MembersCategoryShort=Medlemmer tag/kategori
+SuppliersCategoriesShort=Leverandører tags/kategorier
+CustomersCategoriesShort=Kunder mærker/kategorier
+ProspectsCategoriesShort=Udsigter tags/kategorier
+CustomersProspectsCategoriesShort=Custo./Prosp. Kategorier
 ProductsCategoriesShort=Tags/kategorier for varer
-MembersCategoriesShort=Members tags/categories
+MembersCategoriesShort=Medlemmer tags/kategorier
 ContactCategoriesShort=Contacts tags/categories
-AccountsCategoriesShort=Accounts tags/categories
-ProjectsCategoriesShort=Projects tags/categories
+AccountsCategoriesShort=Konti tags/kategorier
+ProjectsCategoriesShort=Projekter tags/kategorier
 ThisCategoryHasNoProduct=Denne kategori indeholder ingen vare.
 ThisCategoryHasNoSupplier=Denne kategori indeholder ingen leverandør.
 ThisCategoryHasNoCustomer=Denne kategori indeholder ingen kunde.
 ThisCategoryHasNoMember=Denne kategori indeholder ikke et medlem.
-ThisCategoryHasNoContact=This category does not contain any contact.
-ThisCategoryHasNoAccount=This category does not contain any account.
-ThisCategoryHasNoProject=This category does not contain any project.
-CategId=Tag/category id
-CatSupList=List of supplier tags/categories
-CatCusList=List of customer/prospect tags/categories
+ThisCategoryHasNoContact=Denne kategori indeholder ingen kontaktperson.
+ThisCategoryHasNoAccount=Denne kategori indeholder ingen konto.
+ThisCategoryHasNoProject=Denne kategori indeholder ikke noget projekt.
+CategId=Tag/kategori id
+CatSupList=Liste over leverandør tags/kategorier
+CatCusList=Liste over kunde/udsigter tags/kategorier
 CatProdList=Liste over tags/kategorier for varer
-CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories
-CatSupLinks=Links between suppliers and tags/categories
-CatCusLinks=Links between customers/prospects and tags/categories
+CatMemberList=Liste over medlemmer tags/kategorier
+CatContactList=Liste over kontaktmærker/kategorier
+CatSupLinks=Links mellem leverandører og tags/kategorier
+CatCusLinks=Links mellem kunder/udsigter og tags/kategorier
 CatProdLinks=Links mellem varer/ydelser og tags/kategorier
-CatProJectLinks=Links between projects and tags/categories
-DeleteFromCat=Remove from tags/category
-ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Tags/categories setup
-CategorieRecursiv=Link with parent tag/category automatically
-CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
-AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show tag/category
-ByDefaultInList=By default in list
+CatProJectLinks=Links mellem projekter og tags/kategorier
+DeleteFromCat=Fjern fra tags/kategori
+ExtraFieldsCategories=Supplerende attributter
+CategoriesSetup=Tags/kategorier opsætning
+CategorieRecursiv=Link med forældre tag/kategori automatisk
+CategorieRecursivHelp=Hvis aktiveret, vil produktet også være knyttet til hovedkategorien, når det tilføjes til en underkategori
+AddProductServiceIntoCategory=Tilføj følgende produkt/tjeneste
+ShowCategory=Vis tag/kategori
+ByDefaultInList=Som standard i liste
+ChooseCategory=Choose category
diff --git a/htdocs/langs/da_DK/commercial.lang b/htdocs/langs/da_DK/commercial.lang
index e36ad23f62b..2fa192efe4b 100644
--- a/htdocs/langs/da_DK/commercial.lang
+++ b/htdocs/langs/da_DK/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=Luk
 ActionAC_EMAILING=Send masse e-mail
 ActionAC_COM=Send kundeordre med posten
 ActionAC_SHIP=Send forsendelse med posten
-ActionAC_SUP_ORD=Send leverandørordre med posten
-ActionAC_SUP_INV=Send leverandørfaktura med posten
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=Andet
 ActionAC_OTH_AUTO=Automatisk oprettede begivenheder
 ActionAC_MANUAL=Manuelt oprettede begivenheder
@@ -71,9 +71,9 @@ Stats=Salgsstatistik
 StatusProsp=Status for emne
 DraftPropals=Udkast for tilbud
 NoLimit=Ingen grænse
-ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
-ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
-ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
-FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
+ToOfferALinkForOnlineSignature=Link til online signatur
+WelcomeOnOnlineSignaturePage=Velkommen på siden for at acceptere kommercielle forslag fra %s
+ThisScreenAllowsYouToSignDocFrom=Denne skærm giver dig mulighed for at acceptere og underskrive eller nægte et tilbud / kommercielt forslag
+ThisIsInformationOnDocumentToSign=Dette er oplysninger om dokumentet for at acceptere eller afvise
+SignatureProposalRef=Undertegnelse af tilbud / kommercielt forslag %s
+FeatureOnlineSignDisabled=Funktion til online-signering deaktiveret eller dokument genereret, før funktionen blev aktiveret
diff --git a/htdocs/langs/da_DK/companies.lang b/htdocs/langs/da_DK/companies.lang
index dcb9a4646f7..ac9afe1c37a 100644
--- a/htdocs/langs/da_DK/companies.lang
+++ b/htdocs/langs/da_DK/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Er du sikker på, at du vil slette denne kontakt og alle ar
 MenuNewThirdParty=Ny tredjepart
 MenuNewCustomer=Ny kunde
 MenuNewProspect=Nyt emne
-MenuNewSupplier=Ny leverandør
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=Ny privatperson
-NewCompany=Nyt firma (emne, kunde, leverandør)
-NewThirdParty=Ny tredjepart (emne, kunde, leverandør)
-CreateDolibarrThirdPartySupplier=Opret en trediepart (leverandør)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=Opret tredjepart
 CreateThirdPartyAndContact=Opret en tredjepart + en børnekontakt
 ProspectionArea=Prospektering område
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=Emner
 ThirdPartyCustomers=Kunder
 ThirdPartyCustomersStats=Kunder
 ThirdPartyCustomersWithIdProf12=Kunder med %s eller %s
-ThirdPartySuppliers=Leverandører
+ThirdPartySuppliers=Vendors
 ThirdPartyType=Tredjepart type
 Individual=Privatperson
 ToCreateContactWithSameName=Vil automatisk oprette en kontakt / adresse med samme oplysninger end tredjepart under tredjepart. I de fleste tilfælde er det nok, selvom din tredjepart er et fysisk menneske, at skabe en tredjepart alene.
@@ -77,11 +77,11 @@ Web=Web
 Poste= Position
 DefaultLang=Sprog som standard
 VATIsUsed=Sales tax is used
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fyld adresse med tredjepartsadresse
-ThirdpartyNotCustomerNotSupplierSoNoRef=Tredjepart hverken kunde eller leverandør, ingen tilgængelige henvisningsobjekter
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Betaling bankkonto
 OverAllProposals=Tilbud
 OverAllOrders=Ordrer
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=RE Type
 TypeLocaltax2ES=IRPF Type
 WrongCustomerCode=Kundekode ugyldig
-WrongSupplierCode=Leverandør kode ugyldig
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Kundekodemodel
-SupplierCodeModel=Leverandør kode model
+SupplierCodeModel=Vendor code model
 Gencod=Stregkode
 ##### Professional ID #####
 ProfId1Short=Prof. ID 1
@@ -267,7 +267,7 @@ Prospect=Emne
 CustomerCard=Customer Card
 Customer=Kunde
 CustomerRelativeDiscount=Relativ kunde rabat
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=Relativ rabat
 CustomerAbsoluteDiscountShort=Absolut rabat
 CompanyHasRelativeDiscount=Denne kunde har en rabat <b>på %s%%</b>
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this suppl
 CompanyHasNoAbsoluteDiscount=Denne kunde har ingen rabat kreditter til rådighed
 CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
 CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=Ingen
 Supplier=Leverandør
 AddContact=Opret kontakt
@@ -304,13 +304,13 @@ DeleteACompany=Slet et selskab
 PersonalInformations=Personoplysninger
 AccountancyCode=Regnskabskonto
 CustomerCode=Kundekode
-SupplierCode=Leverandør-kode
+SupplierCode=Vendor code
 CustomerCodeShort=Kundekode
-SupplierCodeShort=Leverandør-kode
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=Kundekode, unik for alle kunder
-SupplierCodeDesc=Leverandør-kode, unikke for alle leverandører
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=Påkrævet, hvis tredjepart er en kunde eller et emne
-RequiredIfSupplier=Påkrævet, hvis tredjepart er leverandør
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=Gyldighed kontrolleres af modul
 ThisIsModuleRules=Dette er reglerne for dette modul
 ProspectToContact=Emne at kontakte
@@ -338,7 +338,7 @@ MyContacts=Mine kontakter
 Capital=Egenkapital
 CapitalOf=Egenkapital på %s
 EditCompany=Rediger virksomhed
-ThisUserIsNot=Denne bruger er hverken emne, kunde eller leverandør
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=Kontrollere
 VATIntraCheckDesc=<b>Linket %s</b> tillader at anmode Den Europæiske moms Kontrolprogram service. En ekstern adgang til internettet fra server er påkrævet til denne tjeneste for at arbejde.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -396,7 +396,7 @@ ImportDataset_company_4=Third parties/Sales representatives (Assign sales repres
 PriceLevel=Prisniveau
 DeliveryAddress=Leveringsadresse
 AddAddress=Tilføj adresse
-SupplierCategory=Leverandør kategori
+SupplierCategory=Vendor category
 JuridicalStatus200=Uafhængig
 DeleteFile=Slet fil
 ConfirmDeleteFile=Er du sikker på du vil slette denne fil?
@@ -406,7 +406,7 @@ FiscalYearInformation=Oplysninger om regnskabssår
 FiscalMonthStart=Første måned i regnskabsåret
 YouMustAssignUserMailFirst=Du skal først oprette e-mail til denne bruger for at kunne tilføje e-mail-meddelelser til ham.
 YouMustCreateContactFirst=For at kunne tilføje e-mail-meddelelser skal du først definere kontakter med gyldige e-mails til tredjepart
-ListSuppliersShort=Liste over leverandører
+ListSuppliersShort=List of vendors
 ListProspectsShort=Liste over emner
 ListCustomersShort=Liste over kunder
 ThirdPartiesArea=Tredjeparter og kontakter
@@ -420,7 +420,7 @@ CurrentOutstandingBill=Udestående faktura i øjeblikket
 OutstandingBill=Maks. for udstående faktura
 OutstandingBillReached=Maks. for udestående regning nået
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Retur værdi med format %syymm-nnnn for kunde-kode og %syymm-nnnn for leverandøren kode hvor yy er årstal, MM er måneden og nnnn er en sekvens uden mellemrum og ikke vende tilbage til 0.
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=Kunde / leverandør-koden er ledig. Denne kode kan til enhver tid ændres.
 ManagingDirectors=Leder(e) navne (CEO, direktør, chef...)
 MergeOriginThirdparty=Duplicate tredjepart (tredjepart, du vil slette)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Login af salgsrepræsentant
 SaleRepresentativeFirstname=Fornavn på salgsrepræsentant
 SaleRepresentativeLastname=Efternavn på salgsrepræsentant
 ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=Ny kunde eller leverandør kode foreslået på duplikat kode
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/da_DK/compta.lang b/htdocs/langs/da_DK/compta.lang
index 463b2c3f035..52e3887d086 100644
--- a/htdocs/langs/da_DK/compta.lang
+++ b/htdocs/langs/da_DK/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=Netto udbetalt
 VATToPay=Tax sales
 VATReceived=SalgsMoms
 VATToCollect=KøbsMoms
-VATSummary=Momsbalance
+VATSummary=Tax monthly
+VATBalance=Momsbalance
 VATPaid=Moms betalt
 LT1Summary=Skat 2 resumé
 LT2Summary=Skat 3 resumé
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=Regnskab/økonomi
 NewPayment=Ny betaling
 Payments=Betalinger
 PaymentCustomerInvoice=Betaling for kundefaktura
-PaymentSupplierInvoice=Leverandør faktura betaling
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Betaling af skat/afgift
 PaymentVat=Betaling af moms
 ListPayment=Oversigt over betalinger
 ListOfCustomerPayments=Oversigt over kundebetalinger
-ListOfSupplierPayments=Liste over leverandør betalinger
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Startdato for perioden
 DateEndPeriod=Slutdato for perioden
 newLT1Payment=Ny skat 2 betaling
@@ -110,7 +111,7 @@ ShowVatPayment=Vis momsbetaling
 TotalToPay=At betale i alt
 BalanceVisibilityDependsOnSortAndFilters=Balancen er kun synlig i denne liste, hvis tabellen sorteres stigende på %s og filtreret til 1 bankkonto
 CustomerAccountancyCode=Regnskabskode for kunde
-SupplierAccountancyCode=Regnskabskode for leverandør
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. konto. kode
 SupplierAccountancyCodeShort=Sup. konto. kode
 AccountNumber=Kontonummer
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Rapport fra tredjepart IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Rapport fra kunden moms indsamlet og betalt
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Kontoplantype
 Pcg_type=Pcg type
 Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Fakturalinjer til afsendelse
-ByProductsAndServices=Varer og ydelser
+ByProductsAndServices=By product and service
 RefExt=Ekstern ref
 ToCreateAPredefinedInvoice=For at oprette en fakturaskabelon skal du oprette en standardfaktura, og uden at godkende den, skal du klikke på knappen "%s".
 LinkedOrder=Link til ordre
@@ -215,7 +218,8 @@ Mode1=Metode 1
 Mode2=Metode 2
 CalculationRuleDesc=For at beregne total moms er der to metoder: <br> Metode 1 er afrundingskvot på hver linje og derefter opsummerer dem. <br> Metode 2 opsummerer alt moms på hver linje og derefter afrundingsresultat. <br> Endelig resultat kan afvige fra få cent. Standard tilstand er tilstand <b> %s </ b>.
 CalculationRuleDescSupplier=Ifølge leverandør skal du vælge en passende metode til at anvende samme beregningsregel og få det samme resultat, som din leverandør forventes.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Omsætningsrapport pr. Produkt, er det ikke relevant, når du bruger en <b> Kontantkonto </ b> -tilstand. Denne rapport er kun tilgængelig, når du bruger <b> engagement accounting </ b> (se opsætning af regnskabsmodul).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Udregningsmåde
 AccountancyJournal=Regnskabskladde
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Regnskabskonto som standard for betaling af moms
 ACCOUNTING_ACCOUNT_CUSTOMER=Regnskabskonto anvendt til kundens tredjepart
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Den dedikerede regnskabskonto, der er defineret på tredjepartskort, vil kun blive brugt til Subledger Accouting. Denne vil blive brugt til General Ledger og som standardværdi for Subledger regnskab, hvis dedikeret kundeaccouting konto på tredjepart ikke er defineret.
-ACCOUNTING_ACCOUNT_SUPPLIER=Regnskabskonto anvendt til leverandør tredjepart
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Den dedikerede regnskabskonto, der er defineret på tredjepartskort, vil kun blive brugt til Subledger Accouting. Denne vil blive brugt til General Ledger og som standardværdi af Subledger regnskab, hvis dedikeret leverandør accouting konto på tredjepart ikke er defineret.
 CloneTax=Klon en skat/afgift
 ConfirmCloneTax=Bekræft, at du vil klone betaling af skat/afgift
@@ -242,3 +246,10 @@ FiscalPeriod=Regnskabsperiode
 ListSocialContributionAssociatedProject=Liste over sociale bidrag i forbindelse med projektet
 DeleteFromCat=Fjern fra regnskabsgruppen
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/da_DK/dict.lang b/htdocs/langs/da_DK/dict.lang
index 4ab7ac3f0f9..2d4fd9c9da8 100644
--- a/htdocs/langs/da_DK/dict.lang
+++ b/htdocs/langs/da_DK/dict.lang
@@ -5,9 +5,10 @@ CountryIT=Italien
 CountryES=Spanien
 CountryDE=Tyskland
 CountryCH=Schweiz
-CountryGB=Storbritannien
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=United Kingdom
 CountryUK=United Kingdom
-CountryIE=Dänemark
+CountryIE=Irland
 CountryCN=Kina
 CountryTN=Tunis
 CountryUS=United States
@@ -326,9 +327,9 @@ PaperFormatCAP4=Format P4 Canada
 PaperFormatCAP5=Format P5 Canada
 PaperFormatCAP6=Format P6 Canada
 #### Expense report categories ####
-ExpAutoCat=Car
-ExpCycloCat=Moped
-ExpMotoCat=Motorbike
+ExpAutoCat=Bil
+ExpCycloCat=knallert
+ExpMotoCat=motorcykel
 ExpAuto3CV=3 CV
 ExpAuto4CV=4 CV
 ExpAuto5CV=5 CV
@@ -339,18 +340,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
-ExpCyclo=Capacity lower to 50cm3
-ExpMoto12CV=Motorbike 1 or 2 CV
-ExpMoto345CV=Motorbike 3, 4 or 5 CV
-ExpMoto5PCV=Motorbike 5 CV and more
+ExpAuto3PCV=3 CV og mere
+ExpAuto4PCV=4 CV og mere
+ExpAuto5PCV=5 CV og mere
+ExpAuto6PCV=6 CV og mere
+ExpAuto7PCV=7 CV og mere
+ExpAuto8PCV=8 CV og mere
+ExpAuto9PCV=9 CV og mere
+ExpAuto10PCV=10 CV og mere
+ExpAuto11PCV=11 cv og mere
+ExpAuto12PCV=12 CV og mere
+ExpAuto13PCV=13 CV og mere
+ExpCyclo=Kapacitet lavere til 50cm3
+ExpMoto12CV=Motorcykel 1 eller 2 CV
+ExpMoto345CV=Motorcykel 3, 4 eller 5 CV
+ExpMoto5PCV=Motorcykel 5 CV og meget mere
diff --git a/htdocs/langs/da_DK/ecm.lang b/htdocs/langs/da_DK/ecm.lang
index 10bca77d71e..78ceaa171c2 100644
--- a/htdocs/langs/da_DK/ecm.lang
+++ b/htdocs/langs/da_DK/ecm.lang
@@ -14,11 +14,11 @@ ECMNbOfFilesInDir=Antallet af filer i mappen
 ECMNbOfSubDir=Antal sub-mapper
 ECMNbOfFilesInSubDir=Number of files in sub-directories
 ECMCreationUser=Creator
-ECMArea=DMS/ECM area
-ECMAreaDesc=The DMS/ECM (Document Management System / Electronic Content Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
+ECMArea=DMS / ECM område
+ECMAreaDesc=DMS / ECM (Document Management System / Electronic Content Management) -området giver dig mulighed for at gemme, dele og søge hurtigt alle slags dokumenter i Dolibarr.
 ECMAreaDesc2=* Automatisk abonnentfortegnelser fyldes automatisk, når tilføjelse af dokumenter fra kort af et element. <br> * Manual mapper kan bruges til at gemme dokumenter, der ikke er knyttet til et bestemt element.
 ECMSectionWasRemoved=<b>Directory %s</b> er blevet slettet.
-ECMSectionWasCreated=Directory <b>%s</b> has been created.
+ECMSectionWasCreated=Katalog <b> %s </b> er blevet oprettet.
 ECMSearchByKeywords=Søg på nøgleord
 ECMSearchByEntity=Søg på objektet
 ECMSectionOfDocuments=Abonnentfortegnelser af dokumenter
@@ -39,12 +39,13 @@ ShowECMSection=Vis mappe
 DeleteSection=Fjern mappe
 ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
 ECMDirectoryForFiles=Relativ mappe for filer
-CannotRemoveDirectoryContainsFiles=Fjernes ikke muligt, fordi den indeholder nogle filer
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=Filhåndtering
-ECMSelectASection=Vælg en mappe på venstre-træ ...
-DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
-ReSyncListOfDir=Resync list of directories
-HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
-NoDirectoriesFound=No directories found
+ECMSelectASection=Select a directory in the tree...
+DirNotSynchronizedSyncFirst=Denne mappe synes at være oprettet eller ændret uden for ECM-modulet. Du skal klikke på "Resync" knappen først for at synkronisere disk og database for at få indhold i denne mappe.
+ReSyncListOfDir=Resync liste over mapper
+HashOfFileContent=Hash af fil indhold
+FileNotYetIndexedInDatabase=Filen er endnu ikke indekseret i database (prøv at genoplaste den)
+FileSharedViaALink=Fil deles via et link
+NoDirectoriesFound=Ingen mapper fundet
diff --git a/htdocs/langs/da_DK/errors.lang b/htdocs/langs/da_DK/errors.lang
index 958fa38f201..3278c73c5f9 100644
--- a/htdocs/langs/da_DK/errors.lang
+++ b/htdocs/langs/da_DK/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Bar code required
 ErrorCustomerCodeAlreadyUsed=Kundekoden anvendes allerede
 ErrorBarCodeAlreadyUsed=Bar code already used
 ErrorPrefixRequired=Prefix kræves
-ErrorBadSupplierCodeSyntax=Bad syntaks for leverandør-kode
-ErrorSupplierCodeRequired=Leverandør kode kræves
-ErrorSupplierCodeAlreadyUsed=Leverandør koden allerede anvendes
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Bad parametre
 ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
 ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
@@ -87,7 +87,7 @@ ErrorsOnXLines=Fejl på <b>%s</b> kildelinjer
 ErrorFileIsInfectedWithAVirus=Det antivirusprogram var ikke i stand til at validere filen (filen kan være inficeret med en virus)
 ErrorSpecialCharNotAllowedForField=Specialtegn er ikke tilladt for feltet "%s"
 ErrorNumRefModel=En henvisning findes i databasen (%s) og er ikke kompatible med denne nummerering regel. Fjern optage eller omdøbt henvisning til aktivere dette modul.
-ErrorQtyTooLowForThisSupplier=Mængde for lav for denne leverandør eller nogen pris fastlagt på denne vare for denne leverandør
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Fejl på maske
 ErrorBadMaskFailedToLocatePosOfSequence=Fejl, maske uden loebenummeret
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
-ErrorSupplierCountryIsNotDefined=Land for denne leverandør er ikke defineret. Korrigere denne første.
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
diff --git a/htdocs/langs/da_DK/install.lang b/htdocs/langs/da_DK/install.lang
index 5dae9504898..6ce71b2fcb2 100644
--- a/htdocs/langs/da_DK/install.lang
+++ b/htdocs/langs/da_DK/install.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - install
-InstallEasy=Vi forsøgte at gøre Dolibarr setup så let som muligt. Følg anvisningerne trin for trin.
+InstallEasy=Bare følg instruktionerne trin for trin.
 MiscellaneousChecks=Forudsætninger check
 ConfFileExists=<b>Konfigurationsfil %s</b> eksisterer.
 ConfFileDoesNotExistsAndCouldNotBeCreated=<b>Konfigurationsfil %s</b> eksisterer ikke og kunne ikke oprettes!
 ConfFileCouldBeCreated=<b>Konfigurationsfil %s</b> kunne oprettes.
 ConfFileIsNotWritable=<b>Konfigurationsfil %s</b> er ikke skrivbar. Check permissions. For første installation, webserveren skal ydes for at kunne skrive i denne fil under konfigurationen ( "chmod 666" for eksempel på Unix-lignende OS).
 ConfFileIsWritable=<b>Konfigurationsfil %s</b> er skrivbar.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Genindlæs alle oplysninger fra konfigurationsfilen.
 PHPSupportSessions=Denne PHP understøtter sessioner.
-PHPSupportPOSTGETOk=Denne PHP understøtter variabler POST og GET.
-PHPSupportPOSTGETKo=Det er muligt din PHP setup ikke understøtter variabler POST og / eller GET. Tjek din parameter <b>variables_order</b> i php.ini.
-PHPSupportGD=Denne PHP støtte GD grafiske funktioner.
+PHPSupportPOSTGETOk=Denne PHP understøtter variablerne POST og GET.
+PHPSupportPOSTGETKo=Det er muligt, at din PHP-opsætning ikke understøtter variablerne POST og/eller GET. Tjek din parameter <b>variables_order</b> i php.ini.
+PHPSupportGD=Denne PHP understøtter GD grafiske funktioner.
 PHPSupportCurl=This PHP support Curl.
-PHPSupportUTF8=Denne PHP støtte UTF8 funktioner.
+PHPSupportUTF8=Denne PHP understøtter UTF8 funktioner.
 PHPMemoryOK=Din PHP max session hukommelse er sat <b>til %s.</b> Dette skulle være nok.
 PHPMemoryTooLow=Din PHP max session hukommelse er sat <b>til %s</b> bytes. Dette skulle være for lav. Skift din <b>php.ini</b> at indstille <b>memory_limit</b> parameter til <b>mindst %s</b> bytes.
 Recheck=Klik her for en mere significative test
-ErrorPHPDoesNotSupportSessions=Din PHP installation ikke støtte sessioner. Denne funktion er forpligtet til at gøre Dolibarr fungerer. Tjek din PHP setup.
+ErrorPHPDoesNotSupportSessions=Din PHP-installation understøtter ikke sessioner. Denne funktion er nødvendig for at få Dolibarr til at fungere. Tjek din PHP-opsætning.
 ErrorPHPDoesNotSupportGD=Din PHP-installation understøtter ikke den grafiske funktion GD. Ingen grafer vil være til rådighed.
 ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
-ErrorPHPDoesNotSupportUTF8=Din PHP installation ikke støtte UTF8 funktioner. Dolibarr kan ikke fungere korrekt. Løse dette, før du installerer Dolibarr.
+ErrorPHPDoesNotSupportUTF8=Din PHP-installation understøtter ikke UTF8-funktioner. Dolibarr kan ikke fungere korrekt. Løs dette før du installerer Dolibarr.
 ErrorDirDoesNotExists=Directory %s ikke eksisterer.
-ErrorGoBackAndCorrectParameters=Gå tilbage og rette forkerte parametre.
+ErrorGoBackAndCorrectParameters=Gå tilbage og ret forkerte parametre.
 ErrorWrongValueForParameter=Du kan have indtastet en forkert værdi for parameter ' %s'.
 ErrorFailedToCreateDatabase=Kunne ikke oprette databasen ' %s'.
 ErrorFailedToConnectToDatabase=Det lykkedes ikke at oprette forbindelse til databasen ' %s'.
@@ -29,8 +30,8 @@ ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher i
 ErrorPHPVersionTooLow=PHP version for gammel. Version %s er påkrævet.
 ErrorConnectedButDatabaseNotFound=Forbindelsen til serveren vellykket men database ' %s' blev ikke fundet.
 ErrorDatabaseAlreadyExists=Database ' %s' eksisterer allerede.
-IfDatabaseNotExistsGoBackAndUncheckCreate=Hvis databasen ikke findes, gå tilbage og tjekke valgmulighed "Opret database".
-IfDatabaseExistsGoBackAndCheckCreate=Hvis database findes allerede, gå tilbage og fjerne markeringen "Opret database" valgmulighed.
+IfDatabaseNotExistsGoBackAndUncheckCreate=Hvis databasen ikke findes, gå tilbage og tjek valgmulighed "Opret database".
+IfDatabaseExistsGoBackAndCheckCreate=Hvis database findes allerede, gå tilbage og fjern markeringen "Opret database" valgmulighed.
 WarningBrowserTooOld=Too old version of browser. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommanded.
 PHPVersion=PHP Version
 License=Bruger licens
@@ -53,10 +54,10 @@ AdminLogin=Log ind for Dolibarr database administrator. Hold tomme, hvis du slut
 PasswordAgain=Gentag adgangskode en anden gang
 AdminPassword=Adgangskode til Dolibarr database administrator. Hold tomme, hvis du slutter i anonym
 CreateDatabase=Opret database
-CreateUser=Create owner or grant him permission on database
+CreateUser=Opret ejer eller give ham tilladelse til database
 DatabaseSuperUserAccess=Database - SuperUser adgang
 CheckToCreateDatabase=Afkrydsningsfelt, hvis databasen ikke eksisterer og skal være oprettet. <br> I dette tilfælde skal du udfylde login / password for SuperUser konto nederst på denne side.
-CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
+CheckToCreateUser=Afkrydsningsfelt, hvis databasen ejer ikke eksisterer og skal oprettes, eller hvis den findes, men databasen ikke eksisterer og tilladelser skal gives. <br> I dette tilfælde skal du vælge login og adgangskode og også udfylde login / adgangskode for superbrugerkontoen nederst på denne side. Hvis dette felt ikke er markeret, skal ejerdatabasen og dets adgangskoder eksistere.
 DatabaseRootLoginDescription=Log ind på den bruger lov til at oprette nye databaser eller nye brugere, ubrugelige, hvis din database og din database login findes allerede (ligesom når du er vært ved en web hosting provider).
 KeepEmptyIfNoPassword=Efterlad tom, hvis brugeren ikke har nogen adgangskode (undgå dette)
 SaveConfigurationFile=Gem værdier
@@ -91,11 +92,11 @@ FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
 WarningRemoveInstallDir=Advarsel, af sikkerhedshensyn, når de installerer eller opgraderer er færdig, bør du fjerne <b>installationen mappe eller omdøbe den til install.lock for at undgå sin ondsindet brug.</b>
 FunctionNotAvailableInThisPHP=Ikke til rådighed på dette PHP
 ChoosedMigrateScript=Valgt migrere script
-DataMigration=Data migration
-DatabaseMigration=Struktur database migration
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script forarbejdning
 ChooseYourSetupMode=Vælg din opsætning mode, og klik på "Start" ...
-FreshInstall=Friske installere
+FreshInstall=Frisk installation
 FreshInstallDesc=Brug denne tilstand, hvis dette er din første installation. Hvis ikke, denne tilstand kan reparere en tidligere ufuldstændige installere, men hvis du ønsker at opgradere din version, kan du vælge "Opdater"-tilstand.
 Upgrade=Upgrade
 UpgradeDesc=Brug denne tilstand, hvis du har erstattet gamle Dolibarr filer med filerne fra en nyere version. Dette vil opgradere din database og data.
@@ -138,15 +139,15 @@ KeepDefaultValuesWamp=Du bruger DoliWamp opsætningsguiden, så værdier foresl
 KeepDefaultValuesDeb=Du bruger Dolibarr opsætningsguiden fra en Ubuntu eller Debian-pakke, så værdier, der foreslås her, er allerede optimeret. Kun den password i databasen ejeren for at oprette skal udfyldes. Ændre andre parametre kun hvis du ved hvad du gør.
 KeepDefaultValuesMamp=Du bruger DoliMamp opsætningsguiden, så værdier foreslås her allerede er optimeret. Ændre dem kun, hvis du ved hvad du gør.
 KeepDefaultValuesProxmox=Du bruger Dolibarr opsætningsguiden fra en Proxmox virtual appliance, så værdier, der foreslås her, allerede er optimeret. Skift dem kun hvis du ved hvad du gør.
-UpgradeExternalModule=Run dedicated upgrade process of external modules
-SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
-NothingToDelete=Nothing to clean/delete
-NothingToDo=Nothing to do
+UpgradeExternalModule=Kør dedikeret opgradering af eksterne moduler
+SetAtLeastOneOptionAsUrlParameter=Indstil mindst én mulighed som en parameter i URL. For eksempel: '... repair.php? Standard = bekræftet'
+NothingToDelete=Intet at rengøre / slette
+NothingToDo=Ingenting at lave
 #########
 # upgrade
 MigrationFixData=Fix for denormalized data
 MigrationOrder=Data migration for kundernes ordrer
-MigrationSupplierOrder=Data migration for leverandører ordrer
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Datamigration for tilbud
 MigrationInvoice=Data migration til kundernes fakturaer
 MigrationContract=Data migration for kontrakter
@@ -193,11 +194,13 @@ MigrationActioncommElement=Opdatere data om tiltag
 MigrationPaymentMode=Data migration for betaling mode
 MigrationCategorieAssociation=Migration of categories
 MigrationEvents=Migration af begivenheder, så begivenhedsejeren tilføjes tildelingstabel
-MigrationEventsContact=Migration of events to add event contact into assignement table
+MigrationEventsContact=Migration af begivenheder for at tilføje eventkontakt i tildelingstabel
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
 MigrationReloadModule=Reload module %s
-MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+MigrationResetBlockedLog=Nulstil modul BlockedLog for v7 algoritme
 ShowNotAvailableOptions=Show not available options
 HideNotAvailableOptions=Hide not available options
 ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but application or some features may not work correctly until fixed.
diff --git a/htdocs/langs/da_DK/ldap.lang b/htdocs/langs/da_DK/ldap.lang
index 746c652c66a..d96e334c03e 100644
--- a/htdocs/langs/da_DK/ldap.lang
+++ b/htdocs/langs/da_DK/ldap.lang
@@ -1,12 +1,11 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Password for domæne
 YouMustChangePassNextLogon=Adgangskode for <b>bruger %s</b> på det <b>domæne %s</b> skal ændres.
 UserMustChangePassNextLogon=Brugeren skal skifte adgangskode på domænet %s
 LDAPInformationsForThisContact=Oplysninger i LDAP database for denne kontakt
 LDAPInformationsForThisUser=Oplysninger i LDAP database for denne bruger
 LDAPInformationsForThisGroup=Oplysninger i LDAP database for denne gruppe
 LDAPInformationsForThisMember=Oplysninger i LDAP database for dette medlem
-LDAPInformationsForThisMemberType=Information in LDAP database for this member type
+LDAPInformationsForThisMemberType=Oplysninger i LDAP-database for denne medlems type
 LDAPAttributes=LDAP attributter
 LDAPCard=LDAP-kort
 LDAPRecordNotFound=Optag ikke findes i LDAP database
@@ -21,7 +20,8 @@ LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=Bruger synkroniseres
 GroupSynchronized=Gruppen synkroniseres
 MemberSynchronized=Medlem synkroniseres
-MemberTypeSynchronized=Member type synchronized
+MemberTypeSynchronized=Medlems type synkroniseret
 ContactSynchronized=Kontakt synkroniseres
 ForceSynchronize=Force synkronisering Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Kunne ikke læse LDAP database. Check LDAP modul opsætning og database tilgængelighed.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/da_DK/loan.lang b/htdocs/langs/da_DK/loan.lang
index cb23cb801d2..628394f4a4c 100644
--- a/htdocs/langs/da_DK/loan.lang
+++ b/htdocs/langs/da_DK/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=Capital
 Insurance=Insurance
 Interest=Interest
 Nbterms=Number of terms
+Term=Term
 LoanAccountancyCapitalCode=Accounting account capital
 LoanAccountancyInsuranceCode=Accounting account insurance
 LoanAccountancyInterestCode=Accounting account interest
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=Confirm deleting this loan
 LoanDeleted=Loan Deleted Successfully
 ConfirmPayLoan=Confirm classify paid this loan
 LoanPaid=Loan Paid
-# Calc
-LoanCalc=Bank Loans Calculator
-PurchaseFinanceInfo=Purchase & Financing Information
-SalePriceOfAsset=Sale Price of Asset
-PercentageDown=Percentage Down
-LengthOfMortgage=Duration of loan
-AnnualInterestRate=Annual Interest Rate
-ExplainCalculations=Explain Calculations
-ShowMeCalculationsAndAmortization=Show me the calculations and amortization
-MortgagePaymentInformation=Mortgage Payment Information
-DownPayment=Down Payment
-DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
-InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
-MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
-MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
-MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
-MonthlyPaymentDesc=The montly payment is figured out using the following formula
-AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
-AmountFinanced=Amount Financed
-AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
-Totalsforyear=I alt for året
-MonthlyPayment=Monthly Payment
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
-GoToInterest=%s will go towards INTEREST
-GoToPrincipal=%s will go towards PRINCIPAL
-YouWillSpend=You will spend %s in year %s
 ListLoanAssociatedProject=List of loan associated with the project
 AddLoan=Opret lån
+FinancialCommitment=Financial commitment
+InterestAmount=Interest
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-FinancialCommitment=Financial commitment
 CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/langs/da_DK/mails.lang b/htdocs/langs/da_DK/mails.lang
index 0c25294eae9..6df8641160a 100644
--- a/htdocs/langs/da_DK/mails.lang
+++ b/htdocs/langs/da_DK/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Sender
 MailErrorsTo=Fejl
 MailReply=Besvar
 MailTo=Receiver (r)
+MailToUsers=To user(s)
 MailCC=Kopier til
+MailToCCUsers=Copy to users(s)
 MailCCC=Cachelagrede kopi til
 MailTopic=E-Mail emne
 MailText=Besked
@@ -164,4 +166,4 @@ InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Udgående e-mail opsætning (til masse emailing)
 DefaultOutgoingEmailSetup=Standard udgående e-mail opsætning
 Information=Information
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/da_DK/main.lang b/htdocs/langs/da_DK/main.lang
index 67269e14399..fa72c576c58 100644
--- a/htdocs/langs/da_DK/main.lang
+++ b/htdocs/langs/da_DK/main.lang
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode er sa
 Administrator=Administrator
 Undefined=Undefined
 PasswordForgotten=Har du glemt dit kodeord ?
+NoAccount=No account?
 SeeAbove=Se ovenfor
 HomeArea=Hjem
 LastConnexion=Seneste forbindelse
@@ -231,7 +232,7 @@ Limit=Limit
 Limits=Grænseværdier
 Logout=Log ud
 NoLogoutProcessWithAuthMode=Ingen applicative afbryd funktion med authentication mode <b>%s</b>
-Connection=Forbindelsesstyring
+Connection=Login
 Setup=Opsætning
 Alert=Alarm
 MenuWarnings=Indberetninger
@@ -402,6 +403,7 @@ DefaultTaxRate=Standardskattesats
 Average=Gennemsnit
 Sum=Sum
 Delta=Delta
+RemainToPay=Remain to pay
 Module=Modul/Applikation
 Modules=Moduler/applikationer
 Option=Option
@@ -414,7 +416,7 @@ Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
 ExternalRef=Ref. extern
-RefSupplier=Ref. leverandør
+RefSupplier=Ref. vendor
 RefPayment=Ref. betaling
 CommercialProposalsShort=Tilbud
 Comment=Kommentar
@@ -493,7 +495,7 @@ Received=Modtaget
 Paid=Betales
 Topic=Emne
 ByCompanies=Tredjeparter
-ByUsers=Brugere
+ByUsers=By user
 Links=Links
 Link=Link
 Rejects=Afviser
@@ -619,9 +621,9 @@ BuildDoc=Build Dok
 Entity=Enhed
 Entities=Enheder
 CustomerPreview=Forhåndsvisning for kunde
-SupplierPreview=Forhåndsvisning for leverandør
+SupplierPreview=Vendor preview
 ShowCustomerPreview=Vis forhåndsvisning for kunde
-ShowSupplierPreview=Vis forhåndsvisning for leverandør
+ShowSupplierPreview=Show vendor preview
 RefCustomer=Ref. kunde
 Currency=Valuta
 InfoAdmin=Oplysninger til administratorer
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=Produkter eller tjenester
 SearchIntoProjects=Projekter
 SearchIntoTasks=Opgaver
 SearchIntoCustomerInvoices=Kundefakturaer
-SearchIntoSupplierInvoices=Leverandørfakturaer
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Kundeordrer
-SearchIntoSupplierOrders=Leverandør ordrer
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=Kundeforslag
-SearchIntoSupplierProposals=Leverandørforslag
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Interventioner
 SearchIntoContracts=Kontrakter
 SearchIntoCustomerShipments=Kundeforsendelser
@@ -941,3 +943,5 @@ Remote=Remote
 LocalAndRemote=Local and Remote
 KeyboardShortcut=Keyboard shortcut
 AssignedTo=Tildelt til
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/da_DK/margins.lang b/htdocs/langs/da_DK/margins.lang
index b35189a865c..824a13a7ebd 100644
--- a/htdocs/langs/da_DK/margins.lang
+++ b/htdocs/langs/da_DK/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=As a service
 UseDiscountOnTotal=Subtotal
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
 MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best supplier price
+MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Cost price
 UnitCharges=Unit charges
 Charges=Charges
diff --git a/htdocs/langs/da_DK/members.lang b/htdocs/langs/da_DK/members.lang
index 10b29d9b263..0045aa61b89 100644
--- a/htdocs/langs/da_DK/members.lang
+++ b/htdocs/langs/da_DK/members.lang
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
diff --git a/htdocs/langs/da_DK/opensurvey.lang b/htdocs/langs/da_DK/opensurvey.lang
index 174cf2199b4..f6ba621beaa 100644
--- a/htdocs/langs/da_DK/opensurvey.lang
+++ b/htdocs/langs/da_DK/opensurvey.lang
@@ -1,60 +1,61 @@
 # Dolibarr language file - Source file is en_US - opensurvey
-Survey=Poll
-Surveys=Polls
-OrganizeYourMeetingEasily=Organize your meetings and polls easily. First select type of poll...
-NewSurvey=New poll
-OpenSurveyArea=Polls area
-AddACommentForPoll=You can add a comment into poll...
-AddComment=Add comment
-CreatePoll=Create poll
-PollTitle=Poll title
-ToReceiveEMailForEachVote=Receive an email for each vote
-TypeDate=Type date
+Survey=Afstemning
+Surveys=Afstemninger
+OrganizeYourMeetingEasily=Organiser dine møder og afstemninger nemt. Først vælg type af afstemning ...
+NewSurvey=Ny afstemning
+OpenSurveyArea=Afstemningsområde
+AddACommentForPoll=Du kan tilføje en kommentar til afstemning ...
+AddComment=Tilføj kommentar
+CreatePoll=Opret afstemning
+PollTitle=Afstemningstitel
+ToReceiveEMailForEachVote=Modtag en email for hver stemme
+TypeDate=Skriv dato
 TypeClassic=Type standard
-OpenSurveyStep2=Select your dates amoung the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it
-RemoveAllDays=Remove all days
-CopyHoursOfFirstDay=Copy hours of first day
-RemoveAllHours=Remove all hours
-SelectedDays=Selected days
-TheBestChoice=The best choice currently is
-TheBestChoices=The best choices currently are
-with=with
-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.
-CommentsOfVoters=Comments of voters
-ConfirmRemovalOfPoll=Are you sure you want to remove this poll (and all votes)
-RemovePoll=Remove poll
-UrlForSurvey=URL to communicate to get a direct access to poll
-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=Create a standard poll
-CheckBox=Simple checkbox
-YesNoList=List (empty/yes/no)
-PourContreList=List (empty/for/against)
-AddNewColumn=Add new column
-TitleChoice=Choice label
-ExportSpreadsheet=Export result spreadsheet
+OpenSurveyStep2=Vælg dine datoer i løbet af de frie dage (grå). De valgte dage er grønne. Du kan fravælge en tidligere valgt dag ved at klikke igen på den
+RemoveAllDays=Fjern alle dage
+CopyHoursOfFirstDay=Kopieringstid på første dag
+RemoveAllHours=Fjern alle timer
+SelectedDays=Udvalgte dage
+TheBestChoice=Det bedste valg i øjeblikket er
+TheBestChoices=De bedste valg er i øjeblikket
+with=med
+OpenSurveyHowTo=Hvis du accepterer at stemme i denne afstemning, skal du give dit navn, vælge de værdier der passer bedst til dig og godkende med plus-knappen i slutningen af ​​linjen.
+CommentsOfVoters=Kommentarer til vælgerne
+ConfirmRemovalOfPoll=Er du sikker på, at du vil fjerne denne afstemning (og alle stemmer)
+RemovePoll=Fjern afstemning
+UrlForSurvey=URL for at kommunikere for at få en direkte adgang til afstemning
+PollOnChoice=Du opretter en afstemning for at gøre et flervalg for en afstemning. Indtast først alle mulige valg til din afstemning:
+CreateSurveyDate=Opret en datavurdering
+CreateSurveyStandard=Opret en standard poll
+CheckBox=Enkel afkrydsningsfelt
+YesNoList=Liste (tom / ja / nej)
+PourContreList=Liste (tom / for / imod)
+AddNewColumn=Tilføj ny kolonne
+TitleChoice=Valgmærke
+ExportSpreadsheet=Eksporter resultat regneark
 ExpireDate=Limit dato
-NbOfSurveys=Number of polls
-NbOfVoters=Nb of voters
-SurveyResults=Results
-PollAdminDesc=You are allowed to change all vote lines of this poll with button "Edit". You can, as well, remove a column or a line with %s. You can also add a new column with %s.
-5MoreChoices=5 more choices
-Against=Against
-YouAreInivitedToVote=You are invited to vote for this poll
-VoteNameAlreadyExists=This name was already used for this poll
-AddADate=Add a date
-AddStartHour=Add start hour
-AddEndHour=Add end hour
-votes=vote(s)
-NoCommentYet=No comments have been posted for this poll yet
-CanComment=Voters can comment in the poll
-CanSeeOthersVote=Voters can see other people's vote
-SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format :<br>- empty,<br>- "8h", "8H" or "8:00" to give a meeting's start hour,<br>- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,<br>- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes.
-BackToCurrentMonth=Back to current month
-ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation
-ErrorOpenSurveyOneChoice=Enter at least one choice
-ErrorInsertingComment=There was an error while inserting your comment
-MoreChoices=Enter more choices for the voters
-SurveyExpiredInfo=The poll has been closed or voting delay has expired.
-EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
-ShowSurvey=Show survey
+NbOfSurveys=Antal afstemninger
+NbOfVoters=Nb af vælgerne
+SurveyResults=Resultater
+PollAdminDesc=Du har lov til at ændre alle stemme linjer i denne afstemning med knappen "Rediger". Du kan også fjerne en kolonne eller en linje med %s. Du kan også tilføje en ny kolonne med %s.
+5MoreChoices=5 flere valgmuligheder
+Against=Imod
+YouAreInivitedToVote=Du er inviteret til at stemme for denne afstemning
+VoteNameAlreadyExists=Dette navn blev allerede brugt til denne afstemning
+AddADate=Tilføj en dato
+AddStartHour=Tilføj starttid
+AddEndHour=Tilføj ende time
+votes=stemme (r)
+NoCommentYet=Der er ikke blevet indsendt nogen kommentarer til denne afstemning endnu
+CanComment=Stemmere kan kommentere i afstemningen
+CanSeeOthersVote=Vælgere kan se andres stemme
+SelectDayDesc=For hver valgt dag kan du vælge, eller ikke, møde timer i følgende format: <br> - tom, <br> - "8h", "8H" eller "8:00" for at give et møde starttid <br> - "8-11", "8h-11h", "8H-11H" eller "8: 00-11: 00" for at give et møde start- og sluttid, <br> - "8h15-11h15", " 8H15-11H15 "eller" 8: 15-11: 15 "for det samme, men med få minutter.
+BackToCurrentMonth=Tilbage til den aktuelle måned
+ErrorOpenSurveyFillFirstSection=Du har ikke udfyldt det første afsnit i afstemningen
+ErrorOpenSurveyOneChoice=Indtast mindst ét ​​valg
+ErrorInsertingComment=Der opstod en fejl under indsætningen af ​​din kommentar
+MoreChoices=Indtast flere valg for vælgerne
+SurveyExpiredInfo=Afstemningen er afsluttet eller afstemning forsinkelsen er udløbet.
+EmailSomeoneVoted=%s har fyldt en linje.\nDu kan finde din afstemning på linket:\n%s
+ShowSurvey=Vis undersøgelse
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/da_DK/orders.lang b/htdocs/langs/da_DK/orders.lang
index e127a9285fb..ecab975a7e6 100644
--- a/htdocs/langs/da_DK/orders.lang
+++ b/htdocs/langs/da_DK/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Kundeordrer
-SuppliersOrdersArea=Leverandørordrer
+SuppliersOrdersArea=Purchase orders area
 OrderCard=Ordreside
 OrderId=Ordre-ID
 Order=Ordre
@@ -13,18 +13,18 @@ OrderToProcess=Ordre at behandle
 NewOrder=Ny ordre
 ToOrder=Lav ordre
 MakeOrder=Lav ordre
-SupplierOrder=Leverandørordre
-SuppliersOrders=Leverandørordrer
-SuppliersOrdersRunning=Nuværende leverandører ordrer
-CustomerOrder=Kundeordre
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=Kunde Bestil
 CustomersOrders=Kundeordrer
 CustomersOrdersRunning=Nuværende kundeordrer
 CustomersOrdersAndOrdersLines=Kundeordrer og ordrelinjer
-OrdersDeliveredToBill=Customer orders delivered to bill
+OrdersDeliveredToBill=Kundeordrer leveret til regning
 OrdersToBill=Kundeordrer leveret
 OrdersInProcess=Kundeordrer under behandling
 OrdersToProcess=Kundeordrer der skal behandles
-SuppliersOrdersToProcess=Leverandørordrer der skal behandles
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=Annulleret
 StatusOrderDraftShort=Udkast
 StatusOrderValidatedShort=Godkendt
@@ -45,7 +45,7 @@ StatusOrderCanceled=Annulleret
 StatusOrderDraft=Udkast (skal valideres)
 StatusOrderValidated=Godkendt
 StatusOrderOnProcess=Bestilt - afventer modtagelse
-StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusOrderOnProcessWithValidation=Bestilt - Standby modtagelse eller validering
 StatusOrderProcessed=Behandlet
 StatusOrderToBill=Leveret
 StatusOrderApproved=Godkendt
@@ -55,54 +55,54 @@ StatusOrderReceivedPartially=Delvist modtaget
 StatusOrderReceivedAll=Alle varer modtaget
 ShippingExist=En forsendelse findes
 QtyOrdered=Qty bestilt
-ProductQtyInDraft=Product quantity into draft orders
-ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered
+ProductQtyInDraft=Produkt mængde i udkast ordrer
+ProductQtyInDraftOrWaitingApproved=Produkt mængde i udkast eller godkendte ordrer, endnu ikke bestilt
 MenuOrdersToBill=Ordrer leveret
 MenuOrdersToBill2=Fakturerbare ordrer
 ShipProduct=Send vare
 CreateOrder=Opret ordre
 RefuseOrder=Afvis ordre
-ApproveOrder=Approve order
-Approve2Order=Approve order (second level)
+ApproveOrder=Godkendelse af ordre
+Approve2Order=Godkend ordre (andet niveau)
 ValidateOrder=Valider orden
 UnvalidateOrder=Unvalidate rækkefølge
 DeleteOrder=Slet orden
 CancelOrder=Annuller ordre
-OrderReopened= Order %s Reopened
-AddOrder=Create order
-AddToDraftOrders=Add to draft order
+OrderReopened= Bestil %s Genåbnet
+AddOrder=Opret ordre
+AddToDraftOrders=Tilføj til udkast til ordre
 ShowOrder=Vis for
-OrdersOpened=Orders to process
-NoDraftOrders=No draft orders
-NoOrder=No order
-NoSupplierOrder=No supplier order
-LastOrders=Latest %s customer orders
-LastCustomerOrders=Latest %s customer orders
-LastSupplierOrders=Latest %s supplier orders
-LastModifiedOrders=Latest %s modified orders
+OrdersOpened=Bestiller at behandle
+NoDraftOrders=Intet udkast til ordrer
+NoOrder=Ingen ordre
+NoSupplierOrder=No purchase order
+LastOrders=Seneste %s kundeordrer
+LastCustomerOrders=Seneste %s kundeordrer
+LastSupplierOrders=Latest %s purchase orders
+LastModifiedOrders=Seneste %s ændrede ordrer
 AllOrders=Alle ordrer
 NbOfOrders=Antal ordrer
 OrdersStatistics=Orders »statistik
-OrdersStatisticsSuppliers=Leverandør ordrer «statistik
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Antallet af ordrer efter måned
-AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
+AmountOfOrdersByMonthHT=Antal ordrer pr. Måned (ekskl. Skat)
 ListOfOrders=Liste af ordrer
 CloseOrder=Luk for
-ConfirmCloseOrder=Are you sure you want to set this order to deliverd? Once an order is delivered, it can be set to billed.
-ConfirmDeleteOrder=Are you sure you want to delete this order?
-ConfirmValidateOrder=Are you sure you want to validate this order under name <b>%s</b>?
-ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> to draft status?
-ConfirmCancelOrder=Are you sure you want to cancel this order?
-ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b>?
+ConfirmCloseOrder=Er du sikker på, at du vil indstille denne ordre til at levere? Når en ordre er leveret, kan den indstilles til fakturering.
+ConfirmDeleteOrder=Er du sikker på, at du vil slette denne ordre?
+ConfirmValidateOrder=Er du sikker på, at du vil validere denne ordre under navnet <b> %s </ b>?
+ConfirmUnvalidateOrder=Er du sikker på, at du vil gendanne rækkefølgen <b> %s </ b> til udkastsstatus?
+ConfirmCancelOrder=Er du sikker på, at du vil annullere denne ordre?
+ConfirmMakeOrder=Er du sikker på, at du vil bekræfte, at du har foretaget denne ordre på <b> %s </ b>?
 GenerateBill=Generer faktura
-ClassifyShipped=Classify delivered
+ClassifyShipped=Klassificer leveret
 DraftOrders=Udkast til ordrer
-DraftSuppliersOrders=Draft suppliers orders
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=Den proces ordrer
 RefOrder=Ref. rækkefølge
-RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for supplier
-RefOrderSupplierShort=Ref. order supplier
+RefCustomerOrder=Ref. Bestil for kunde
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=Send ordre ved mail
 ActionsOnOrder=Begivenheder for bestilling
 NoArticleOfTypeProduct=Ingen artikel af typen 'vare', så intet artikelnummer for denne ordre, der kan afsendes
@@ -111,13 +111,13 @@ AuthorRequest=Anmodning forfatter
 UserWithApproveOrderGrant=Useres ydes med "godkende ordrer" tilladelse.
 PaymentOrderRef=Betaling af for %s
 CloneOrder=Klon orden
-ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
+ConfirmCloneOrder=Er du sikker på, at du vil klone denne ordre <b> %s </ b>?
 DispatchSupplierOrder=Modtagelse leverandør for %s
-FirstApprovalAlreadyDone=First approval already done
-SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=Supplier order %s received %s
-SupplierOrderSubmitedInDolibarr=Supplier order %s submited
-SupplierOrderClassifiedBilled=Supplier order %s set billed
+FirstApprovalAlreadyDone=Første godkendelse allerede udført
+SecondApprovalAlreadyDone=Anden godkendelse allerede udført
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Andre kendelser
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Repræsentant opfølgning kundeordre
@@ -125,14 +125,14 @@ TypeContact_commande_internal_SHIPPING=Repræsentant opfølgning shipping
 TypeContact_commande_external_BILLING=Kundefaktura kontakt
 TypeContact_commande_external_SHIPPING=Kunde shipping kontakt
 TypeContact_commande_external_CUSTOMER=Kundekontakt følgende retskendelse
-TypeContact_order_supplier_internal_SALESREPFOLL=Repræsentant opfølgning leverandør for
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Repræsentant opfølgning shipping
-TypeContact_order_supplier_external_BILLING=Leverandør faktura kontakt
-TypeContact_order_supplier_external_SHIPPING=Leverandør shipping kontakt
-TypeContact_order_supplier_external_CUSTOMER=Leverandør kontakt efter retskendelse
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Konstant COMMANDE_SUPPLIER_ADDON ikke defineret
 Error_COMMANDE_ADDON_NotDefined=Konstant COMMANDE_ADDON ikke defineret
-Error_OrderNotChecked=No orders to invoice selected
+Error_OrderNotChecked=Ingen ordrer til faktura valgt
 # Order modes (how we receive order). Not the "why" are keys stored into dict.lang
 OrderByMail=Mail
 OrderByFax=Fax
@@ -142,17 +142,17 @@ OrderByPhone=Telefon
 # Documents models
 PDFEinsteinDescription=En fuldstændig orden model (logo. ..)
 PDFEdisonDescription=En simpel orden model
-PDFProformaDescription=A complete proforma invoice (logo…)
-CreateInvoiceForThisCustomer=Bill orders
-NoOrdersToInvoice=No orders billable
-CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
-OrderCreation=Order creation
+PDFProformaDescription=En komplet proformafaktura (logo ...)
+CreateInvoiceForThisCustomer=Bill ordrer
+NoOrdersToInvoice=Ingen ordrer faktureres
+CloseProcessedOrdersAutomatically=Klassificer "Behandlet" alle valgte ordrer.
+OrderCreation=Ordreoprettelse
 Ordered=Bestilt
-OrderCreated=Your orders have been created
-OrderFail=An error happened during your orders creation
-CreateOrders=Create orders
-ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
-OptionToSetOrderBilledNotEnabled=Option (from module Workflow) to set order to 'Billed' automatically when invoice is validated is off, so you will have to set status of order to 'Billed' manually.
-IfValidateInvoiceIsNoOrderStayUnbilled=If invoice validation is 'No', the order will remain to status 'Unbilled' until the invoice is validated.
-CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
-SetShippingMode=Set shipping mode
+OrderCreated=Dine ordrer er blevet oprettet
+OrderFail=Der opstod en fejl under ordren oprettelse
+CreateOrders=Opret ordrer
+ToBillSeveralOrderSelectCustomer=For at oprette en faktura for flere ordrer, klik først på kunden, og vælg derefter "%s".
+OptionToSetOrderBilledNotEnabled=Mulighed (fra modul Workflow) til at indstille ordre til 'Faktureret' automatisk, når fakturaen er valideret, er slukket, så du skal indstille status for 'Faktureret' manuelt.
+IfValidateInvoiceIsNoOrderStayUnbilled=Hvis faktura validering er 'Nej', forbliver ordren til status 'Unbilled' indtil fakturaen er valideret.
+CloseReceivedSupplierOrdersAutomatically=Luk ordre til "%s" automatisk, hvis alle produkter er modtaget.
+SetShippingMode=Indstil shipping mode
diff --git a/htdocs/langs/da_DK/other.lang b/htdocs/langs/da_DK/other.lang
index 9827de23cdb..0ea2f1d8594 100644
--- a/htdocs/langs/da_DK/other.lang
+++ b/htdocs/langs/da_DK/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hej)__\nDette er en testpost sendt til __EMAIL__.\nDe to l
 PredefinedMailTestHtml=__(Hej)__\nDette er en <b> test </ b> mail (ordtesten skal være fed skrift). De to linjer er adskilt af en vognretur. <br> <br> __USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hej)__\n\nHer finder du det kommercielle forslag __PREF__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hej)__\n\nHer finder du prisforespørgsel __REF__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hej)__\n\nHer finder du ordren __REF__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hej)__\n\nHer finder du vores ordre __REF__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=Filer er for store
 PleaseBePatient=Vær tålmodig ...
 NewPassword=New password
 ResetPassword=Nulstille kodeord
-RequestToResetPasswordReceived=En anmodning om at ændre dit Dolibarr kodeord er blevet modtaget
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=Dette er dine nye nøgler til login
 NewKeyWillBe=Din nye nøgle til login til software vil være
 ClickHereToGoTo=Klik her for at gå til %s
@@ -233,6 +233,8 @@ PermissionsDelete=Tilladelser fjernet
 YourPasswordMustHaveAtLeastXChars=Dit kodeord skal have mindst <strong> %s </ strong> tegn
 YourPasswordHasBeenReset=Dit kodeord er nulstillet
 ApplicantIpAddress=Ansøgerens IP-adresse
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=Eksport område
 AvailableFormats=Tilgængelige formater
diff --git a/htdocs/langs/da_DK/productbatch.lang b/htdocs/langs/da_DK/productbatch.lang
index 84a89742c84..5a320b77183 100644
--- a/htdocs/langs/da_DK/productbatch.lang
+++ b/htdocs/langs/da_DK/productbatch.lang
@@ -1,24 +1,24 @@
 # ProductBATCH language file - en_US - ProductBATCH
-ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot/serial required)
-ProductStatusNotOnBatch=No (lot/serial not used)
+ManageLotSerial=Brug parti / serienummer
+ProductStatusOnBatch=Ja (parti/serienr. påkrævet)
+ProductStatusNotOnBatch=Nej (parti/serienr. ikke brugt)
 ProductStatusOnBatchShort=Ja
 ProductStatusNotOnBatchShort=Nej
-Batch=Lot/Serial
-atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
-batch_number=Lot/Serial number
-BatchNumberShort=Lot/Serial
-EatByDate=Eat-by date
-SellByDate=Sell-by date
-DetailBatchNumber=Lot/Serial details
-printBatch=Lot/Serial: %s
-printEatby=Eat-by: %s
-printSellby=Sell-by: %s
-printQty=Qty: %d
-AddDispatchBatchLine=Add a line for Shelf Life dispatching
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic increase/decrease stock mode is forced to shipping validate and manual dispatching for reception and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use lot/serial number
-ProductLotSetup=Setup of module lot/serial
-ShowCurrentStockOfLot=Show current stock for couple product/lot
-ShowLogOfMovementIfLot=Show log of movements for couple product/lot
-StockDetailPerBatch=Stock detail per lot
+Batch=Parti / Serienr.
+atleast1batchfield=Pluk dato eller Salgs dato eller Volume / Serienummer
+batch_number=Parti / serienummer
+BatchNumberShort=Parti / Seriel
+EatByDate=Pluk dato
+SellByDate=Sidste salgs dato
+DetailBatchNumber=Parti / Serienr. detaljer
+printBatch=Parti / Serienr: %s
+printEatby=Pluk: %s
+printSellby=Solgt af: %s
+printQty=Antal: %d
+AddDispatchBatchLine=Tilføj en linje for lager holdbarhed 
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
+ProductDoesNotUseBatchSerial=Dette produkt bruger ikke parti / serienummer
+ProductLotSetup=Opsætning af modul parti / serie
+ShowCurrentStockOfLot=Vis nuværende lager for par produkt / parti
+ShowLogOfMovementIfLot=Vis log af bevægelser for par produkt / parti
+StockDetailPerBatch=Lager detaljer pr. Parti
diff --git a/htdocs/langs/da_DK/products.lang b/htdocs/langs/da_DK/products.lang
index 8c58f74503a..6d7267a35c4 100644
--- a/htdocs/langs/da_DK/products.lang
+++ b/htdocs/langs/da_DK/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Solgt beløb
 PurchasedAmount=Købt beløb
 NewPrice=Ny pris
 MinPrice=Min. salgspris
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=Salgsprisen kan ikke være lavere end det minimum, der er tilladt for denne vare (%s uden moms). Denne meddelelse kan også ses, hvis du bruger en for høj rabat.
 ContractStatusClosed=Lukket
 ErrorProductAlreadyExists=En vare med reference %s findes allerede.
@@ -155,7 +156,7 @@ BuyingPrices=Købspriser
 CustomerPrices=Kundepriser
 SuppliersPrices=Leverandørpriser
 SuppliersPricesOfProductsOrServices=Leverandørpriser (af varer eller tjenesteydelser)
-CustomCode=Told/Vare/HS-kode
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=Oprindelsesland
 Nature=Natur
 ShortLabel=Kort etiket
diff --git a/htdocs/langs/da_DK/projects.lang b/htdocs/langs/da_DK/projects.lang
index 6515e7e544c..b7dbaf6ec59 100644
--- a/htdocs/langs/da_DK/projects.lang
+++ b/htdocs/langs/da_DK/projects.lang
@@ -77,6 +77,7 @@ Time=Tid
 ListOfTasks=Liste over opgaver
 GoToListOfTimeConsumed=Gå til listen over tid forbrugt
 GoToListOfTasks=Gå til listen over opgaver
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=Liste over tilbud forbundet med projektet
 ListOrdersAssociatedProject=Liste over kundeordrer i forbindelse med projektet
@@ -226,4 +227,4 @@ AllowCommentOnProject=Tillad brugernes kommentarer til projekter
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/da_DK/stocks.lang b/htdocs/langs/da_DK/stocks.lang
index 76f06404c94..9475fb10568 100644
--- a/htdocs/langs/da_DK/stocks.lang
+++ b/htdocs/langs/da_DK/stocks.lang
@@ -203,3 +203,4 @@ RegulateStock=Reguler lager
 ListInventory=Liste
 StockSupportServices=Støtte til lageradministration
 StockSupportServicesDesc=Som standard kan du kun lagre varer af typen "vare". Hvis slået til, og hvis modulet for ydelser er slået til, kan du også lagre varer af typen "ydelse"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/da_DK/stripe.lang b/htdocs/langs/da_DK/stripe.lang
index e70c5a14b2f..05b936d795c 100644
--- a/htdocs/langs/da_DK/stripe.lang
+++ b/htdocs/langs/da_DK/stripe.lang
@@ -58,8 +58,8 @@ NameOnCard=Name on card
 CardNumber=Card Number
 ExpiryDate=Expiry Date
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/da_DK/supplier_proposal.lang b/htdocs/langs/da_DK/supplier_proposal.lang
index a2736b9a211..ff75b7f6b22 100644
--- a/htdocs/langs/da_DK/supplier_proposal.lang
+++ b/htdocs/langs/da_DK/supplier_proposal.lang
@@ -1,55 +1,55 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Leverandørtilbud
-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 supplier proposals
-LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
-SupplierProposalArea=Supplier proposals area
-SupplierProposalShort=Supplier proposal
-SupplierProposals=Supplier proposals
-SupplierProposalsShort=Supplier proposals
-NewAskPrice=New price request
-ShowSupplierProposal=Show price request
-AddSupplierProposal=Create a price request
-SupplierProposalRefFourn=Supplier ref
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
+SupplierProposalNew=Ny prisanmodning
+CommRequest=Prisforespørgsel
+CommRequests=Prisforespørgsler
+SearchRequest=Find en forespørgsel
+DraftRequests=Udkast til anmodninger
+SupplierProposalsDraft=Draft vendor proposals
+LastModifiedRequests=Seneste %s ændrede prisanmodninger
+RequestsOpened=Åbne prisforespørgsler
+SupplierProposalArea=Vendor proposals area
+SupplierProposalShort=Vendor proposal
+SupplierProposals=Vendor proposals
+SupplierProposalsShort=Vendor proposals
+NewAskPrice=Ny prisanmodning
+ShowSupplierProposal=Vis prisforespørgsel
+AddSupplierProposal=Lav en prisforespørgsel
+SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=Leveringsdato
-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=Før du lukker til "Accepted", tænk at forstå leverandørerens referencer.
+ConfirmValidateAsk=Er du sikker på, at du vil validere denne prisforespørgsel under navnet <b> %s </ b>?
+DeleteAsk=Slet forespørgsel
+ValidateAsk=Bekræft anmodning
 SupplierProposalStatusDraft=Udkast (skal valideres)
-SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalStatusValidated=Valideret (anmodningen er åben)
 SupplierProposalStatusClosed=Lukket
-SupplierProposalStatusSigned=Accepted
+SupplierProposalStatusSigned=Accepteret
 SupplierProposalStatusNotSigned=Afviste
 SupplierProposalStatusDraftShort=Udkast til
 SupplierProposalStatusValidatedShort=Valideret
 SupplierProposalStatusClosedShort=Lukket
-SupplierProposalStatusSignedShort=Accepted
+SupplierProposalStatusSignedShort=Accepteret
 SupplierProposalStatusNotSignedShort=Afviste
-CopyAskFrom=Create price request by copying existing a request
-CreateEmptyAsk=Create blank request
-CloneAsk=Clone price 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>?
+CopyAskFrom=Opret pris anmodning ved at kopiere eksisterende en anmodning
+CreateEmptyAsk=Opret blank forespørgsel
+CloneAsk=Klonprisanmodning
+ConfirmCloneAsk=Er du sikker på, at du vil klone prisanmodningen <b> %s </ b>?
+ConfirmReOpenAsk=Er du sikker på, at du vil åbne prisforespørgslen <b> %s </ b> igen?
+SendAskByMail=Send prisforespørgsel pr. Mail
+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=A complete request model (logo...)
-CommercialAsk=Price request
+DocModelAuroreDescription=En komplet anmodningsmodel (logo ...)
+CommercialAsk=Prisforespørgsel
 DefaultModelSupplierProposalCreate=Oprettelse af skabelon
-DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
-DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposals=List of supplier proposal requests
-ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
-SupplierProposalsToClose=Supplier proposals to close
-SupplierProposalsToProcess=Supplier proposals to process
-LastSupplierProposals=Latest %s price requests
-AllPriceRequests=All requests
+DefaultModelSupplierProposalToBill=Standardskabelon ved afslutning af en prisforespørgsel (accepteret)
+DefaultModelSupplierProposalClosed=Standardskabelon ved afslutning af en prisforespørgsel (nægtet)
+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=Seneste %s prisforespørgsler
+AllPriceRequests=Alle anmodninger
diff --git a/htdocs/langs/da_DK/suppliers.lang b/htdocs/langs/da_DK/suppliers.lang
index 8a60fdf9176..fb395d8a860 100644
--- a/htdocs/langs/da_DK/suppliers.lang
+++ b/htdocs/langs/da_DK/suppliers.lang
@@ -1,47 +1,47 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Leverandører
-SuppliersInvoice=Leverandører faktura
-ShowSupplierInvoice=Show Supplier Invoice
-NewSupplier=Ny leverandør
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=Historie
-ListOfSuppliers=Liste over leverandører
-ShowSupplier=Vis leverandør
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=Bestil dato
-BuyingPriceMin=Best buying price
-BuyingPriceMinShort=Best buying price
+BuyingPriceMin=Bedste købspris
+BuyingPriceMinShort=Bedste købspris
 TotalBuyingPriceMinShort=Undervarers købspris i alt
-TotalSellingPriceMinShort=Total of subproducts selling prices
+TotalSellingPriceMinShort=I alt af underproduktpriserne
 SomeSubProductHaveNoPrices=Nogle undervarer har ingen pris defineret
-AddSupplierPrice=Add buying price
-ChangeSupplierPrice=Change buying price
-SupplierPrices=Supplier prices
+AddSupplierPrice=Tilføj købspris
+ChangeSupplierPrice=Skift købspris
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Denne henvisning leverandøren er allerede forbundet med en reference: %s
-NoRecordedSuppliers=Ingen leverandører registreret
-SupplierPayment=Leverandør betaling
-SuppliersArea=Leverandører område
-RefSupplierShort=Ref. leverandør
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=Tilgængelighed
-ExportDataset_fournisseur_1=Leverandør fakturaer listen og fakturaer 'linjer
-ExportDataset_fournisseur_2=Leverandør fakturaer og betalinger
-ExportDataset_fournisseur_3=Supplier orders and order lines
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=Godkende denne ordre
-ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
-DenyingThisOrder=Deny this order
-ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
-ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
-AddSupplierOrder=Opret leverandør for
-AddSupplierInvoice=Opret leverandørens faktura
-ListOfSupplierProductForSupplier=Liste over produkter og priser for <b>leverandørens %s</b>
-SentToSuppliers=Send til leverandører
-ListOfSupplierOrders=Liste over leverandør ordrer
-MenuOrdersSupplierToBill=Leverandør ordrer der kan faktureres
-NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-SupplierReputation=Supplier reputation
-DoNotOrderThisProductToThisSupplier=Do not order
-NotTheGoodQualitySupplier=Wrong quality
-ReputationForThisProduct=Reputation
-BuyerName=Buyer name
-AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=Supplier prices
+ConfirmApproveThisOrder=Er du sikker på, at du vil godkende ordre <b> %s </ b>?
+DenyingThisOrder=Afvis denne ordre
+ConfirmDenyingThisOrder=Er du sikker på, at du vil nægte denne ordre <b> %s </ b>?
+ConfirmCancelThisOrder=Er du sikker på, at du vil annullere denne ordre <b> %s </ b>?
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
+NbDaysToDelivery=Leveringsforsinkelse i dage
+DescNbDaysToDelivery=Den største leveringsforsinkelse af produkterne fra denne ordre
+SupplierReputation=Vendor reputation
+DoNotOrderThisProductToThisSupplier=Bestil ikke
+NotTheGoodQualitySupplier=Forkert kvalitet
+ReputationForThisProduct=Omdømme
+BuyerName=Navn på køber
+AllProductServicePrices=Alle produkt- / servicepriser
+AllProductReferencesOfSupplier=Alle produkt / service referencer af leverandør
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/da_DK/website.lang b/htdocs/langs/da_DK/website.lang
index 1e884785c4a..3e1955ef236 100644
--- a/htdocs/langs/da_DK/website.lang
+++ b/htdocs/langs/da_DK/website.lang
@@ -73,7 +73,7 @@ AnotherContainer=En anden beholder
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
diff --git a/htdocs/langs/da_DK/workflow.lang b/htdocs/langs/da_DK/workflow.lang
index e5b47d769c4..7dec31d397f 100644
--- a/htdocs/langs/da_DK/workflow.lang
+++ b/htdocs/langs/da_DK/workflow.lang
@@ -1,20 +1,20 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Workflow-modul opsætning
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
-ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+WorkflowDesc=Dette modul er designet til at ændre adfærd fra automatiske handlinger til applikation. Som standard er workflow åben (du kan gøre ting i den rækkefølge, du ønsker). Du kan aktivere de automatiske handlinger, du er interesseret i.
+ThereIsNoWorkflowToModify=Der er ingen arbejdsgang ændringer tilgængelige med de aktiverede moduler.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed (new order will have same amount than proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Opret automatisk en kundeordre efter at et kommercielt forslag er underskrevet (ny ordre vil have samme beløb som forslag)
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Opret automatisk en kundefaktura, når et tilbud er blevet underskrevet (den nye faktura vil få overført beløb fra tilbuddet)
-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 customer order is closed (new invoice will have same amount than order)
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Opret automatisk en kundefaktura efter en kontrakt er valideret
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Opret automatisk en kundefaktura efter en kundeordre er lukket (ny faktura vil have samme beløb som ordre)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer order is set to billed (and if amount of the order is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Klassificer tilsluttede kildeforslag (er) for fakturering, når kundeservicen er indstillet til fakturering (og hvis størrelsen af ​​ordren er den samme som det samlede beløb af underskrevne linkede forslag)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Klassificer sammekædet kildeforslag(er) til fakturering, når kundefakturaen er valideret (og hvis fakturaens størrelse er den samme som det samlede beløb af underskrevne linkede forslag)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Klassificer sammekædet kundeordre(r) til fakturering, når kunde fakturaen er valideret (og hvis fakturaens størrelse er den samme som det samlede antal sammenkædede ordrer)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Klassificer sammekædet kundeordre(r) til fakturering, når kundens faktura er sat til betaling (og hvis antal af faktura er den samme som det samlede antal sammekædet ordrer)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Klassificer sammekædet kilde kundeordre til afsendelse, når en forsendelse er valideret (og hvis mængden afsendt af alle forsendelser er den samme som i den rækkefølge, der skal opdateres)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
-AutomaticCreation=Automatic creation
-AutomaticClassification=Automatic classification
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+AutomaticCreation=Automatisk oprettelse
+AutomaticClassification=Automatisk klassificering
diff --git a/htdocs/langs/de_AT/admin.lang b/htdocs/langs/de_AT/admin.lang
index 2d579a01bca..c10648e6811 100644
--- a/htdocs/langs/de_AT/admin.lang
+++ b/htdocs/langs/de_AT/admin.lang
@@ -25,8 +25,6 @@ Module80Name=Sendungen
 Module310Desc=Mitgliederverwaltun
 Module330Name=Lesezeichen
 Module330Desc=Bookmarks-Verwaltung
-Module500Name=Steuern, Sozialbeiträge und Dividenden
-Module500Desc=Steuer-, Sozialbeitrags- und Dividendenverwaltung
 Module50100Name=Kassa
 Permission31=Produkte/Services einsehen
 Permission32=Produkte/Services erstellen/bearbeiten
@@ -103,3 +101,5 @@ FreeLegalTextOnInterventions=Freier Rechtstext für Eingriffe
 WatermarkOnDraftInterventionCards=Wasserzeichen auf Intervention Karte Dokumente (alle, wenn leer)
 ClickToDialSetup=Click-to-Dial-Moduleinstellungen
 PathToGeoIPMaxmindCountryDataFile=Pfad zur Datei mit Maxmind IP to Country Übersetzung. <br> Beispiel: / usr / local / share / GeoIP / GeoIP.dat
+MailToSendShipment=Sendungen
+MailToSendIntervention=Eingriffe
diff --git a/htdocs/langs/de_AT/companies.lang b/htdocs/langs/de_AT/companies.lang
index ac0018979e8..6563ebabda4 100644
--- a/htdocs/langs/de_AT/companies.lang
+++ b/htdocs/langs/de_AT/companies.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - companies
-NewCompany=Neuer Partner (Leads, Kunden, Lieferanten)
 IdCompany=Firma ID
 Companies=Partner
 UserTitle=Titel
diff --git a/htdocs/langs/de_AT/ecm.lang b/htdocs/langs/de_AT/ecm.lang
index 8597c527699..bfb47abf032 100644
--- a/htdocs/langs/de_AT/ecm.lang
+++ b/htdocs/langs/de_AT/ecm.lang
@@ -2,6 +2,4 @@
 ECMSectionsManual=Manuelle Verzeichnisse
 ECMSectionsAuto=Automatische Verzeichnisse
 ECMNbOfFilesInSubDir=Anzahl der Dateien im Unterverzeichnis
-ECMArea=ECM-Übersicht
-ECMAreaDesc=Das ECM (Electronic Content Management)-System erlaubt Ihnen das Speichern, Teilen und rasche Auffinden von Dokumenten.
 ECMAreaDesc2=* Automatische Verzeichnisse werden automatisch befüllt, wenn Sie Dokumente von der Karte eines Elements erstellen. <br> * Manuelle Verzeichnisse können Sie dazu nutzen, nicht mit anderen Elementen verbundene Dokumente zu speichern.
diff --git a/htdocs/langs/de_AT/errors.lang b/htdocs/langs/de_AT/errors.lang
index 517621afb5d..c12f8165eaf 100644
--- a/htdocs/langs/de_AT/errors.lang
+++ b/htdocs/langs/de_AT/errors.lang
@@ -4,5 +4,4 @@ ErrorBadUrl=Url %s ist ungültig
 ErrorRecordNotFound=Eintrag nicht gefunden.
 ErrorCashAccountAcceptsOnlyCashMoney=Dies ist ein Bargeldkonto (Kassa) und akzeptiert deshalb nur Bargeldtransaktionen.
 ErrorCustomerCodeAlreadyUsed=Diese Kunden Nr. ist bereits vergeben.
-ErrorSupplierCodeRequired=Lieferanten Nr. erforderlich
 WarningUntilDirRemoved=Diese Warnung bleibt so lange aktiv, wie dieses Verzeichnis existiert (nur für Administratoren).
diff --git a/htdocs/langs/de_AT/ldap.lang b/htdocs/langs/de_AT/ldap.lang
index 2b8abcdaf87..5ed6488c3dc 100644
--- a/htdocs/langs/de_AT/ldap.lang
+++ b/htdocs/langs/de_AT/ldap.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Domainpasswort
 ForceSynchronize=Erzwinge System-LDAP-Synchronisation
diff --git a/htdocs/langs/de_AT/main.lang b/htdocs/langs/de_AT/main.lang
index b82edb31dba..8a51e29cb85 100644
--- a/htdocs/langs/de_AT/main.lang
+++ b/htdocs/langs/de_AT/main.lang
@@ -8,8 +8,8 @@ FormatDateShort=%d/%m/%Y
 FormatDateShortInput=%d/%m/%Y
 FormatDateShortJava=dd/MM/yyyy
 FormatDateShortJavaInput=dd/MM/yyyy
-FormatDateShortJQuery=dd/MM/yy
-FormatDateShortJQueryInput=dd/MM/yy
+FormatDateShortJQuery=dd/mm/yy
+FormatDateShortJQueryInput=dd/mm/yy
 FormatHourShortJQuery=HH:MI
 FormatHourShort=%H:%M
 FormatHourShortDuration=%H:%M
@@ -52,7 +52,6 @@ TotalTTC=Summe (inkl. MwSt.)
 TotalVAT=Steuer gesamt
 VAT=MwSt.
 Ref=Bezeichnung
-RefSupplier=Lieferanten Nr.
 RefPayment=Zahlungs Nr.
 Qty=Mng.
 Drafts=Entwurf
diff --git a/htdocs/langs/de_AT/orders.lang b/htdocs/langs/de_AT/orders.lang
index 2e11a5c151e..3ebd9a52d35 100644
--- a/htdocs/langs/de_AT/orders.lang
+++ b/htdocs/langs/de_AT/orders.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - orders
 OrderLine=Bestellposition
 OrderToProcess=Zu bearbeitende Bestellung
+CustomerOrder=Ablehnung durch Kontoinhaber
 OrdersInProcess=Bestellunen in Bearbeitung
 StatusOrderValidatedShort=Bestätigt
 StatusOrderValidated=Bestätigt
@@ -13,6 +14,4 @@ TypeContact_commande_internal_SALESREPFOLL=Kundenauftrags-Nachverfolgung durch V
 TypeContact_commande_external_BILLING=Debitorenrechnung Kontakt
 TypeContact_commande_external_SHIPPING=Customer Versand Kontakt
 TypeContact_commande_external_CUSTOMER=Bestellungs-Nachverfolgung durch Kundenkontakt
-TypeContact_order_supplier_internal_SALESREPFOLL=Lieferantenbestellungs-Nachverfolgung durch Vertreter
-TypeContact_order_supplier_external_SHIPPING=Supplier Versand Kontakt
 PDFEinsteinDescription=Eine vollständige Bestellvorlage (Logo, ...)
diff --git a/htdocs/langs/de_AT/suppliers.lang b/htdocs/langs/de_AT/suppliers.lang
deleted file mode 100644
index ecc72de0edf..00000000000
--- a/htdocs/langs/de_AT/suppliers.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - suppliers
-RefSupplierShort=Lieferanten Nr.
-AddSupplierInvoice=Erzeuge Lieferantenrechnung
diff --git a/htdocs/langs/de_CH/admin.lang b/htdocs/langs/de_CH/admin.lang
index a869d00e737..aa5af2e952f 100644
--- a/htdocs/langs/de_CH/admin.lang
+++ b/htdocs/langs/de_CH/admin.lang
@@ -69,7 +69,6 @@ MAIN_MAIL_EMAIL_STARTTLS=TLS (STARTTLS) Verschlüsselung verwenden
 SubmitTranslation=Wenn die Übersetzung der Sprache unvollständig ist oder wenn Sie Fehler finden, können Sie können Sie die entsprechenden Sprachdateien im Verzeichnis <b>langs/%s</b> korrigieren und und anschliessend Ihre Änderungen unter  www.transifex.com/dolibarr-association/dolibarr/ teilen.
 SubmitTranslationENUS=Sollte die Übersetzung für eine Sprache nicht vollständig sein oder Fehler beinhalten, können Sie die entsprechenden Sprachdateien im Verzeichnis <b>langs/%s</b>  bearbeiten und anschliessend Ihre Änderungen an dolibarr.org/forum oder für Entwickler auf github.com/Dolibarr/dolibarr. übertragen.
 ModuleFamilyCrm=Kundenverwaltung (CRM)
-ModuleFamilySrm=Lieferantenverwaltung (SRM)
 CallUpdatePage=Zur Aktualisierung der Daten und der Datenbankstruktur gehen Sie zur Seite %s.
 GenericMaskCodes=Sie können ein beliebiges Numerierungsschema wählen. Dieses Schema könnte z.B. so aussehen:<br><b>{000000}</b> steht für eine 6-stellige Nummer, die sich bei jedem neuen %s automatisch erhöht. Wählen Sie die Anzahl der Nullen je nach gewünschter Nummernlänge. Der Zähler füllt sich automatisch bis zum linken Ende mit Nullen um das gewünschte Format abzubilden. <br><b>{000000+000}</b> führt zu einem ähnlichen Ergebnis, allerdings mit einem Wertsprung in Höhe des Werts rechts des Pluszeichens, der beim ersten %s angewandt wird. <br><b>{000000@x}</b> wie zuvor, jedoch stellt sich der Zähler bei Erreichen des Monats x (zwischen 1 und 12) automatisch auf 0 zurück. Ist diese Option gewählt und x hat den Wert 2 oder höher, ist die Folge {mm}{yy} or {mm}{yyyy} ebenfalls erfoderlich. <br><b>{dd}</b> Tag (01 bis 31).<br><b>{mm}</b> Monat (01 bis 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> Jahreszahl 1-, 2- oder 4-stellig. <br>
 GenericMaskCodes2=<b>{cccc}</b> der Kunden-Code mit n Zeichen<br><b>{cccc000}</b> der Kunden-Code mit n Zeichen, gefolgt von der dem Kunden zugeordneten Partner ID. Dieser Zähler wird gleichzeitig mit dem Globalen Zähler zurückgesetzt.<br><b>{tttt}</b> Die Partner ID mit n Zeichen (siehe unter Einstellungen->Stammdaten->Arten von Partnern). Wenn diese Option aktiv ist, wird für jede Partnerart ein separater Zähler geführt.<br>
@@ -77,7 +76,6 @@ GenericMaskCodes4b=<u>Beispiel für Dritte erstellt am 2007-03-01:</u> <br>
 UMaskExplanation=Über diesen Parameter können Sie die standardmässigen Dateiberechtigungen für vom System erzeugte/verwaltete Inhalte festlegen. <br>Erforderlich ist ein Oktalwert (0666 bedeutet z.B. Lesen und Schreiben für alle). <br>Auf Windows-Umgebungen haben diese Einstellungen keinen Effekt.
 ConfirmPurge=Möchten Sie wirklich endgültig löschen?<br> Alle Dateien werden unwiderbringlich gelöscht (Attachments, Angebote, Rechnungen usw.)
 DescWeather=Die folgenden Diagramme werden auf der Übersicht Startseite angezeigt, wenn die entsprechenden Toleranzwerte erreicht werden:
-HideAnyVATInformationOnPDF=Unterdrücken aller MwSt.-Informationen auf dem generierten PDF
 HideLocalTaxOnPDF=Unterdrücke %s Satz in der PDF Steuerspalte
 HideDetailsOnPDF=Unterdrücke Produktzeilen in generierten PDF
 PlaceCustomerAddressToIsoLocation=ISO Position für die Kundenadresse verwenden
@@ -188,7 +186,6 @@ AddRefInList=Darstellung Kunden- /Lieferanten- Nr. in Listen (Listbox oder Combo
 AskForPreferredShippingMethod=Bevorzugte Kontaktmethode bei Partnern fragen.
 PasswordGenerationNone=Keine automatische Passwortvorschläge, das Passwort muss manuell eingegeben werden.
 HRMSetup=HRM Modul Einstellungen
-CompanyCodeChecker=Modul für Geschäftspartner-Code-Erstellung (Kunden oder Lieferanten)
 CompanyIdProfChecker=Berufs-Identifikation einzigartige
 SuggestPaymentByRIBOnAccount=Zahlung per Lastschrift vorschlagen
 SuggestPaymentByChequeToAddress=Zahlung per Scheck vorschlagen
@@ -241,10 +238,11 @@ TasksNumberingModules=Aufgaben-Nummerierungs-Modul
 NbMajMin=Mindestanzahl Grossbuchstaben
 TemplatePDFExpenseReports=Dokumentvorlagen zur Spesenabrechnung Dokument erstellen
 HighlightLinesColor=Farbe des Highlight Effekt bei Mausbewegung (wählen sie keine für keinen Highlight Effekt)
-TextTitleColor=Farbe des Seitentitels
 LinkColor=Linkfarbe
 NbAddedAutomatically=Anzahl Tage die den Benutzern jeden Monat automatisch dazuaddiert werden
-MailToSendIntervention=Um Interventions zu schicken
+MailToSendProposal=Angebote Kunde
+MailToSendIntervention=Arbeitseinsätze
+MailToThirdparty=Geschäftspartner
 ModelModulesProduct=Vorlage für Produktdokumente
 ToGenerateCodeDefineAutomaticRuleFirst=Um automatisch Barcodenummern zu generieren, muss zuerst ein Nummerierungmodul im Barcodemodul definiert werden.
 SeeSubstitutionVars=Siehe * für eine Liste der Verfügbaren Variablen
diff --git a/htdocs/langs/de_CH/companies.lang b/htdocs/langs/de_CH/companies.lang
index 765b9737c53..244a92b0f58 100644
--- a/htdocs/langs/de_CH/companies.lang
+++ b/htdocs/langs/de_CH/companies.lang
@@ -1,8 +1,6 @@
 # Dolibarr language file - Source file is en_US - companies
 SelectThirdParty=Wähle einen Geschäftspartner
 MenuNewThirdParty=Neuer Geschäftspartner
-NewThirdParty=Neuer Geschäftspartner (Leads, Kunden, Lieferanten)
-CreateDolibarrThirdPartySupplier=Neuen Geschäftspartner erstellen (Lieferant)
 CreateThirdPartyOnly=Geschäftspartner erstellen
 IdThirdParty=Geschäftspartner ID
 IdCompany=Unternehmens ID
@@ -17,14 +15,11 @@ ThirdPartyType=Typ des Geschäftspartners
 PostOrFunction=Position
 PhoneShort=Telefon
 No_Email=Keine E-Mail-Kampagnen
-ThirdpartyNotCustomerNotSupplierSoNoRef=Adresse ist weder Kunde noch Lieferant, keine Objekte zum Verknüpfen verfügbar
 OverAllSupplierProposals=Generelle Preisanfragen
 LocalTax1IsUsed=Zweite Steuer verwenden
 LocalTax2IsUsed=Dritte Steuer nutzen
 WrongCustomerCode=Kunden-Code ungültig
-WrongSupplierCode=Lieferanten-Code ungültig
 CustomerCodeModel=Kunden-Code-Modell
-SupplierCodeModel=Lieferanten-Code Modell
 ProfId1AR=Prof Id 1 (CUIT)
 ProfId2AR=Prof Id 2 (Revenu Bestien)
 ProfId1AT=Prof Id 1
@@ -76,9 +71,7 @@ NoContactDefined=Kein Kontakt vorhanden
 AddThirdParty=Geschäftspartner erstellen
 CustomerCode=Kunden-Nummer
 CustomerCodeShort=Kunden-Nr.
-SupplierCodeShort=Lieferanten-Nr.
 RequiredIfCustomer=Erforderlich falls Geschäftspartner Kunde oder Interessent ist
-RequiredIfSupplier=Erforderlich falls Geschäftspartner Lieferant ist
 ListOfThirdParties=Liste der Geschäftspartner
 ShowContact=Zeige Kontaktangaben
 ContactForOrdersOrShipments=Bestellungs- oder Lieferkontakt
diff --git a/htdocs/langs/de_CH/dict.lang b/htdocs/langs/de_CH/dict.lang
index ff6afe3e5e0..07a3cdfd4b8 100644
--- a/htdocs/langs/de_CH/dict.lang
+++ b/htdocs/langs/de_CH/dict.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - dict
-CountryGB=Grossbritannien
 CountryBY=Weissrussland
 CountryHM=Heard und McDonald Inseln
diff --git a/htdocs/langs/de_CH/ecm.lang b/htdocs/langs/de_CH/ecm.lang
index 8e33df67a00..dae004fa8b9 100644
--- a/htdocs/langs/de_CH/ecm.lang
+++ b/htdocs/langs/de_CH/ecm.lang
@@ -6,7 +6,6 @@ ECMSectionsManual=Manuelle Hierarchie
 ECMSectionsAuto=Automatische Hierarchie
 ECMNbOfFilesInDir=Anzahl der Dateien in Ordner
 ECMNbOfSubDir=Anzahl der Unterordner
-ECMAreaDesc=Das EDM (Elektronisches Dokumenten Management)-System erlaubt Ihnen Speichern, Teilen und rasches Auffinden von allen Dokumenten im Dolibarr.
 ECMAreaDesc2=* In den automatischen Verzeichnissen werden die vom System erzeugeten Dokumente abgelegt. <br> * Die manuellen Verzeichnisse können Sie selbst verwalten und zusätzliche nicht direkt zuordenbare Dokument hinterlegen.
 ECMSectionWasRemoved=Der Ordner <b>%s</b> wurde gelöscht.
 ECMSearchByKeywords=Suche nach Stichwörter
diff --git a/htdocs/langs/de_CH/errors.lang b/htdocs/langs/de_CH/errors.lang
index c9a1034fad6..7eec7013d05 100644
--- a/htdocs/langs/de_CH/errors.lang
+++ b/htdocs/langs/de_CH/errors.lang
@@ -16,7 +16,6 @@ ErrorForbidden3=Es scheint keine ordnungsgemässe Authentifizierung für das Sys
 ErrorDateMustBeBeforeToday=Datum darf nicht in der Zukunft sein
 ErrorWarehouseRequiredIntoShipmentLine=Warenlager ist auf der Lieferzeile erforderlich.
 ErrorFileMustHaveFormat=Datei muss das Format %s haben
-ErrorSupplierCountryIsNotDefined=Zu diesem Lieferant ist kein Land definiert. Bitte korrigieren Sie dies zuerst.
 ErrorsThirdpartyMerge=Die zwei Einträge können nicht zusammengeführt werden. Aktion abgebrochen.
 WarningBookmarkAlreadyExists=Ein Lesezeichen mit diesem Titel oder Ziel (URL) existiert bereits.
 WarningPassIsEmpty=Warnung: Derzeit ist kein Datenbankpasswort gesetzt. Dies ist eine Sicherheitslücke. Konfigurieren Sie ehestmöglich ein Passwort für den Datenbankzugriff und passen Sie Ihre conf.php entsprechend an.
diff --git a/htdocs/langs/de_CH/loan.lang b/htdocs/langs/de_CH/loan.lang
index e6cab3ae366..cbaad3bc2e6 100644
--- a/htdocs/langs/de_CH/loan.lang
+++ b/htdocs/langs/de_CH/loan.lang
@@ -1,5 +1,2 @@
 # Dolibarr language file - Source file is en_US - loan
 ShowLoanPayment=Zeige Kreidtauszahlung
-PurchaseFinanceInfo=Kauf und Finanzierungs Inforamtionen
-ShowMeCalculationsAndAmortization=Zeigen Sie mir die Berechnungen und Amortization
-AmortizationPaymentDesc=Die <a href="#amortization">Amortisation</a> reisst ab wie viel von Ihrer monatlichen Zahlung geht für die Bankzinsen, und wie viel für die Tilgung des Haupt-Darlehen geht.
diff --git a/htdocs/langs/de_CH/main.lang b/htdocs/langs/de_CH/main.lang
index 4f8e320d1c1..d99a7bb54a2 100644
--- a/htdocs/langs/de_CH/main.lang
+++ b/htdocs/langs/de_CH/main.lang
@@ -8,8 +8,8 @@ FormatDateShort=%d.%m.%Y
 FormatDateShortInput=%d.%m.%Y
 FormatDateShortJava=dd.MM.yyyy
 FormatDateShortJavaInput=dd.MM.yyyy
-FormatDateShortJQuery=dd.MM.yy
-FormatDateShortJQueryInput=dd.MM.yy
+FormatDateShortJQuery=dd.mm.yy
+FormatDateShortJQueryInput=dd.mm.yy
 FormatHourShortJQuery=HH:MI
 FormatHourShort=%H:%M
 FormatHourShortDuration=%H:%M
@@ -38,6 +38,7 @@ Close=Schliessen
 CloseBox=Box vom Startbildschirm entfernen
 ValidateAndApprove=Freigeben und bestätigen
 Valid=Freigabe
+Connection=Anmeldung
 DateToday=Aktuelles Datum
 DateStart=Startdatum
 DateEnd=Enddatum
@@ -90,7 +91,6 @@ CloseWindow=Fenster schliessen
 SendAcknowledgementByMail=Bestätigungsemail senden
 NoMobilePhone=Kein Mobiltelefon
 YouCanSetDefaultValueInModuleSetup=Standardwerte für neue Datensätzen können im Modulsetup eingestellt werden
-MenuAccountancy=Rechnungswesen
 CurrentTheme=Aktuelle Oberfläche
 CreditCard=Kreditkarte
 FieldsWithIsForPublic=Felder mit <b>%s</b> sind für Mitglieder öffentlich sichtbar. Über die "Öffentlich"-Checkbox können Sie dies ändern.
diff --git a/htdocs/langs/de_CH/orders.lang b/htdocs/langs/de_CH/orders.lang
index 4c9c4e4a20b..a35e1bf9cb3 100644
--- a/htdocs/langs/de_CH/orders.lang
+++ b/htdocs/langs/de_CH/orders.lang
@@ -4,5 +4,4 @@ OrderCard=Bestell-Karte
 CancelOrder=Bestellung verwerfen
 NoOrder=Keine Bestellung
 CloseOrder=Bestellung schliessen
-RefOrderSupplier=Bestellreferenz für Lieferant
 Error_OrderNotChecked=Keine zu verrechnenden Bestellungen ausgewählt
diff --git a/htdocs/langs/de_CH/supplier_proposal.lang b/htdocs/langs/de_CH/supplier_proposal.lang
index 5c05c13ad03..5f2fe09a15e 100644
--- a/htdocs/langs/de_CH/supplier_proposal.lang
+++ b/htdocs/langs/de_CH/supplier_proposal.lang
@@ -1,18 +1,12 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Angebot Lieferant
-supplier_proposalDESC=Preisanfragen Lieferant verwalten
 SupplierProposalNew=Neue Preisanfrage
 CommRequest=Generelle Preisanfrage
 CommRequests=Generelle Preisanfragen
 SearchRequest=Anfragen finden
 DraftRequests=Entwürfe Preisanfragen
 RequestsOpened=Offene Preisanfragen
-SupplierProposalShort=Angebot Lieferant
-SupplierProposals=Angebote Lieferant
-SupplierProposalsShort=Angebote Lieferant
 NewAskPrice=Neue Preisanfrage
 ShowSupplierProposal=Preisanfrage zeigen
-SupplierProposalRefFourn=Lieferanten-Nr.
 SupplierProposalRefFournNotice=Bevor die Preisanfrage mit "Angenommen" abgeschlossen wird, sollten Referenzen zum Lieferant eingeholt werden.
 ValidateAsk=Anfrage bestätigen
 SupplierProposalStatusDraft=Entwürfe (benötigen Bestätigung)
diff --git a/htdocs/langs/de_CH/suppliers.lang b/htdocs/langs/de_CH/suppliers.lang
index f29080cd177..36a3b8efc3c 100644
--- a/htdocs/langs/de_CH/suppliers.lang
+++ b/htdocs/langs/de_CH/suppliers.lang
@@ -1,9 +1,5 @@
 # Dolibarr language file - Source file is en_US - suppliers
 TotalBuyingPriceMinShort=Summe der Einkaufspreise der Unterprodukte
-SupplierPrices=Lieferanten Preise
-RefSupplierShort=Ref . Lieferant
-SupplierReputation=Lieferantenbewertung
 DoNotOrderThisProductToThisSupplier=Nicht bestellen
 NotTheGoodQualitySupplier=Falsche Menge
 ReputationForThisProduct=Bewertung
-BuyingPriceNumShort=Lieferanten Preise
diff --git a/htdocs/langs/de_DE/accountancy.lang b/htdocs/langs/de_DE/accountancy.lang
index 1a08317710a..cd3b368177c 100644
--- a/htdocs/langs/de_DE/accountancy.lang
+++ b/htdocs/langs/de_DE/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Buchhaltung
 ACCOUNTING_EXPORT_SEPARATORCSV=Spaltentrennzeichen für die Exportdatei
 ACCOUNTING_EXPORT_DATE=Datumsformat der Exportdatei
 ACCOUNTING_EXPORT_PIECE=Stückzahl exportieren
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Konto mit Werten != 0
 ListOfAccounts=Kontenpläne
 
 MainAccountForCustomersNotDefined=Standardkonto für Kunden im Setup nicht definiert
-MainAccountForSuppliersNotDefined=Standardkonto für Lieferanten ist im Setup nicht definiert
+MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
 MainAccountForUsersNotDefined=STandardkonto für Benutzer ist im Setup nicht definiert
 MainAccountForVatPaymentNotDefined=Standardkonto für MWSt Zahlungen ist im Setup nicht definiert
 
-AccountancyArea=Buchhaltung
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Die Verwendung des Buchhaltungsmoduls erfolgt in mehreren Schritten:
 AccountancyAreaDescActionOnce=Die folgenden Aktionen werden üblicherweise nur ein Mal ausgeführt, oder jährlich...
 AccountancyAreaDescActionOnceBis=Die nächsten Schritte sollten getan werden, um Ihnen in Zukunft  Zeit zu sparen, indem Sie Ihnen das korrekte Standardbuchhaltungskonto vorschlagen, wenn Sie die Journalisierung (Schreiben des Buchungsjournal und des Hauptbuchs) machen.
@@ -89,7 +90,7 @@ MenuProductsAccounts=Produkt Erlöskonten
 ProductsBinding=Produkt Konten
 Ventilation=Zu Konten zusammenfügen 
 CustomersVentilation=Kundenrechnungen zuordnen
-SuppliersVentilation=Lieferantenrechnungen zusammenfügen
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Spesenabrechnung Zuordnung
 CreateMvts=Neue Transaktion erstellen
 UpdateMvts=Änderung einer Transaktion
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=Eingangsrechnungen
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Verschiedenes Journal
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Spesenabrechnung Journal
 ACCOUNTING_SOCIAL_JOURNAL=Sozial-Journal
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Buchhaltungskonten für Transferierung
 ACCOUNTING_ACCOUNT_SUSPENSE=Buchhaltungskonten in Wartestellung
@@ -185,11 +187,12 @@ ListeMvts=Liste der Bewegungen
 ErrorDebitCredit=Soll und Haben können nicht gleichzeitig eingegeben werden
 AddCompteFromBK=Buchhaltungskonten zur Gruppe hinzufügen
 ReportThirdParty=Zeige Partner
-DescThirdPartyReport=Kontieren Sie hier die Liste der Kunden und Lieferanten zu Ihrem Buchhaltungs-Konten
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=Liste der Abrechnungskonten
 UnknownAccountForThirdparty=Unbekanntes Konto, %s wird verwendet
 UnknownAccountForThirdpartyBlocking=Unbekanntes Konto, weiterfahren nicht möglich
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Kontenklasse
 Pcgsubtype=Unterkontenklasse
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Kontieren Sie hier die Liste der Kundenrechnungszeilen zu
 DescVentilTodoCustomer=Kontiere nicht bereits kontierte Rechnungspositionen mit einem  Buchhaltung Erlös-Konto
 ChangeAccount=Ändere das Artikel Buchhaltungskonto für die ausgewählten Zeilen mit dem folgenden Buchhaltungskonto:
 Vide=-
-DescVentilSupplier=Kontieren Sie hier die Liste der Lieferantenrechnungszeilen gebunden oder nicht, zu einem Buchhaltungs-Konto 
-DescVentilDoneSupplier=Kontieren Sie hier die Liste der Zeilen von Lieferantenrechnungen zu ihren Buchhaltungs-Konten
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Binde Spesenabrechnungspositionen die nicht gebunden mit einem Buchhaltungs-Konto
 DescVentilExpenseReport=Kontieren Sie hier in der Liste Spesenabrechnungszeilen  gebunden (oder nicht) zu Ihren Buchhaltungs-Konten
 DescVentilExpenseReportMore=Wenn Sie beim Buchhaltungskonto den Typen Spesenabrechnungpositionen eingestellt haben, wird die Applikation alle Kontierungen zwischen den Spesenabrechnungspositionen und dem Buchhaltungskonto von Ihrem Kontenrahmen verwenden, durch einen einzigen Klick auf die Schaltfläche <strong> "%s" </strong>. Wenn kein Konto definiert wurde unter Stammdaten / Gebührenarten oder wenn Sie einige Zeilen nicht zu irgendeinem automatischen Konto gebunden haben, müssen Sie die Zuordnung manuell aus dem Menü  "<strong> %s </strong>“ machen.
@@ -215,7 +218,7 @@ ValidateHistory=automatisch verbinden
 AutomaticBindingDone=automatische Zuordnung erledigt
 
 ErrorAccountancyCodeIsAlreadyUse=Fehler, Sie können dieses Buchhaltungskonto nicht löschen, da es benutzt wird.
-MvtNotCorrectlyBalanced=Der Saldo der Buchung ist nicht ausgeglichen. Haben = %s. Soll = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Zuordnungs Karte
 GeneralLedgerIsWritten=Operationen werden ins Hauptbuch geschrieben
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -293,4 +296,9 @@ Binded=Zeilen verbunden
 ToBind=Zeilen für Zuordnung
 UseMenuToSetBindindManualy=Automatische Kontierung nicht möglich, verwende das Menü <a href="%s">%s</a> um die Zuweisung manuell zu machen
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Warnung: Dieser Bericht basiert nicht auf dem Hauptbuch, daruch werden keine im Hauptbuch veränderten Buchungen berücksichtigt. Wenn die Buchhaltung aktuell ist, ist die Buchhaltungsansicht aussagekräftiger.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
index 2acd876d91c..00a9d3ce4ad 100644
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=SMTP-Host (standardmäßig in php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS-Port (nicht in PHP definiert in Unix-Umgebungen)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP-Host (nicht in PHP definiert auf Unix-Umgebungen)
 MAIN_MAIL_EMAIL_FROM=E-Mail-Absender für automatisch erzeugte Mails (standardmäßig in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=E-Mailadresse, die in E-Mails als Feld "Fehler an" verwendet wird
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= Senden Sie automatisch eine Blindkopie aller gesendeten Mails an
 MAIN_DISABLE_ALL_MAILS=Alle E-Mail-Funktionen deaktivieren (für Test- oder Demozwecke)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=Methode zum Senden von E-Mails
 MAIN_MAIL_SMTPS_ID=SMTP ID, wenn Authentifizierung erforderlich
 MAIN_MAIL_SMTPS_PW=SMTP Passwort, wenn Authentifizierung erforderlich
@@ -291,7 +292,7 @@ ModuleSetup=Moduleinstellung
 ModulesSetup=Modul-/Applikationseinstellung
 ModuleFamilyBase=System
 ModuleFamilyCrm=Kunden-Beziehungs-Management (CRM)
-ModuleFamilySrm=Lieferantenmanagement (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Produktverwaltung (WW)
 ModuleFamilyHr=Personalverwaltung (PM)
 ModuleFamilyProjects=Projektverwaltung/Zusammenarbeit
@@ -373,7 +374,8 @@ NoSmsEngine=Kein SMS Sende Manager verfügbar. SMS Sende Manager sind nicht inst
 PDF=PDF
 PDFDesc=Sie können jede globale Optionen im Zusammenhang mit der PDF-Erzeugung einstellen
 PDFAddressForging=Regeln zum Formen der Adresse-Boxen
-HideAnyVATInformationOnPDF=Unterdrücken aller USt.-Informationen auf dem generierten PDF
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Regeln für %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=Unterdrücke Produktbeschreibungen in generierten PDF
@@ -445,12 +447,13 @@ DisplayCompanyInfo=Firmenadresse anzeigen
 DisplayCompanyManagers=Anzeige Namen der Geschäftsführung
 DisplayCompanyInfoAndManagers=Firmenanschrift und Managernamen anzeigen
 EnableAndSetupModuleCron=Um wiederkehrende Rechnungen automatisch zu generieren, muss Modul *%s* aktiviert und korrekt eingerichtet sein. Ansonsten müssen die Rechnungen via *Erstellen* Knopf auf dieser Vorlage erstellt werden. Auch wenn die Rechnungen automatisch generiert werden, können trotzdem noch manuelle Rechnungen erstellt werden. Die Perioden werden nicht doppelt in Rechnung gestellt.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Leeren Kontierungscode zurückgeben.
 ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
 Use3StepsApproval=Standardmäßig, Einkaufsaufträge müssen durch zwei unterschiedlichen Benutzer erstellt und freigegeben werden (ein Schritt/Benutzer zu erstellen und ein Schritt/Benutzer für die Freigabe). Beachten Sie wenn ein Benutzer beide Rechte hat - zum erstellen und freigeben, dann reicht ein Benutzer für diesen Vorgang. Optional können Sie ein zusätzlicher Schritt/User für die Freigabe einrichten, wenn der Betrag einen bestimmten dedizierten Wert übersteigt (wenn der Betrag übersteigt wird, werden 3 Stufen notwendig: 1=Validierung, 2=erste Freigabe und 3=Gegenfreigabe.<br>Lassen Sie den Feld leer wenn eine Freigabe (2 Schritte) ausreicht; Tragen Sie einen sehr niedrigen Wert (0.1) wenn eine zweite Freigabe notwendig ist.
 UseDoubleApproval=3-Fach Verarbeitungsschritte verwenden wenn der Betrag (ohne Steuer) höher ist als ...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail=WARNUNG: Es ist oft besser, für ausgehende E-Mails den E-Mail-Server Ihres Providers anstatt des Standardservers zu verwenden. Einige E-Mail-Provider (wie Yahoo) erlauben Ihnen nicht, eine E-Mail von einem anderen Server als ihrem eigenen Server zu senden. Ihre aktuelle Konfiguration verwendet den Server der Anwendung zum Senden von E-Mails und nicht den Server Ihres E-Mail-Providers. Daher werden einige Empfänger (die mit dem restriktiven DMARC-Protokoll kompatibel sind) Ihren E-Mail-Provider fragen, ob sie Ihre E-Mail annehmen können. Einige Provider (wie Yahoo) werden dann mit "Nein" antworten, weil der Server nicht ihrer ist. Also könnte es sein, dass einige Ihrer gesendeten E-Mails nicht akzeptiert werden (beachten Sie auch die E-Mail-Quota ihres Providers). <br>Wenn Ihr Provider (wie Yahoo) diese Einschränkung hat, müssen Sie das E-Mail-Setup ändern, und die andere Methode "SMTP-Server" auszuwählen und den SMTP-Server mit den von Ihrem E-Mail-Anbieter bereitgestellten Anmeldeinformationen einrichten (fragen Sie Ihren E-Mail-Provider nach SMTP-Zugangsdaten für Ihr Konto).
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
 ClickToShowDescription=Klicke um die Beschreibung zu sehen
 DependsOn=Diese Modul benötigt die folgenden Module
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Setzen Sie diesen Wert auf 1, wenn Sie das Hauptdokument
 FilesAttachedToEmail=Datei hinzufügen
 SendEmailsReminders=Erinnerung per E-Mail versenden
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=Benutzer und Gruppen
 Module0Desc=Benutzer / Mitarbeiter und Gruppen Administration
@@ -479,7 +485,7 @@ Module1Desc=Partner- und Kontakteverwaltung
 Module2Name=Vertrieb
 Module2Desc=Vertriebsverwaltung
 Module10Name=Buchhaltung
-Module10Desc=Einfache Buchhaltungsverwaltung (Rechnungen und Zahlungen)
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=Angebote
 Module20Desc=Angebotsverwaltung
 Module22Name=E-Mail-Kampagnen
@@ -546,8 +552,8 @@ Module400Name=Projekte / Chancen / Leads
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webkalender
 Module410Desc=Webkalenderintegration
-Module500Name=Sonderausgaben
-Module500Desc=Verwalten von speziellen Ausgaben (Steuern, Sozialabgaben, Dividenden)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Lohnzahlungen
 Module510Desc=Verwaltung der Angestellten-Löhne und -Zahlungen
 Module520Name=Darlehen
@@ -561,14 +567,14 @@ Module700Name=Spenden
 Module700Desc=Spendenverwaltung
 Module770Name=Spesenabrechnungen
 Module770Desc=Management und Reporting von Reise- und Spesenabrechnungen (Transport, Essen, ...)
-Module1120Name=Lieferant-Angebote
-Module1120Desc=Anfordern von Lieferanten-Angeboten und Preise
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Mantis-Integration
 Module1520Name=Dokumente erstellen
 Module1520Desc=Mailings Dokumente erstellen
 Module1780Name=Kategorien/#tags
-Module1780Desc=Kategorien erstellen (Produkte, Kunden, Lieferanten, Kontakte oder Mitglieder)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=FCKeditor
 Module2000Desc=Bearbeitung von machen Textbereichen mit erweiterten Editor (basierend auf CKEditor) erlauben
 Module2200Name=Dynamische Preise
@@ -576,7 +582,7 @@ Module2200Desc=Mathematische Ausdrücke für Preise aktivieren
 Module2300Name=Geplante Aufträge
 Module2300Desc=Verwaltung geplanter Aufgaben (Cron oder chrono Tabelle)
 Module2400Name=Ereignisse/Termine
-Module2400Desc=Folgeereignisse oder Termine. Ereignisse manuell in der Agenda erfassen oder Applikationen erlauben Termine zur Nachverfolgung zu erstellen.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / CMS
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API/Webservice (SOAP Server)
@@ -613,7 +619,7 @@ Module50100Desc=Modul Point of Sale (POS)\n
 Module50200Name=Paypal
 Module50200Desc=Modul um Online Zahlungen via PayPal entgegenzunehmen. Ihre Kunden können damit freie Zahlungen machen, oder Dolibarr Objekte (Rechnungen, Bestelltungen...) bezahlen
 Module50400Name=Buchhaltung (erweitert)
-Module50400Desc=Buchhaltung (doppelte Buchungen, Unterstützung von Haupt- und Nebenbüchern)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=PrintIPP
 Module54000Desc=Direktdruck (ohne die Dokumente zu öffnen) mittels CUPS IPP (Drucker muss vom Server aus sichtbar sein und auf dem Server muss CUPS installiert sein)
 Module55000Name=Befragung, Umfrage oder Abstimmung
@@ -838,11 +844,11 @@ Permission1251=Massenimports von externen Daten ausführen (data load)
 Permission1321=Kundenrechnungen, -attribute und -zahlungen exportieren
 Permission1322=Eine bezahlte Rechnung wieder öffnen
 Permission1421=Exportieren von Kundenaufträge und Attribute
-Permission20001=Read leave requests (your leaves and the one of your subordinates)
-Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
+Permission20001=Urlaubsanträge einsehen (eigene und die der Untergebenen) 
+Permission20002=Urlaubsanträge anlegen/verändern (eigene und die der Untergebenen)
 Permission20003=Urlaubsanträge löschen
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
+Permission20004=Alle Urlaubsanträge einsehen (von allen Benutzern einschließlich der nicht Untergebenen)
+Permission20005=Urlaubsanträge anlegen/verändern (von allen Benutzern einschließlich der nicht Untergebenen)
 Permission20006=Urlaubstage Administrieren (Setup- und Aktualisierung)
 Permission23001=anzeigen cronjobs
 Permission23002=erstellen/ändern cronjobs
@@ -899,7 +905,7 @@ DictionaryStaff=Mitarbeiter
 DictionaryAvailability=Lieferverzug
 DictionaryOrderMethods=Bestellmethoden
 DictionarySource=Quelle der Angebote/Aufträge
-DictionaryAccountancyCategory=Personalized groups for reports
+DictionaryAccountancyCategory=Personalisierte Gruppen für Berichte
 DictionaryAccountancysystem=Kontenplan Modul
 DictionaryAccountancyJournal=Buchhaltungsjournale
 DictionaryEMailTemplates=Textvorlagen für E-Mails
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=Verzögerungstoleranz (in Tagen) vor Benachrichtigung
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Verzögerungstoleranz (in Tagen) vor der Benachrichtigung über einzulösende Schecks
 Delays_MAIN_DELAY_EXPENSEREPORTS=Toleranz in Tagen vor der Benachrichtigung zur Genehmigung einer Spesenabrechnung
 SetupDescription1=Die Einstellungsübersicht dient zum initialen Einrichten before mit der Verwendung von Dolibarr begonnen wird.
-SetupDescription2=Die zwei notwendigen Einstellungen sind die ersten beiden Zeilen im Einstellungsmenü auf der linken Seite: %s Einstellungsseite und die Einstellungsseite %s.
-SetupDescription3=Parameter im Menü <a href="%s">%s -> %s</a> sind notwendig, da die eingeben Daten für Dolibarr-Anzeigen und zum Einstellen des Standardverhaltens der Software notwendig sind (z.B. für länderabhängige Funktionen).
-SetupDescription4=Parameter im Menü <a href="%s">%s-> %s</a> sind notwenig, da Dolibarr ein modulares monolithisches ERP/CRM-System ist. Neue Funktionen werden für jedes aktivierte Modul zum Menü hinzugefügt.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=Andere Einträge verwalten optionale Parameter.
 LogEvents=Protokollierte Ereignisse
 Audit=Protokoll
@@ -1054,8 +1060,9 @@ LogEventDesc=Hier können Sie die Protokollierungseinstellungen für sicherheits
 AreaForAdminOnly=Einstellungen können nur durch </b>Administratoren</b> verändert werden.
 SystemInfoDesc=Verschiedene systemrelevante, technische Informationen - Lesemodus und nur für Administratoren sichtbar.
 SystemAreaForAdminOnly=Dieser Bereich steht ausschließlich Administratoren zur Verfügung. Keine der Benutzerberechtigungen kann dies ändern.
-CompanyFundationDesc=Tragen Sie hier alle Informationen zum Unternehmen ein, das Sie verwalten möchten (Zum Bearbeiten auf den Button "Bearbeiten" oder "Speichern" am Schluss der Seite klicken)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=Hier können Sie die Oberfläche, sowie das allgemeine 'Look and Feel' des Systems anpassen
 AvailableModules=Verfügbare Module
 ToActivateModule=Zum Aktivieren von Modulen gehen Sie zu Start->Einstellungen->Module
@@ -1069,7 +1076,7 @@ TriggerAlwaysActive=Trigger in dieser Datei sind unabhängig der Modulkonfigurat
 TriggerActiveAsModuleActive=Trigger in dieser Datei sind durch das übergeordnete Modul <b>%s</b> aktiviert.
 GeneratedPasswordDesc=Definieren Sie hier das Schema nach dem automatisch generierte Passwörter erstellt werden sollen.
 DictionaryDesc=Alle Standardwerte einfügen. Sie können eigene Werte zu den Standartwerten hinzufügen.
-ConstDesc=Diese Seite erlaubt es alle anderen Parameter einzustellen, die auf den vorherigen Seiten nicht verfügbar sind. Dies sind meist reservierte Parameter für Entwickler oder für die erweiterte Fehlersuche. Für eine Liste von Optionen <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site-öffnet sich in einem neuen Fenster" target="_blank"> hier überprüfen </a>.
+ConstDesc=Diese Seite erlaubt es alle anderen Parameter einzustellen, die auf den vorherigen Seiten nicht verfügbar sind. Dies sind meist reservierte Parameter für Entwickler oder für die erweiterte Fehlersuche. Für eine Liste von Optionen <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank"> hier überprüfen </a>.
 MiscellaneousDesc=Alle anderen sicherheitsrelevanten Parameter werden hier eingestellt.
 LimitsSetup=Limits und Genauigkeit Einstellungen
 LimitsDesc=Hier können Sie Grenzwerte, Genauigkeitseinstellungen und das Rundungsverhalten einstellen.
@@ -1188,11 +1195,11 @@ UserMailRequired=Für das Erstellen eines neuen Benutzers ist dessen E-Mail-Adre
 HRMSetup=PV Modul Einstellungen
 ##### Company setup #####
 CompanySetup=Unternehmenseinstellungen
-CompanyCodeChecker=Modul für Partner-Code-Erstellung (Kunden oder Lieferanten)
-AccountCodeManager=Modul zur Generierung der Buchhaltungskennzeichen (für Kunden und Lieferanten)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=Die Funktion der E-Mail-Benachrichtigung erlaubt Ihnen den stillen und automatischen Versand von E-Mails zu einigen Dolibarr-Ereignissen. Folgende Ziele können definiert werden:
 NotificationsDescUser=* pro Benutzer, ein Benutzer pro mal
-NotificationsDescContact=* pro Partnerkontakte (Kunden oder Lieferanten), ein Kontakt pro mal
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* oder duch setzten der globalen E-Mailziele im Modulsetup
 ModelModules=Dokumentvorlagenmodul
 DocumentModelOdt=Erstellen von Dokumentvorlagen im OpenDocuments-Format (.odt- oder .ods-Dateien für OpenOffice, KOffice, TextEdit, ...)
@@ -1203,6 +1210,9 @@ MustBeUnique=Muss es eindeutig sein ?
 MustBeMandatory=Erforderlich zur Anlage von Partnern ?
 MustBeInvoiceMandatory=Erforderlich, um Rechnungen freizugeben ?
 TechnicalServicesProvided=Technische Unterstützung durch
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Ein Eportlink für das Format <b>%s</b> findet sich unter folgendem Link: %s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=Freier Rechtstext auf Angeboten
 WatermarkOnDraftProposal=Wasserzeichen auf Angebots-Entwurf (keines, falls leer)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Fragen Sie nach dem Bankkonto bei einem Angebot
 ##### SupplierProposal #####
-SupplierProposalSetup=Einrichtung des Moduls für Preisanfragen bei Lieferanten
-SupplierProposalNumberingModules=Modell zu Numerierung von Preisanfragen für Lieferanten
-SupplierProposalPDFModules=Modell für Dokumente von Preisanfragen für Lieferanten
-FreeLegalTextOnSupplierProposal=Freier Text auf Preisanfragen für Lieferanten
-WatermarkOnDraftSupplierProposal=Wasserzeichen auf vorbereiteten Preisanfrage für Lieferanten (leerlassen für kein Wasserzeichen)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Frage nach Bankkonto für Preisanfragen
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Frage nach Lager für Aufträge
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Frage nach der Ziel-Bankverbindung der Lieferantenbestellung
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=Bestellverwaltungseinstellungen
 OrdersNumberingModules=Bestellnumerierungs-Module
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=Verbindung zum Server '%s' für Datenbank '%s' mit Benutzer '%s
 OSCommerceTestKo1=Verbindung zum Server '%s' erfolgreich, aber Datenbank '%s' konnte nicht erreicht werden.
 OSCommerceTestKo2=Verbindung zum Server '%s' mit dem Benutzer '%s' fehlgeschlagen.
 ##### Stock #####
-StockSetup=Warenlager-Modul Einstellungen
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=Wenn Sie ein Point of Sale-Modul (POS-Modul Standard oder andere externe POS-Module) verwenden, kann diese Einstellung von Ihrem Point Of Sale-Modul übersteuert werden. \nDie meisten POS -Module wurden entwickelt, um sofort eine Rechnung zu erstellen und das Lager standardmäßig zu verringern, egal welche Optionen hier ausgewählt wurde. \nAlso, wenn Sie während einem Verkauf einen Lagerabgang in Ihrem Point of Sale möchten oder nicht, so müssen sie auch die Konfiguration des POS-Modules überprüfen.
 ##### Menu #####
 MenuDeleted=Menü gelöscht
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Checknummerierungsmodul
 MultiCompanySetup=Einstellungen des Modul Mandanten
 ##### Suppliers #####
 SuppliersSetup=Lieferantenmoduleinstellungen
-SuppliersCommandModel=Vollständige Vorlage für Lieferantenbestellungen (Logo, ...)
-SuppliersInvoiceModel=Vollständige Vorlage der Lieferantenrechnung (logo. ..)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Lieferantenrechnungen Zähl-Modell
 IfSetToYesDontForgetPermission=Wenn auf Ja gesetzt, vergessen Sie nicht, die Berechtigungen den dafür erlaubten Gruppen oder Benutzern auch das Recht für die zweite Zustimmung zu geben.
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=Verwende keine mehrdeutigen Zeichen ("1", "l", "i", "|
 SalariesSetup=Einstellungen des Gehaltsmodul
 SortOrder=Sortierreihenfolge
 Format=Format
-TypePaymentDesc=0:Kunden-Zahlungs-Typ, 1:Lieferanten-Zahlungs-Typ, 2:Sowohl Kunden- als auch Lieferanten-Zahlungs-Typ
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Include-Pfad (in Variable '%s' definiert)
 ExpenseReportsSetup=Einstellungen des Moduls Spesenabrechnung
 TemplatePDFExpenseReports=Dokumentvorlagen zur Erstellung einer Spesenabrechnung
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Installieren von externen Modul aus de
 ConfFileMustContainCustom=Um ein externes Modul zu erstellen oder installieren, müssen die Dateien im Verzeichnis <strong>%s</strong> gespeichert werden. Damit dieses Verzeichnis durch Dolibarr verwendet wird, muss in den Einstellungen <strong>conf/conf.php</strong> die folgenden beiden Zeilen hinzugefügt werden:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Zeilen hervorheben bei Mouseover
 HighlightLinesColor=Farbe der Zeile hervorheben, wenn die Maus darüberfährt (leer lassen, um den Effekt zu deaktivieren)
-TextTitleColor=Farbe des Seitenkopfs
+TextTitleColor=Text color of Page title
 LinkColor=Farbe für Hyperlinks
 PressF5AfterChangingThis=Drücken Sie CTRL+F5 auf der Tastatur oder löschen Sie Ihren Browser-Cache, nachdem dem Sie diesen Wert geändert haben, damit die Änderung wirksam wird
 NotSupportedByAllThemes=Funktioniert mit dem Standard-Designvorlagen: wird möglicherweise nicht von externen Designvorlagen unterstützt
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=Hintergrundfarbe für Hauptmenü
 TopMenuDisableImages=Symbole im oberen Menü ausblenden.
 LeftMenuBackgroundColor=Hintergrundfarbe für Menü Links
 BackgroundTableTitleColor=Hintergrundfarbe für Titelzeilen in Tabellen
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Hintergrundfarbe für ungerade Tabellenzeilen
 BackgroundTableLineEvenColor=Hintergrundfarbe für gerade Tabellenzeilen
 MinimumNoticePeriod=Kündigungsfrist (Ihre Kündigung muss vor dieser Zeit erfolgen)
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=Beispiel: +2 (nur ausfüllen, wenn Sie Probleme haben)
 ExpectedChecksum=Erwartete Prüfsumme
 CurrentChecksum=Aktuelle Prüfsumme
 ForcedConstants=Erforderliche Parameter Werte
-MailToSendProposal=Um Angebot zu schicken
-MailToSendOrder=Um Kundenauftrag zu schicken
-MailToSendInvoice=Um Kundenrechnung zu schicken
-MailToSendShipment=Um Lieferschein zu schicken
-MailToSendIntervention=Um Serviceauftrag zu schicken
-MailToSendSupplierRequestForQuotation=Um Anfrage an den Lieferanten schicken
-MailToSendSupplierOrder=Um Lieferantenbestellung zu schicken
-MailToSendSupplierInvoice=Um Lieferantenrechnung zu schicken
-MailToSendContract=um den Vertrag zu senden
-MailToThirdparty=Um E-Mail von Partner zu schicken
-MailToMember=Email senden von Mitgliederseite
-MailToUser=E-Mail von Benutzerseite aus senden
-MailToProject= To send email from project page
+MailToSendProposal=Kunden Angebote
+MailToSendOrder=Kundenaufträge
+MailToSendInvoice=Kundenrechnungen
+MailToSendShipment=Lieferungen
+MailToSendIntervention=Serviceaufträge
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Verträge
+MailToThirdparty=Partner
+MailToMember=Mitglieder
+MailToUser=Benutzer
+MailToProject=Projects page
 ByDefaultInList=Standardanzeige als Listenansicht
 YouUseLastStableVersion=Sie verwenden die letzte stabile Version
 TitleExampleForMajorRelease=Beispielnachricht, die Sie nutzen können, um eine Hauptversion anzukündigen. Sie können diese auf Ihrer Website verwenden.
@@ -1780,10 +1791,13 @@ MAIN_PDF_MARGIN_BOTTOM=Unterer Rand im PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Konfiguration des Modul Ressourcen
 UseSearchToSelectResource=Verwende ein Suchformular um eine Ressource zu wählen (eher als eine Dropdown-Liste) zu wählen.
-DisabledResourceLinkUser=Disable feature to link a resource to users
-DisabledResourceLinkContact=Disable feature to link a resource to contacts
+DisabledResourceLinkUser=Funktion deaktivieren, um eine Ressource mit Benutzern zu verknüpfen
+DisabledResourceLinkContact=Funktion deaktivieren, um eine Ressource mit Kontakten zu verknüpfen
 ConfirmUnactivation=Modul zurücksetzen bestätigen
diff --git a/htdocs/langs/de_DE/bills.lang b/htdocs/langs/de_DE/bills.lang
index 399b3792c22..55285fc663d 100644
--- a/htdocs/langs/de_DE/bills.lang
+++ b/htdocs/langs/de_DE/bills.lang
@@ -109,7 +109,7 @@ CancelBill=Rechnung stornieren
 SendRemindByMail=Zahlungserinnerung per E-Mail versenden
 DoPayment=Zahlung eingeben
 DoPaymentBack=Rückerstattung eingeben
-ConvertToReduc=In Rabatt umwandeln
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Konvertieren des Überschuss in einen Rabatt
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Geben Sie die vom Kunden erhaltene Zahlung ein
@@ -120,7 +120,7 @@ BillStatus=Rechnung Status
 StatusOfGeneratedInvoices=Status der erstellten Rechnungen
 BillStatusDraft=Entwurf (freizugeben)
 BillStatusPaid=Bezahlt
-BillStatusPaidBackOrConverted=In Gutschrift oder Rabatt umgewandelt
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Bezahlt (in der Schlussrechnung zu verarbeiten)
 BillStatusCanceled=Aufgegeben
 BillStatusValidated=Freigegeben (zu bezahlen)
@@ -296,10 +296,10 @@ DiscountType=Rabatt Typ
 NoteReason=Anmerkung/Begründung
 ReasonDiscount=Rabattgrund
 DiscountOfferedBy=Rabatt angeboten von
-DiscountStillRemaining=Rabatte verfügbar
-DiscountAlreadyCounted=Rabatte bereits berücksichtigt
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
-SupplierDiscounts=Lieferantenrabatte
+SupplierDiscounts=Vendors discounts
 BillAddress=Rechnungsanschrift
 HelpEscompte=Bei diesem Rabatt handelt es sich um einen Skonto.
 HelpAbandonBadCustomer=Dieser Betrag wurde aufgegeben (Kundenverschulden) ist als uneinbringlich zu werten.
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Erlaube Zahlungen für Rechnungen an verschiedene P
 PaymentNote=Zahlungshinweis
 ListOfPreviousSituationInvoices=Liste der vorherigen Fortschrittsrechnungen
 ListOfNextSituationInvoices=Liste der nächsten Fortschrittsrechnungen
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=alle %s Tage
 FrequencyPer_m=Alle %s Monate
 FrequencyPer_y=Alle %s Jahre
@@ -505,9 +511,14 @@ SituationAmount=Situation Rechnungsbetrag (ohne USt.)
 SituationDeduction=Situation Subtraktion
 ModifyAllLines=Bearbeite alle Zeilen
 CreateNextSituationInvoice=Erstelle nächsten Fortschritt-Rechnung
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=Diese Rechnung ist nicht die letzte im Zyklus und darf nicht geändert werden.
 DisabledBecauseNotLastInCycle=Die nächste Situation existiert bereits.
 DisabledBecauseFinal=Dieser Status ist endgültig.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=So
 CantBeLessThanMinPercent=Der Fortschritt kann nicht kleiner als sein bisheriger Wert werden.
 NoSituations=Keine offenen Positionen
 InvoiceSituationLast=Allgemeine Endrechnung
@@ -532,3 +543,4 @@ AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Legen Sie das Startdatum fest
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/de_DE/categories.lang b/htdocs/langs/de_DE/categories.lang
index 70b5c33b19a..466991753b5 100644
--- a/htdocs/langs/de_DE/categories.lang
+++ b/htdocs/langs/de_DE/categories.lang
@@ -16,7 +16,7 @@ MembersCategoriesArea=Mitglieder-Kategorien/#tags
 ContactsCategoriesArea=Kontaktkategorien bzw. Suchwörter Übersicht
 AccountsCategoriesArea=Kontenkategorie-Übersicht
 ProjectsCategoriesArea=Projektkategorien/Suchwörter-Übersicht
-SubCats=Unterkategorien
+SubCats=Sub-categories
 CatList=Liste der Kategorien/#tags
 NewCategory=Neue Kategorie/#tag
 ModifCat=Kategorie bearbeiten
@@ -85,3 +85,4 @@ CategorieRecursivHelp=Wenn aktiviert, wird das Produkt auch zur übergeordneten
 AddProductServiceIntoCategory=Folgendes Produkt/Service hinzufügen
 ShowCategory=Zeige Kategorie
 ByDefaultInList=Standardwert in Liste
+ChooseCategory=Choose category
diff --git a/htdocs/langs/de_DE/commercial.lang b/htdocs/langs/de_DE/commercial.lang
index ac3736bc0fc..8c85297f506 100644
--- a/htdocs/langs/de_DE/commercial.lang
+++ b/htdocs/langs/de_DE/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=Schließen
 ActionAC_EMAILING=E-Mail-Kampagne starten
 ActionAC_COM=Sende Bestellung per Post
 ActionAC_SHIP=Lieferschein senden
-ActionAC_SUP_ORD=Sende Lieferantenbestellung per Post
-ActionAC_SUP_INV=Sende Lieferantenrechnung per Post
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=Sonstiges
 ActionAC_OTH_AUTO=Automatisch eingefügte Ereignisse
 ActionAC_MANUAL=Manuell eingefügte Ereignisse
diff --git a/htdocs/langs/de_DE/companies.lang b/htdocs/langs/de_DE/companies.lang
index 220ffbfac10..856871fe635 100644
--- a/htdocs/langs/de_DE/companies.lang
+++ b/htdocs/langs/de_DE/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Möchten Sie diesen Partner und alle damit verbundenen Info
 MenuNewThirdParty=Neuer Partner
 MenuNewCustomer=Neuer Kunde
 MenuNewProspect=Neuer Lead
-MenuNewSupplier=Neuer Lieferant
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=Neue Privatperson
-NewCompany=Neues Unternehmen (Leads, Kunden, Lieferanten)
-NewThirdParty=Neuer Partner (Leads, Kunden, Lieferanten)
-CreateDolibarrThirdPartySupplier=Neuen Partner erstellen (Lieferant)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=Partner erstellen
 CreateThirdPartyAndContact=Neuen Partner und Unteradresse erstellen
 ProspectionArea=Übersicht Geschäftsanbahnung
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=Leads
 ThirdPartyCustomers=Kunden
 ThirdPartyCustomersStats=Kunden
 ThirdPartyCustomersWithIdProf12=Kunden mit %s oder %s
-ThirdPartySuppliers=Lieferanten
+ThirdPartySuppliers=Vendors
 ThirdPartyType=Typ des Partners
 Individual=Privatperson
 ToCreateContactWithSameName=Erzeugt automatisch einen Kontakt/Adresse mit der gleichen Information wie der Partner unter dem Partner. In den meisten Fällen, auch wenn Ihr Prtner eine natürliche Person ist, reicht nur die Anlage eines Partners
@@ -77,11 +77,11 @@ Web=Web
 Poste= Posten
 DefaultLang=Standard-Sprache
 VATIsUsed=inkl. MwSt.
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=exkl. MwSt.
 CopyAddressFromSoc=Anschriften zu diesem Partner
-ThirdpartyNotCustomerNotSupplierSoNoRef=Partner ist weder Kunde noch Lieferant, keine verbundenen Objekte
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Bankkonto für Zahlungen
 OverAllProposals=Angebote
 OverAllOrders=Bestellungen
@@ -99,9 +99,9 @@ LocalTax2ES=EKSt.
 TypeLocaltax1ES=RE Typ
 TypeLocaltax2ES=EKSt. Typ
 WrongCustomerCode=Kundencode ungültig
-WrongSupplierCode=Lieferantencode ungültig
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Kundencode-Modell
-SupplierCodeModel=Lieferantencode-Modell
+SupplierCodeModel=Vendor code model
 Gencod=Barcode
 ##### Professional ID #####
 ProfId1Short=Prof. ID 1
@@ -267,7 +267,7 @@ Prospect=Lead
 CustomerCard=Kunden - Karte
 Customer=Kunde
 CustomerRelativeDiscount=Kundenrabatt relativ
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=Rabatt relativ
 CustomerAbsoluteDiscountShort=Rabatt absolut
 CompanyHasRelativeDiscount=Dieser Kunde hat einen Rabatt <b>von %s%%</b>
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this suppl
 CompanyHasNoAbsoluteDiscount=Dieser Kunde hat keine Rabattgutschriften zur Verfügung
 CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
 CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=Keine
 Supplier=Lieferant
 AddContact=Kontakt erstellen
@@ -304,13 +304,13 @@ DeleteACompany=Löschen eines Unternehmens
 PersonalInformations=Persönliche Daten
 AccountancyCode=Buchhaltungskonto
 CustomerCode=Kundennummer
-SupplierCode=Lieferanten-Code
+SupplierCode=Vendor code
 CustomerCodeShort=Kundennummer
-SupplierCodeShort=Lieferantennummer
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=Kunden-Code, einzigartig für alle Kunden
-SupplierCodeDesc=Lieferanten-Code, einzigartig für alle Lieferanten
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=Erforderlich falls Partner Kunde oder Interessent ist
-RequiredIfSupplier=Erforderlich falls Partner Lieferant ist
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=Gültigkeit überwacht von Modul
 ThisIsModuleRules=Regeln dieses Moduls
 ProspectToContact=Lead zu kontaktieren
@@ -338,7 +338,7 @@ MyContacts=Meine Kontakte
 Capital=Kapital
 CapitalOf=Stammkapital: %s
 EditCompany=Unternehmen bearbeiten
-ThisUserIsNot=Dieser Benutzer ist weder ein Lead, Kunde oder Lieferant
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=Prüfen
 VATIntraCheckDesc=Der Link <b>%s</b> erlaubt eine Anfrage am Europäischen Mehrwertsteuer-Check-Service. Ein externer Zugang zum Internet-Server ist für diesen Dienst erforderlich.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -396,7 +396,7 @@ ImportDataset_company_4=Dritte / Außendienstmitarbeiter (Zuweisen von Außendie
 PriceLevel=Preisstufe
 DeliveryAddress=Lieferadresse
 AddAddress=Adresse hinzufügen
-SupplierCategory=Lieferantenkategorie
+SupplierCategory=Vendor category
 JuridicalStatus200=Unabhängig
 DeleteFile=Datei löschen
 ConfirmDeleteFile=Möchten Sie diese Datei wirklich löschen?
@@ -406,7 +406,7 @@ FiscalYearInformation=Informationen über das Geschäftsjahr
 FiscalMonthStart=Erster Monat des Geschäftsjahres
 YouMustAssignUserMailFirst=Sie müssen zunächst eine E-Mail-Adresse für diesen Benutzer anlegen, um E-Mail-Benachrichtigungen zu ermöglichen.
 YouMustCreateContactFirst=Um E-mail-Benachrichtigungen anlegen zu können, müssen Sie zunächst einen Kontakt mit gültiger Email-Adresse zum Partner hinzufügen.
-ListSuppliersShort=Liste der Lieferanten
+ListSuppliersShort=List of vendors
 ListProspectsShort=Liste der Leads
 ListCustomersShort=Liste der Kunden
 ThirdPartiesArea=Partner- und Kontaktbereich
@@ -420,7 +420,7 @@ CurrentOutstandingBill=Aktuell ausstehende Rechnung
 OutstandingBill=Max. für ausstehende Rechnung
 OutstandingBillReached=Kreditlimite erreicht
 OrderMinAmount=Mindestbestellwert
-MonkeyNumRefModelDesc=Zurück NUMERO mit Format %syymm-nnnn für den Kunden-Code und syymm%-nnnn für die Lieferanten-Code ist, wenn JJ Jahr, MM Monat und nnnn ist eine Folge ohne Pause und kein Zurück mehr gibt, auf 0 gesetzt.
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=Kunden / Lieferanten-Code ist frei. Dieser Code kann jederzeit geändert werden.
 ManagingDirectors=Name(n) des/der Manager (CEO, Direktor, Geschäftsführer, ...)
 MergeOriginThirdparty=Partner duplizieren (Partner den Sie löschen möchten)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Login des Vertriebsmitarbeiters
 SaleRepresentativeFirstname=Vorname des Vertreter
 SaleRepresentativeLastname=Nachname des Vertreter
 ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=Neuer Kunde oder Lieferanten Code bei doppeltem Code empfohlen
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/de_DE/compta.lang b/htdocs/langs/de_DE/compta.lang
index e08987ffe0a..01150c2f6c0 100644
--- a/htdocs/langs/de_DE/compta.lang
+++ b/htdocs/langs/de_DE/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=Ausgaben (netto)
 VATToPay=Tax sales
 VATReceived=USt. Verkäufe
 VATToCollect=USt. Einkäufe
-VATSummary=USt. Saldo
+VATSummary=Tax monthly
+VATBalance=USt. Saldo
 VATPaid=Bezahlte USt.
 LT1Summary=Steuer 2 Zusammenfassung
 LT2Summary=Steuer 3 Zusammenfassung
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=Rechnungswesen/Vermögensverwaltung
 NewPayment=Neue Zahlung
 Payments=Zahlungen
 PaymentCustomerInvoice=Zahlung Kundenrechnung
-PaymentSupplierInvoice=Zahlung Lieferantenrechnung
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Sozialabgaben-/Steuer Zahlung
 PaymentVat=USt.-Zahlung
 ListPayment=Liste der Zahlungen
 ListOfCustomerPayments=Liste der Kundenzahlungen
-ListOfSupplierPayments=Liste der Lieferantenzahlungen
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Startdatum für Zeitraum
 DateEndPeriod=Enddatum für Zeitraum
 newLT1Payment=Neue Zahlung Steuer 2
@@ -110,7 +111,7 @@ ShowVatPayment=Zeige USt. Zahlung
 TotalToPay=Zu zahlender Gesamtbetrag
 BalanceVisibilityDependsOnSortAndFilters=Differenz ist nur in dieser Liste sichtbar, wenn die Tabelle aufsteigend nach %s sortiert ist und gefiltert mit nur 1 Bankkonto
 CustomerAccountancyCode=Kontierungscode Kunde
-SupplierAccountancyCode=Kontierungscode Lieferant
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Buchh. Kunden-Konto
 SupplierAccountancyCodeShort=Buchh.-Lieferanten-Konto
 AccountNumber=Kontonummer
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=Bericht von Kunden RE
 LT2ReportByCustomersES=Bericht von Partner EKSt.
 VATReport=Umsatzsteuer Report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Bericht zur vereinnahmten und bezahlten USt. nach Kunden 
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Kontenplan
 Pcg_type=Klasse des Kontos
 Pcg_subtype=Klasse des Kontos 
 InvoiceLinesToDispatch=versandbereite Rechnungspositionen
-ByProductsAndServices=Nach Produkten und Leistungen
+ByProductsAndServices=By product and service
 RefExt=Externe Referenz
 ToCreateAPredefinedInvoice=Um eine Rechnungsvorlage zu erstellen, erstellen Sie eine normale Rechnung. Anschließend klicken Sie auf den Button "%s", ohne die Rechnung freizugeben.
 LinkedOrder=Link zur Bestellung
@@ -215,7 +218,8 @@ Mode1=Methode 1
 Mode2=Methode 2
 CalculationRuleDesc=Zur Berechnung der Gesamt-USt. gibt es zwei Methoden: <br>Methode 1 rundet die Steuer in jeder Zeile und addiert zum Schluss. <br>Methode 2 summiert alle Steuer-Zeilen und rundet am Ende. <br>Das endgültige Ergebnis kann sich in wenigen Cent unterscheiden. Standardmodus ist <b>Modus %s.</b>
 CalculationRuleDescSupplier=Gemäß Ihrem Lieferanten, wählen Sie die  geeignete Methode, um die gleiche Berechnungsregel anzuwenden um das selbe Ergebnis wie Ihr Lieferant zu bekommen.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Umsatz Bericht pro Produkt, bei der Verwendung einer <b>Kassabuch Buchhaltung</b>  ist der Modus nicht relevant. Dieser Bericht ist nur bei Verwendung <b>Buchführungsmodus Periodenrechnung</b> (siehe Setup das Modul  Buchhaltung).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Berechnungsmodus
 AccountancyJournal=Kontierungscode-Journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Standard-Aufwandskonto, um MwSt zu bezahlen
 ACCOUNTING_ACCOUNT_CUSTOMER=Standard Buchhaltungskonto für Kunden/Debitoren (wenn nicht beim Partner definiert)
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Buchhaltungskonten die auf der Partnerkarte definiert wurden werden für die Nebenbücher verwendet, für das Hauptbuch oder als Vorgabewert für Nebenbücher falls kein Buchhaltungskonto auf der Kunden-Partnerkarte definiert wurde
-ACCOUNTING_ACCOUNT_SUPPLIER=Standard Buchhaltungskonto für Lieferanten/Kreditoren (wenn nicht beim Lieferanten definiert)
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Buchhaltungskonten die auf der Partnerkarte definiert wurden werden nur für die Nebenbücher verwendet. Dieses wird für das Hauptbuch oder als Vorgabewert für Nebenbücher falls kein Buchhaltungskonto auf der Lieferanten-Partnerkarte definiert wurde.
 CloneTax=Dupliziere Sozialabgabe/Steuersatz
 ConfirmCloneTax=Bestätigen Sie die Duplizierung der Steuer-/Sozialabgaben-Zahlung
@@ -242,3 +246,10 @@ FiscalPeriod=Buchhaltungs Periode
 ListSocialContributionAssociatedProject=Liste der Sozialabgaben für dieses Projekt
 DeleteFromCat=Aus Kontengruppe entfernen
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/de_DE/dict.lang b/htdocs/langs/de_DE/dict.lang
index df67a2a5440..7be111dc08c 100644
--- a/htdocs/langs/de_DE/dict.lang
+++ b/htdocs/langs/de_DE/dict.lang
@@ -5,7 +5,8 @@ CountryIT=Italien
 CountryES=Spanien
 CountryDE=Deutschland
 CountryCH=Schweiz
-CountryGB=Großbritannien
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=England
 CountryUK=England
 CountryIE=Irland
 CountryCN=China
diff --git a/htdocs/langs/de_DE/ecm.lang b/htdocs/langs/de_DE/ecm.lang
index edb7c6a78fc..ebdd567ea31 100644
--- a/htdocs/langs/de_DE/ecm.lang
+++ b/htdocs/langs/de_DE/ecm.lang
@@ -14,8 +14,8 @@ ECMNbOfFilesInDir=Anzahl der Dateien im Ordner
 ECMNbOfSubDir=Anzahl Unterordner
 ECMNbOfFilesInSubDir=Anzahl Dateien in Unterordnern
 ECMCreationUser=Autor
-ECMArea=DMS/ECM area
-ECMAreaDesc=The DMS/ECM (Document Management System / Electronic Content Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
+ECMArea=DMS/CMS Bereich
+ECMAreaDesc=Das ECM (Electronic Content Management)-System erlaubt Ihnen das Speichern, Teilen und rasche Auffinden von Dokumenten.
 ECMAreaDesc2=* In den automatischen Verzeichnissen werden die vom System erzeugten Dokumente abgelegt. <br> * Die manuellen Verzeichnisse können Sie selbst verwalten und zusätzliche nicht direkt zuordenbare Dokument hinterlegen.
 ECMSectionWasRemoved=Ordner <b>%s</b> wurde gelöscht.
 ECMSectionWasCreated=Verzeichnis <b>%s</b> wurde erstellt.
@@ -39,9 +39,10 @@ ShowECMSection=Ordner anzeigen
 DeleteSection=Verzeichnis löschen
 ConfirmDeleteSection=Möchten Sie dieses Verzeichnis <b>%s</b> wirklich löschen?
 ECMDirectoryForFiles=Relatives Verzeichnis für Dateien
-CannotRemoveDirectoryContainsFiles=Entfernen des Ordners nicht möglich, da dieser noch Dateien enthält
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=Dateiverwaltung
-ECMSelectASection=Wähle einen Ordner aus der Baumansicht links ...
+ECMSelectASection=Wähle einen Ordner aus der Baumansicht...
 DirNotSynchronizedSyncFirst=Dieses Verzeichnis scheint außerhalb des ECM Moduls erstellt oder verändert worden zu sein. Sie müssten auf den "Aktualisieren"-Button klicken, um den Inhalt der Festplatte mit der Datenbank zu synchronisieren.
 ReSyncListOfDir=Liste der Verzeichnisse nochmals synchronisieren
 HashOfFileContent=Hashwert der Datei
diff --git a/htdocs/langs/de_DE/errors.lang b/htdocs/langs/de_DE/errors.lang
index 39573906054..a976384fb22 100644
--- a/htdocs/langs/de_DE/errors.lang
+++ b/htdocs/langs/de_DE/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Barcode erforderlich
 ErrorCustomerCodeAlreadyUsed=Diese Kunden-Nr. ist bereits vergeben.
 ErrorBarCodeAlreadyUsed=Barcode wird bereits verwendet
 ErrorPrefixRequired=Präfix erforderlich
-ErrorBadSupplierCodeSyntax=Die eingegebene Lieferanten Nr. ist unzulässig.
-ErrorSupplierCodeRequired=Lieferanten-Nr. erforderlich
-ErrorSupplierCodeAlreadyUsed=Diese Lieferanten Nr. ist bereits vergeben.
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Ungültige Werte
 ErrorBadValueForParameter=Ungültiger Wert '%s' für Paramter '%s'
 ErrorBadImageFormat=Bildformat nicht unsterstützt (Ihr PHP hat keine Konvertierungsfunktion für dieses Format)
@@ -87,7 +87,7 @@ ErrorsOnXLines=Fehler in <b>%s</b> Quellzeilen
 ErrorFileIsInfectedWithAVirus=Der Virenschutz konnte diese Datei nicht freigeben (eventuell ist diese mit einem Virus infiziert)
 ErrorSpecialCharNotAllowedForField=Sonderzeichen sind im Feld '%s' nicht erlaubt
 ErrorNumRefModel=Es besteht ein Bezug zur Datenbank (%s) der mit dieser Numerierungsfolge nicht kompatibel ist. Entfernen Sie den Eintrag oder benennen Sie den Verweis um, um dieses Modul zu aktivieren.
-ErrorQtyTooLowForThisSupplier=Die gewählte Menge liegt unterhalb der Mindestbestellmenge für diesen Lieferanten oder es wurde kein Lieferantenpreis zu diesem Anbieter eingetragen.
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Das Setup des Moduls ist unvollständig. Gehen Sie zu Home - Einstellungen - Module um die Einstellungen zu vervollständigen.
 ErrorBadMask=Fehler auf der Maske
 ErrorBadMaskFailedToLocatePosOfSequence=Fehler, Maske ohne fortlaufende Nummer
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Falsche Definition von Menü Arr
 ErrorSavingChanges=Beim Speichern der Änderungen trat ein Fehler auf
 ErrorWarehouseRequiredIntoShipmentLine=Lager in der Zeile ist für die Lieferung notwendig
 ErrorFileMustHaveFormat=Die Datei muss das Format %s haben.
-ErrorSupplierCountryIsNotDefined=Land für den Lieferanten ist nicht definiert. Korrigieren Sie dies zuerst.
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Fehler beim Zusammenführen der beiden Einträge. Die Anforderung wurde abgebrochen.
 ErrorStockIsNotEnoughToAddProductOnOrder=Nicht genug Bestand von Produkt %s, um es einem neuen Auftrag zuzufügen.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Nicht genug Bestand von Produkt %s, um es einer neuen Rechnung zuzufügen.
diff --git a/htdocs/langs/de_DE/install.lang b/htdocs/langs/de_DE/install.lang
index f1ea32417f1..9b844c4a51b 100644
--- a/htdocs/langs/de_DE/install.lang
+++ b/htdocs/langs/de_DE/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=Die Konfigurationsdatei <b>%s</b> ist
 ConfFileCouldBeCreated=Die Konfigurationsdatei <b>%s</b> wurde erfolgreich erstellt.
 ConfFileIsNotWritable=Die Konfigurationsdatei <b>%s</b> ist nicht beschreibbar. Bitte überprüfen Sie die Dateizugriffsrechte. Für die Erstinstallation muss Ihr Webserver in die Konfigurationsdatei schreiben können, setzen Sie die Dateiberechtigungen entsprechend (z.B. mittels "chmod 666" auf Unix-Betriebssystemen).
 ConfFileIsWritable=Die Konfigurationsdatei <b>%s</b> ist beschreibbar.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Alle Information aus der Konfigurationsdatei laden.
 PHPSupportSessions=Ihre PHP-Konfiguration unterstützt Sessions.
 PHPSupportPOSTGETOk=Ihre PHP unterstützt GET und POST Variablen.
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Fehler beim erstellen des Dolibarr Administrator Kontos
 WarningRemoveInstallDir=Aus Sicherheitsgründen sollten Sie nach abgeschlossenem Installations-/Aktualisierungsvorgang das Installationsverzeichnis (<b>install</b>) löschen oder in "install.lock" umbenennen.
 FunctionNotAvailableInThisPHP=Diese Funktion steht in Ihrer PHP-Version nicht zur Verfügung.
 ChoosedMigrateScript=Migrationsskript auswählen
-DataMigration=Datenmigration
-DatabaseMigration=Struktur der Datenbankmigration
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script-Verarbeitung
 ChooseYourSetupMode=Wählen Sie Ihre Installationsart und klicken Sie anschließend auf "Start"...
 FreshInstall=Neue Installation
@@ -146,7 +147,7 @@ NothingToDo=Keine Aufgaben zum erledigen
 # upgrade
 MigrationFixData=Denormalisierte Daten bereinigen
 MigrationOrder=Datenmigration für Kundenaufträge
-MigrationSupplierOrder=Datenmigration für Lieferantenbestellungen
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Datenmigration für Angebote
 MigrationInvoice=Datenmigration für Kundenrechnungen
 MigrationContract=Datenmigration für Verträge
@@ -196,6 +197,8 @@ MigrationEvents=Ereignisse migrierern, um den Besitzer des Ereignisses der Zuord
 MigrationEventsContact=Migration der Ereignisse um die Kontaktinformationen in die Zuweisungstabelle hinzuzufügen
 MigrationRemiseEntity=Aktualisieren Sie den Wert des Feld "entity" der Tabelle "llx_societe_remise"
 MigrationRemiseExceptEntity=Aktualisieren Sie den Wert des Feld "entity" der Tabelle "llx_societe_remise_except"
+MigrationUserRightsEntity=Aktualisieren Sie den Wert des Feld "entity" der Tabelle "llx_user_rights"
+MigrationUserGroupRightsEntity=Aktualisieren Sie den Wert des Feld "entity" der Tabelle "llx_usergroup_rights"
 MigrationReloadModule=Neu Laden von Modul %s
 MigrationResetBlockedLog=Modul BlockedLog für v7 Algorithmus zurücksetzen
 ShowNotAvailableOptions=Nicht verfügbare Optionen anzeigen
diff --git a/htdocs/langs/de_DE/ldap.lang b/htdocs/langs/de_DE/ldap.lang
index 9c9768e0c7b..75a9c2db651 100644
--- a/htdocs/langs/de_DE/ldap.lang
+++ b/htdocs/langs/de_DE/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Domain-Passwort
 YouMustChangePassNextLogon=Bitte ändern Sie das Passwort für Benutzer <b>%s</b> auf der Domain <b>%s</b> bei Ihrer nächsten Anmeldung.
 UserMustChangePassNextLogon=Der Benutzer muss das Passwort für Domäne %s bei der nächsten Anmeldung ändern.
 LDAPInformationsForThisContact=Informationen in der LDAP-Datenbank für diesen Kontakt
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Mitgliedsart synchronisiert
 ContactSynchronized=Kontakt synchronisiert
 ForceSynchronize=Erzwinge Synchronisation  Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Fehler beim Lesen der LDAP-Datenbank. Überprüfen Sie die Verfügbarkeit der Datenbank sowie die entsprechenden Moduleinstellungen.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/de_DE/loan.lang b/htdocs/langs/de_DE/loan.lang
index 439571de65b..46deed0a541 100644
--- a/htdocs/langs/de_DE/loan.lang
+++ b/htdocs/langs/de_DE/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=Kapital
 Insurance=Versicherung
 Interest=Zins
 Nbterms=Anzahl der Bedingungen
+Term=Term
 LoanAccountancyCapitalCode=Buchhaltungskonto Kapital
 LoanAccountancyInsuranceCode=Buchhaltungskonto Versicherung
 LoanAccountancyInterestCode=Buchhaltungskonto Zinsen
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=Bestätigen Sie das Löschen dieses Kredites
 LoanDeleted=Kredit erfolgreich gelöscht
 ConfirmPayLoan=Bestätigen Sie das Löschen dieses Kredites
 LoanPaid=Kredit bezahlt
-# Calc
-LoanCalc=Bankkreditrechner
-PurchaseFinanceInfo=Einkauf- und Finanzierungsinformationen
-SalePriceOfAsset=Verkaufspreis
-PercentageDown=Prozentsatz
-LengthOfMortgage=Kreditlaufzeit
-AnnualInterestRate=Jahreszinssatz
-ExplainCalculations=Berechnungs-Erläuterung
-ShowMeCalculationsAndAmortization=Zeigen Sie mir die Berechnungen und Amortisation
-MortgagePaymentInformation=Kredit Zahlung Informationen
-DownPayment=Anzahlung
-DownPaymentDesc=Die <b>Anzahlung</b> = Der Preis des Kredits multipliziert mit dem Prozentsatz geteilt durch 100  (5% wird 5/100 oder 0,05)
-InterestRateDesc=Der <b>Zinssatz</b> = Die jährlichen Zins Prozentsatz dividiert durch 100
-MonthlyFactorDesc=Der <b>monatliche Faktor</b> = Das Ergebnis der folgenden Formel
-MonthlyInterestRateDesc=Der <b>monatliche Zinssatz</b> = Der effektive Jahreszins geteilt durch 12 (für die 12 Monate in einem Jahr)
-MonthTermDesc=Die <b>Monatliche Laufzeit</b> des Darlehens in Monaten = Anzahl der Jahre, die Sie das Darlehen für 12-mal getroffen habe heraus
-MonthlyPaymentDesc=Die monatlichen Zahlung erfolgt anhand der folgenden Formel gefunden
-AmortizationPaymentDesc=Die <a href="#amortization">Amortisation</a> reißt ab wie viel von Ihrer monatlichen Zahlung geht für die Bankzinsen, und wie viel für die Tilgung des Haupt-Darlehen geht.
-AmountFinanced=Höhe Kredit
-AmortizationMonthlyPaymentOverYears=Die Dauer der Amortisation bei einer monatliche Zahlung von: <b> %s</b> wird %s Jahre betragen
-Totalsforyear=Gesamtbetrag für Jahr
-MonthlyPayment=Monatliche Zahlung
-LoanCalcDesc=Mit diesem <b>Hypothek Rechner</b> kann die monatliche Belastung, basierend auf dem Hypothekarbetrag, der Laufzeit und dem Zissatz ermittelt werden.<br> Dieser Rechner beinhaltet auch Regeln für die Berechnung der PMI (Private Mortgage Insurance) wenn weniger als 20%% als Anzahlung geleistet werden. Stadt- und Grundstücksteuern, sowie deren Auswirkung auf die monatliche Belastung werden ebenfalls Berücksichtigt.<br>
-GoToInterest=%s wird in Richtung ZINSEN gehen
-GoToPrincipal=%s wird in Richtung HAUPT gehen
-YouWillSpend=Sie werden %s im Jahr %s bezahlen
 ListLoanAssociatedProject=Liste der Darlehen in dem Projekt
 AddLoan=Darlehen erstellen
+FinancialCommitment=Financial commitment
+InterestAmount=Zins
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=Konfiguration des Modul Kredite
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Standard-Buchhaltungskonto Kapital
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Standard-Buchhaltungskonto Zinsen
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Standard-Buchhaltungskonto Versicherung
-FinancialCommitment=Financial commitment
 CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/langs/de_DE/mails.lang b/htdocs/langs/de_DE/mails.lang
index 99097645903..cf2c2ce63cc 100644
--- a/htdocs/langs/de_DE/mails.lang
+++ b/htdocs/langs/de_DE/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Absender
 MailErrorsTo=Fehler an
 MailReply=Antwort an
 MailTo=Empfänger
+MailToUsers=To user(s)
 MailCC=Kopie an
+MailToCCUsers=Copy to users(s)
 MailCCC=Blindkopie an
 MailTopic=E-Mail-Betreff
 MailText=E-Mail-Text
@@ -164,4 +166,4 @@ InGoingEmailSetup=eMail Posteingang Einstellungen
 OutGoingEmailSetupForEmailing=Einstellung ausgehende E-Mails (für den Massenversand)
 DefaultOutgoingEmailSetup=Standardeinstellungen für ausgehende E-Mails
 Information=Information
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang
index 466ab9e1759..901d50babbf 100644
--- a/htdocs/langs/de_DE/main.lang
+++ b/htdocs/langs/de_DE/main.lang
@@ -12,8 +12,8 @@ FormatDateShort=%d.%m.%Y
 FormatDateShortInput=%d.%m.%Y
 FormatDateShortJava=dd.MM.yyyy
 FormatDateShortJavaInput=dd.MM.yyyy
-FormatDateShortJQuery=dd.MM.yy
-FormatDateShortJQueryInput=dd.MM.yy
+FormatDateShortJQuery=dd.mm.yy
+FormatDateShortJQueryInput=dd.mm.yy
 FormatHourShortJQuery=HH:MI
 FormatHourShort=%H:%M
 FormatHourShortDuration=%H:%M
@@ -71,7 +71,7 @@ SelectDate=Wählen Sie ein Datum
 SeeAlso=Siehe auch %s
 SeeHere=Sehen Sie hier
 ClickHere=Hier klicken
-Here=Here
+Here=Hier
 Apply=Übernehmen
 BackgroundColorByDefault=Standard-Hintergrundfarbe
 FileRenamed=Datei wurde erfolgreich unbenannt
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Der Dolibarr Authentifizierungsmod
 Administrator=Administrator
 Undefined=Nicht definiert
 PasswordForgotten=Passwort vergessen?
+NoAccount=No account?
 SeeAbove=Siehe oben
 HomeArea=Startseite
 LastConnexion=Letzte Verbindung
@@ -231,7 +232,7 @@ Limit=Limit
 Limits=Limits
 Logout=Abmelden
 NoLogoutProcessWithAuthMode=Keine Anwendung Trennungsfunktion mit Authentifizierungsmodus <b>% s </ b>
-Connection=Verbindung
+Connection=Benutzername
 Setup=Einstellungen
 Alert=Warnung
 MenuWarnings=Benachrichtigungen
@@ -328,7 +329,7 @@ Default=Standard
 DefaultValue=Standardwert
 DefaultValues=Standardwert
 Price=Preis
-PriceCurrency=Price (currency)
+PriceCurrency=Preis (Währung)
 UnitPrice=Stückpreis
 UnitPriceHT=Stückpreis (netto)
 UnitPriceHTCurrency=Unit price (net) (currency)
@@ -381,7 +382,7 @@ TotalLT1IN=Gesamt CGST
 TotalLT2IN=Gesamt SGST
 HT=Netto
 TTC=Brutto
-INCVATONLY=Inkl. USt.
+INCVATONLY=Inkl. UmSt.
 INCT=Inkl. aller Steuern
 VAT=USt.
 VATIN=IGST
@@ -402,6 +403,7 @@ DefaultTaxRate=Standardsteuersatz
 Average=Durchschnitt
 Sum=Summe
 Delta=Delta
+RemainToPay=Remain to pay
 Module=Modul/Applikation
 Modules=Modul/Applikation
 Option=Option
@@ -414,7 +416,7 @@ Favorite=Favorit
 ShortInfo=Info.
 Ref=Nr.
 ExternalRef=Externe-ID
-RefSupplier=Lieferanten-Nr.
+RefSupplier=Ref. vendor
 RefPayment=Zahlungsref.-Nr.
 CommercialProposalsShort=Angebote
 Comment=Kommentar
@@ -429,7 +431,7 @@ ActionDoneShort=Abgeschlossen
 ActionUncomplete=unvollständig
 LatestLinkedEvents=Neueste %s verknüpfte Ereignisse
 CompanyFoundation=Firma oder Institution
-Accountant=Accountant
+Accountant=Buchhalter
 ContactsForCompany=Ansprechpartner/Adressen dieses Partners
 ContactsAddressesForCompany=Ansprechpartner / Adressen zu diesem Partner
 AddressesForCompany=Anschriften zu diesem Partner
@@ -438,7 +440,7 @@ ActionsOnMember=Aktionen zu diesem Mitglied
 ActionsOnProduct=Ereignisse zu diesem Produkt
 NActionsLate=%s verspätet
 ToDo=zu erledigen
-Completed=Completed
+Completed=Abgeschlossen
 Running=in Bearbeitung
 RequestAlreadyDone=Anfrage bereits bekannt
 Filter=Filter
@@ -493,7 +495,7 @@ Received=Erhalten
 Paid=Bezahlt
 Topic=Thema
 ByCompanies=Von Partnern
-ByUsers=Von Benutzern
+ByUsers=By user
 Links=Links
 Link=Link
 Rejects=Ablehnungen
@@ -619,9 +621,9 @@ BuildDoc=Erstelle Doc
 Entity=Entität
 Entities=Entitäten
 CustomerPreview=Kundenvorschau
-SupplierPreview=Lieferantenvorschau
+SupplierPreview=Vendor preview
 ShowCustomerPreview=Zeige Kundenvorschau
-ShowSupplierPreview=Zeige Lieferantenvorschau
+ShowSupplierPreview=Show vendor preview
 RefCustomer=Ihr Zeichen
 Currency=Währung
 InfoAdmin=Hinweise für Administratoren
@@ -679,7 +681,7 @@ Color=Farbe
 Documents=Verknüpfte Dokumente
 Documents2=Dokumente
 UploadDisabled=Upload deaktiviert
-MenuAccountancy=Buchführung
+MenuAccountancy=Buchhaltung
 MenuECM=Dokumente
 MenuAWStats=Statistiken
 MenuMembers=Mitglieder
@@ -866,7 +868,7 @@ FileNotShared=Datei nicht öffentlich zugänglich
 Project=Projekt
 Projects=Projekte
 Rights=Berechtigungen
-LineNb=Line no.
+LineNb=Zeilennummer
 IncotermLabel=Incoterms
 # Week day
 Monday=Montag
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=Produkte oder Dienstleistungen
 SearchIntoProjects=Projekte
 SearchIntoTasks=Aufgaben
 SearchIntoCustomerInvoices=Kundenrechnungen
-SearchIntoSupplierInvoices=Lieferantenrechnungen
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Kundenaufträge
-SearchIntoSupplierOrders=Lieferantenbestellungen
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=Kunden Angebote
-SearchIntoSupplierProposals=Angebote Lieferant
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Serviceaufträge
 SearchIntoContracts=Verträge
 SearchIntoCustomerShipments=Kunden Lieferungen
@@ -933,11 +935,13 @@ CommentDeleted=Kommentar gelöscht
 Everybody=Jeder
 PayedBy=Bezahlt durch
 PayedTo=Bezahlt an
-Monthly=Monthly
-Quarterly=Quarterly
-Annual=Annual
-Local=Local
+Monthly=Monatlich
+Quarterly=Quartalsweise
+Annual=Jährlich
+Local=Lokal
 Remote=Remote
-LocalAndRemote=Local and Remote
-KeyboardShortcut=Keyboard shortcut
+LocalAndRemote=Lokal und Remote
+KeyboardShortcut=Tastaur Kürzel
 AssignedTo=Zugewiesen an
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/de_DE/margins.lang b/htdocs/langs/de_DE/margins.lang
index 676e833e1b8..cd0b821f9ab 100644
--- a/htdocs/langs/de_DE/margins.lang
+++ b/htdocs/langs/de_DE/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=Als Service
 UseDiscountOnTotal=Auf Zwischensumme
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Definiert, ob ein globaler Rabatt als Produkt, Service oder nur als Zwischensumme für die Gewinnberechnung benutzt wird.
 MARGIN_TYPE=Kaufpreis / Kosten standardmäßig vorgeschlagen für Standardmargenkalkulation empfohlen\n
-MargeType1=Spanne vom besten Lieferantenpreis
+MargeType1=Margin on Best vendor price
 MargeType2=gewichtete Durchschnittspreis (WAP)
 MargeType3=Marge auf Herstellkosten
-MarginTypeDesc=* Marge auf den günstigsten EK-Preis : Verkaufspreis - günstigster EK-Preis aus den Artikeldaten<br>* Marge auf den gleitenden Durchschnittspreis (GLD) : Verkaufspreis - gleitender Durchschnittspreis (GLD) oder günstigster EK-Preis falls der GLD nicht definiert ist<br>* Marge auf Herstellkosten = Verkaufspreis - Herstellkosten aus den Artikeldaten oder GLD, wenn die Herstellkosten nicht definiert sind oder günstigster EK-Preis, wenn der GLD nicht definiert ist
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Selbstkostenpreis
 UnitCharges=Einheit Kosten
 Charges=Kosten
diff --git a/htdocs/langs/de_DE/members.lang b/htdocs/langs/de_DE/members.lang
index a987eb6e759..70a0cf5e2b3 100644
--- a/htdocs/langs/de_DE/members.lang
+++ b/htdocs/langs/de_DE/members.lang
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
diff --git a/htdocs/langs/de_DE/opensurvey.lang b/htdocs/langs/de_DE/opensurvey.lang
index 3ae1d6b6d5e..f40a2062e82 100644
--- a/htdocs/langs/de_DE/opensurvey.lang
+++ b/htdocs/langs/de_DE/opensurvey.lang
@@ -58,3 +58,4 @@ MoreChoices=Geben Sie weitere Wahlmöglichkeiten ein
 SurveyExpiredInfo=Die Umfrage ist geschlossen oder beendet.
 EmailSomeoneVoted=%s hat eine Zeile gefüllt. Sie können Ihre Umfrage unter dem Link  finden: %s
 ShowSurvey=Umfrage anzeigen
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/de_DE/orders.lang b/htdocs/langs/de_DE/orders.lang
index d2317355201..4653c72480b 100644
--- a/htdocs/langs/de_DE/orders.lang
+++ b/htdocs/langs/de_DE/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Kundenaufträge-Übersicht
-SuppliersOrdersArea=Übersicht Lieferantenbestellungen
+SuppliersOrdersArea=Purchase orders area
 OrderCard=Bestellung - Karte
 OrderId=Bestell-ID
 Order=Bestellung
@@ -13,10 +13,10 @@ OrderToProcess=Auftrag zur Bearbeitung
 NewOrder=Neue Bestellung
 ToOrder=Erzeuge Bestellung
 MakeOrder=Erzeuge Bestellung
-SupplierOrder=Lieferantenbestellung
-SuppliersOrders=Lieferantenbestellungen
-SuppliersOrdersRunning=Aktuelle Lieferantenbestellungen
-CustomerOrder=Kundenauftrag
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=Kundenanfrage
 CustomersOrders=Kundenaufträge
 CustomersOrdersRunning=Aktuelle Kundenaufträge
 CustomersOrdersAndOrdersLines=Kundenaufträge und Auftragspositionen
@@ -24,7 +24,7 @@ OrdersDeliveredToBill=Kundenbestellungen geliefert zu verrechnen
 OrdersToBill=Gelieferte Kundenaufträge
 OrdersInProcess=Kundenaufträge in Bearbeitung
 OrdersToProcess=Zu bearbeitende Kundenaufträge
-SuppliersOrdersToProcess=Lieferantenbestellung in Bearbeitung
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=Storniert
 StatusOrderDraftShort=Entwurf
 StatusOrderValidatedShort=Freigegeben
@@ -75,15 +75,15 @@ ShowOrder=Zeige Bestellung
 OrdersOpened=Bestellungen zu bearbeiten
 NoDraftOrders=Keine Auftrags-Entwürfe
 NoOrder=Kein Auftrag
-NoSupplierOrder=Keine Bestellung
+NoSupplierOrder=No purchase order
 LastOrders=%s neueste Kundenbestellungen
 LastCustomerOrders=%s neueste Kundenbestellungen
-LastSupplierOrders=%s neueste Lieferantenbestellungen
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=%s zuletzt bearbeitete Bestellungen
 AllOrders=Alle Bestellungen
 NbOfOrders=Anzahl der Bestellungen
 OrdersStatistics=Bestellstatistik
-OrdersStatisticsSuppliers=Statistik Lieferantenbestellungen
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Anzahl der Bestellungen pro Monat
 AmountOfOrdersByMonthHT=Anzahl der Aufträge pro Monat (nach Steuern)
 ListOfOrders=Liste Aufträge
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Bestätigen Sie, dass Sie diese Bestellung am <b>%s</b> aufgege
 GenerateBill=Erzeuge Rechnung
 ClassifyShipped=Als geliefert markieren
 DraftOrders=Entwürfe
-DraftSuppliersOrders=Bestellungen entwerfen
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=Bestellungen in Bearbeitung
 RefOrder=Bestell-Nr.
 RefCustomerOrder=Kunden-BestellNr.
-RefOrderSupplier=Lieferanten-BestellNr.
-RefOrderSupplierShort=Lieferanten-BestellNr.
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=Bestellung per Post versenden
 ActionsOnOrder=Ereignisse zu dieser Bestellung
 NoArticleOfTypeProduct=Keine Artikel vom Typ 'Produkt' und deshalb keine Versandkostenposition
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Möchten Sie die Bestellung <b>%s</b> wirklich duplizieren?
 DispatchSupplierOrder=Lieferantenbestellung %s erhalten
 FirstApprovalAlreadyDone=1. Bestätigung bereits erledigt
 SecondApprovalAlreadyDone=2. Bestätigung bereits erledigt
-SupplierOrderReceivedInDolibarr=Lieferantenbestellung %s erhalten %s
-SupplierOrderSubmitedInDolibarr=Lieferantenbestellung %s versendet
-SupplierOrderClassifiedBilled=Bestellung %s als verrechnet markieren
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Bestellungen Anderer
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Kundenauftrag-Nachbetreuung durch Vertreter
@@ -125,11 +125,11 @@ TypeContact_commande_internal_SHIPPING=Versand-Nachbetreuung durch Vertreter
 TypeContact_commande_external_BILLING=Rechnungskontakt des Kunden
 TypeContact_commande_external_SHIPPING=Versandkontakt des Kunden
 TypeContact_commande_external_CUSTOMER=Bestellung-Nachbetreuung durch Kundenkontakt
-TypeContact_order_supplier_internal_SALESREPFOLL=Lieferantenbestellung-Nachbetreuung durch Vertreter
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Versand-Nachbetreuung durch Vertreter
-TypeContact_order_supplier_external_BILLING=Kontakt für Lieferantenrechnungen
-TypeContact_order_supplier_external_SHIPPING=Kontakt für Lieferantenversand
-TypeContact_order_supplier_external_CUSTOMER=Lieferantenkontakt für Bestellverfolgung
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Konstante COMMANDE_SUPPLIER_ADDON nicht definiert
 Error_COMMANDE_ADDON_NotDefined=Konstante COMMANDE_ADDON nicht definiert
 Error_OrderNotChecked=Keine zu verrechnende Bestellungen ausgewählt
diff --git a/htdocs/langs/de_DE/other.lang b/htdocs/langs/de_DE/other.lang
index 56fba5977bf..052ffcc9050 100644
--- a/htdocs/langs/de_DE/other.lang
+++ b/htdocs/langs/de_DE/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nDas ist ein Test-Mail gesendet an __EMAIL__.\nDi
 PredefinedMailTestHtml=Dies ist ein <b>Test</b> Mail (das Wort Test muss in Fettschrift erscheinen). <br> Die beiden Zeilen sollten durch einen Zeilenumbruch getrennt sein.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nBitte entnehmen Sie dem Anhang unser Angebot __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nHier die gewünschte Preisauskunft __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nBitte entnehmen Sie dem Anhang die Bestellung __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nBitte entnehmen Sie dem Anhang unsere Bestellung __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=Dateien sind zu groß
 PleaseBePatient=Bitte haben Sie ein wenig Geduld ...
 NewPassword=New password
 ResetPassword=Kennwort zurücksetzen
-RequestToResetPasswordReceived=Eine Anfrage zur Änderung Ihres Dolibarr Passworts traf ein.
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=Dies sind Ihre neuen Anmeldedaten
 NewKeyWillBe=Ihr neuer Anmeldeschlüssel für die Software ist
 ClickHereToGoTo=Hier klicken für %s
@@ -233,6 +233,8 @@ PermissionsDelete=Berechtigungen entfernt
 YourPasswordMustHaveAtLeastXChars=Ihr Passwort muss mindestens <strong> %s </strong> Zeichen enthalten
 YourPasswordHasBeenReset=Ihr Passwort wurde zurückgesetzt
 ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=Exportübersicht
 AvailableFormats=Verfügbare Formate
diff --git a/htdocs/langs/de_DE/productbatch.lang b/htdocs/langs/de_DE/productbatch.lang
index da4d945c45b..1a20ae5f306 100644
--- a/htdocs/langs/de_DE/productbatch.lang
+++ b/htdocs/langs/de_DE/productbatch.lang
@@ -16,7 +16,7 @@ printEatby=Verzehren bis: %s
 printSellby=Verkaufen bis: %s
 printQty=Menge: %d
 AddDispatchBatchLine=Fügen Sie eine Zeile für Haltbarkeit Versendung
-WhenProductBatchModuleOnOptionAreForced=Wenn das Modul Lot/Serien-Nr. eingeschaltet ist, wird der Modus für Lagerbestands-Erhöhungen / -Senkungen auf die letzte Auswahl festgelegt und kann nicht geändert werden. Andere Optionen können nach Wunsch eingestellt werden.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=Dieses Produkt verwendet keine Lose oder Seriennummern
 ProductLotSetup=Verwaltung von Modul Charge / Seriennummern
 ShowCurrentStockOfLot=Warenbestand anzeigen für Produkt/Charge
diff --git a/htdocs/langs/de_DE/products.lang b/htdocs/langs/de_DE/products.lang
index 3d984abec31..d7e77a67d7c 100644
--- a/htdocs/langs/de_DE/products.lang
+++ b/htdocs/langs/de_DE/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Verkaufte Menge
 PurchasedAmount=angeschaffte Menge
 NewPrice=Neuer Preis
 MinPrice=Mindestverkaufspreis
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=Der Verkaufspreis darf den Mindestpreis für dieses Produkt (%s ohne USt.) nicht unterschreiten. Diese Meldung kann auch angezeigt werden, wenn Sie einen zu hohen Rabatt geben.
 ContractStatusClosed=Geschlossen
 ErrorProductAlreadyExists=Ein Produkt mit Artikel Nr. %s existiert bereits.
@@ -155,7 +156,7 @@ BuyingPrices=Einkaufspreis
 CustomerPrices=Kundenpreise
 SuppliersPrices=Lieferantenpreise
 SuppliersPricesOfProductsOrServices=Lieferantenpreise (von Produkten oder Leistungen)
-CustomCode=Customs/Commodity/HS Kode
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=Urspungsland
 Nature=Art
 ShortLabel=Kurzbezeichnung
diff --git a/htdocs/langs/de_DE/projects.lang b/htdocs/langs/de_DE/projects.lang
index 2af31a6953e..6aaef1d7850 100644
--- a/htdocs/langs/de_DE/projects.lang
+++ b/htdocs/langs/de_DE/projects.lang
@@ -77,6 +77,7 @@ Time=Zeitaufwand
 ListOfTasks=Aufgabenliste
 GoToListOfTimeConsumed=Liste der verwendeten Zeit aufrufen
 GoToListOfTasks=Liste der Aufgaben aufrufen
+GoToGanttView=Go to Gantt view
 GanttView=Gantt-Diagramm
 ListProposalsAssociatedProject=Liste Angebote, die mit diesem Projekt verknüpft sind
 ListOrdersAssociatedProject=Liste der mit diesem Projekt verbundenen Kunden-Bestellungen
@@ -226,4 +227,4 @@ AllowCommentOnProject=Benutzer dürfen Projekte kommentieren
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/de_DE/stocks.lang b/htdocs/langs/de_DE/stocks.lang
index 339f3e65edd..0e38a6e2736 100644
--- a/htdocs/langs/de_DE/stocks.lang
+++ b/htdocs/langs/de_DE/stocks.lang
@@ -203,3 +203,4 @@ RegulateStock=Lager ausgleichen
 ListInventory=Liste
 StockSupportServices=Unterstützung bei der Lagerverwaltung
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/de_DE/stripe.lang b/htdocs/langs/de_DE/stripe.lang
index 3d2eadeb1a2..3437322fd6a 100644
--- a/htdocs/langs/de_DE/stripe.lang
+++ b/htdocs/langs/de_DE/stripe.lang
@@ -58,8 +58,8 @@ NameOnCard=Name on card
 CardNumber=Card Number
 ExpiryDate=Expiry Date
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/de_DE/supplier_proposal.lang b/htdocs/langs/de_DE/supplier_proposal.lang
index e20722967ca..2b12b23afbc 100644
--- a/htdocs/langs/de_DE/supplier_proposal.lang
+++ b/htdocs/langs/de_DE/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Handelsangebot Lieferant
-supplier_proposalDESC=Preisanfrage an Lieferanten verwalten
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
 SupplierProposalNew=neue Preisanfrage
 CommRequest=Preisanfrage
 CommRequests=Preisanfragen
 SearchRequest=Anfrage suchen
 DraftRequests=Anfrage erstellen
-SupplierProposalsDraft=Entwurf Lieferantenanfrage
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=Letzte %s geänderte Preisanfragen
 RequestsOpened=offene Preisanfragen
-SupplierProposalArea=Bereich Lieferantenangebote
-SupplierProposalShort=Lieferanten Angebot
-SupplierProposals=Lieferanten Angebote
-SupplierProposalsShort=Lieferanten Angebote
+SupplierProposalArea=Vendor proposals area
+SupplierProposalShort=Vendor proposal
+SupplierProposals=Vendor proposals
+SupplierProposalsShort=Vendor proposals
 NewAskPrice=neue Preisanfrage
 ShowSupplierProposal=Presianfrage anzeigen
 AddSupplierProposal=Preisanfrage erstellen
-SupplierProposalRefFourn=Lieferantenreferenz
+SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=Liefertermin
 SupplierProposalRefFournNotice=Vor dem schließen mit "Freigeben", sollten Sie die Lieferanten-Nr. erfassen.
 ConfirmValidateAsk=Möchten Sie diese Preisanfrage wirklich unter <b>%s</b> bestätigen?
@@ -47,9 +47,9 @@ CommercialAsk=Preisanfrage
 DefaultModelSupplierProposalCreate=Erstellung eines Standard-Modells
 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 Zuliefererangebote, die mit diesem Projekt verknüpft sind
-SupplierProposalsToClose=zu schließende Lieferantenangebote 
-SupplierProposalsToProcess=Lieferantenangebote in Bearbeitung
+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=Letzte %s Preisanfragen
 AllPriceRequests=Alle Anfragen
diff --git a/htdocs/langs/de_DE/suppliers.lang b/htdocs/langs/de_DE/suppliers.lang
index 82acc05c028..f6edf98a5e0 100644
--- a/htdocs/langs/de_DE/suppliers.lang
+++ b/htdocs/langs/de_DE/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Lieferanten
-SuppliersInvoice=Lieferantenrechnung
-ShowSupplierInvoice=Zeige Lieferantenrechnung
-NewSupplier=Neuer Lieferant
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=Verlauf
-ListOfSuppliers=Lieferantenliste
-ShowSupplier=Zeige Lieferanten
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=Bestelldatum
 BuyingPriceMin=Bester Einkaufspreis
 BuyingPriceMinShort=min. EK
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Summe  Unterprodukte Verkaufspreis
 SomeSubProductHaveNoPrices=Einige Unterprodukte haben keinen Preis 
 AddSupplierPrice=Einkaufspreis anlegen
 ChangeSupplierPrice=Ändere Einkaufspreis
-SupplierPrices=Lieferantenpreise
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Für dieses Produkt existiert bereits ein Lieferantenpreis vom gewählten Anbieter: %s
-NoRecordedSuppliers=Keine Lieferanten erfasst
-SupplierPayment=Lieferantenzahlung
-SuppliersArea=Lieferantenübersicht
-RefSupplierShort=Lieferant Nr.
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=Verfügbarkeit
-ExportDataset_fournisseur_1=Lieferantenrechnungen und Positionen
-ExportDataset_fournisseur_2=Lieferantenrechnungen und Zahlungen
-ExportDataset_fournisseur_3=Lieferantenbestellungen und Auftragszeilen
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=Bestellung bestätigen
 ConfirmApproveThisOrder=Möchten Sie diese Bestellung <b>%s</b>  wirklich bestätigen?
 DenyingThisOrder=Bestellung ablehnen
 ConfirmDenyingThisOrder=Möchten Sie diese Bestellung  <b>%s</b> wirklich ablehnen?
 ConfirmCancelThisOrder=Möchten Sie die Bestellung <b>%s</b> wirklich stornieren ?
-AddSupplierOrder=Lieferantenbestellung erstellen
-AddSupplierInvoice=Lieferantenrechnung erstellen
-ListOfSupplierProductForSupplier=Produkt- und Preisliste für Anbieter <b>%s</b>
-SentToSuppliers=An Lieferanten geschickt
-ListOfSupplierOrders=Liste der Lieferantenbestellungen
-MenuOrdersSupplierToBill=Zu berechnende Lieferantenbestellungen
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Lieferverzug in Tagen
 DescNbDaysToDelivery=Max. Verspätungstoleranz bei Lieferverzögerungen bei Produkten aus dieser Bestellung
-SupplierReputation=Lieferanten Reputation
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Nicht sortieren
 NotTheGoodQualitySupplier=Ungültige Qualität
 ReputationForThisProduct=Reputation
 BuyerName=Käufer
 AllProductServicePrices=Alle Produkt/Leistung Preise
 AllProductReferencesOfSupplier=Alle Produkt- / Service-Referenzen des Lieferanten
-BuyingPriceNumShort=Lieferantenpreise
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/de_DE/website.lang b/htdocs/langs/de_DE/website.lang
index 405d6f9a643..60f33ee68d1 100644
--- a/htdocs/langs/de_DE/website.lang
+++ b/htdocs/langs/de_DE/website.lang
@@ -73,7 +73,7 @@ AnotherContainer=Ein weiterer Container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
diff --git a/htdocs/langs/de_DE/workflow.lang b/htdocs/langs/de_DE/workflow.lang
index 7c21a35c4db..0e86cb4d349 100644
--- a/htdocs/langs/de_DE/workflow.lang
+++ b/htdocs/langs/de_DE/workflow.lang
@@ -8,13 +8,13 @@ descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Erstellen Sie automatisch eine Kundenrech
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Erstelle automatisch eine Kundenrechnung, nachdem der Vertrag bestätigt wurde.
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Erstellen Sie automatisch eine Kundenrechnung, nachdem eine Kundenbestellung geschlossen wurde (die neue Rechnung hat den gleichen Betrag wie die Bestellung)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer order is set to billed (and if amount of the order is same than total amount of signed linked proposals)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Die verbundenen Quellangebote auf abgerechnet setzen, wenn die Kunden-Bestellung als abgerechnet gesetzt wurde (und der Betrag der Bestellung gleich mit dem der gezeichneten verbundenen Angebote ist)
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of signed linked proposals)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=automatische Erstellung
 AutomaticClassification=Automatische Klassifikation
diff --git a/htdocs/langs/el_GR/accountancy.lang b/htdocs/langs/el_GR/accountancy.lang
index 2fa0016006a..d1d9297c8b4 100644
--- a/htdocs/langs/el_GR/accountancy.lang
+++ b/htdocs/langs/el_GR/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Λογιστική
 ACCOUNTING_EXPORT_SEPARATORCSV=Διαχωριστής στηλών για το αρχείο που θα εξαχθεί
 ACCOUNTING_EXPORT_DATE=Μορφή ημερομηνίας για το αρχείο που θα εξαχθεί
 ACCOUNTING_EXPORT_PIECE=Export the number of piece
@@ -36,14 +37,14 @@ NotYetInGeneralLedger=Not yet journalized in ledgers
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
 DetailByAccount=Show detail by account
 AccountWithNonZeroValues=Accounts with non zero values
-ListOfAccounts=List of accounts
+ListOfAccounts=Λίστα λογαριασμών
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers 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
 
-AccountancyArea=Accountancy area
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
 AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
@@ -89,7 +90,7 @@ MenuProductsAccounts=Λογαρισμοί προϊόντων
 ProductsBinding=Λογαριασμοί προϊόντων
 Ventilation=Binding to accounts
 CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Supplier invoice binding
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Δημιουργήστε μία νέα συναλλαγή
 UpdateMvts=Τροποποίηση συναλλαγής
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=Ημερολόγιο αγορών
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Διάφορα ημερολόγια
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Ημερολόγιο εξόδων
 ACCOUNTING_SOCIAL_JOURNAL=Κοινωνικό ημερολόγιο
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
 ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
@@ -185,11 +187,12 @@ ListeMvts=Λίστα κινήσεων
 ErrorDebitCredit=Χρεωστικές και Πιστωτικές δεν μπορούν να χουν την ίδια αξία ταυτόχρονα
 AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=Λίστα λογαριασμού τρίτων
-DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=Λίστα των λογιστικών λογαριασμών
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Ομάδα του λογαριασμού
 Pcgsubtype=Υποομάδα του λογαριασμού
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
 ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=Συμβουλευτείτε εδώ τη λίστα των γραμμών των τιμολογίων του προμηθευτή και τη λογιστική του λογαριασμού τους
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
 DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report 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 fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Σφάλμα, δεν μπορείτε να διαγράψετε αυτόν τον λογιστικό λογαριασμό γιατί χρησιμοποιείται
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -293,4 +296,9 @@ Binded=Lines bound
 ToBind=Lines to bind
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index 59600b93f9c..ad80223ffa2 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (Προεπιλογή στο php.ini: <b>%
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Θύρα SMTP/SMTPS (Δεν καθορίζεται στην PHP σε συστήματα Unix)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Δεν καθορίζεται στην PHP σε συστήματα Unix)
 MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= Να αποστέλλονται κρυφά αντίγραφα των απεσταλμένων emails στο
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=Μέθοδος που χρησιμοποιείτε για αποστολή EMails
 MAIN_MAIL_SMTPS_ID=SMTP ID αν απαιτείται πιστοποίηση
 MAIN_MAIL_SMTPS_PW=Κωδικός SMTP αν απαιτείται πιστοποίηση
@@ -291,7 +292,7 @@ ModuleSetup=Διαχείριση Αρθρώματος
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=Σύστημα
 ModuleFamilyCrm=Customer Relation Management (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Διαχείριση προϊόντων 
 ModuleFamilyHr=Διαχείριση ανθρώπινων πόρων
 ModuleFamilyProjects=Projects/Συμμετοχικές εργασίες
@@ -373,7 +374,8 @@ NoSmsEngine=Δεν υπάρχει πρόγραμμα αποστολής SMS δι
 PDF=PDF
 PDFDesc=Μπορείτε να ρυθμίσετε κάθε κεντρική επιλογή που σχετίζεται με τη δημιουργία PDF
 PDFAddressForging=Κανόνες για να δημιουργηθούν διευθύνσεις
-HideAnyVATInformationOnPDF=Απόκρυψη όλων των πληροφοριών που σχετίζονται με τον ΦΠΑ στα δημιουργηθέντα PDF
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=Απόκρυψη περιγραφών προϊόντων στα δημιουργηθέντα PDF
@@ -445,7 +447,8 @@ DisplayCompanyInfo=Εμφάνιση διεύθυνσης επιχείρησης
 DisplayCompanyManagers=Display manager names
 DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party 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.
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Set this to 1 if you want to attach main document to emai
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=Χρήστες & Ομάδες
 Module0Desc=Users / Employees and Groups management
@@ -479,7 +485,7 @@ Module1Desc=Διαχείριση εταιρειών και επαφών (πελ
 Module2Name=Εμπορικό
 Module2Desc=Εμπορική διαχείριση
 Module10Name=Λογιστική
-Module10Desc=Απλές αναφορές λογιστικής (ημερολόγια, τζίρος) βασισμένα στα περιεχόμενο της βάσης δεδομένων. Χωρίς αποστολές.
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=Προτάσεις
 Module20Desc=Διαχείριση προσφορών
 Module22Name=Μαζική αποστολή e-mail
@@ -546,8 +552,8 @@ Module400Name=Έργα/Ευκαιρίες/Leads
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Ημερολόγιο ιστού
 Module410Desc=Διεπαφή ημερολογίου ιστού
-Module500Name=Ειδικά έξοδα
-Module500Desc=Διαχείριση ειδικών εξόδων (φόροι, δόσεις)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Payment of employee wages
 Module510Desc=Record and follow payment of your employee wages
 Module520Name=Δάνειο
@@ -561,14 +567,14 @@ Module700Name=Δωρεές
 Module700Desc=Donation management
 Module770Name=Αναφορές εξόδων
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Mantis integration
 Module1520Name=Δημιουργία εγγράφων
 Module1520Desc=Δημιουργία εγγράφου για μαζικά mail
 Module1780Name=Ετικέτες/Κατηγορίες
-Module1780Desc=Δημιουργήστε ετικέτες/κατηγορίες (προϊόντα, πελάτες, προμηθευτές, επαφές ή μέλη)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
 Module2200Name=Δυναμικές Τιμές
@@ -576,7 +582,7 @@ Module2200Desc=Ενεργοποιήστε τη χρήση των μαθηματ
 Module2300Name=Προγραμματισμένες εργασίες
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API/Web services (SOAP server)
@@ -613,7 +619,7 @@ Module50100Desc=Point of sales module (POS).
 Module50200Name=Paypal
 Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 Module50400Name=Λογιστική (για προχωρημένους)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=PrintIPP
 Module54000Desc=Απευθείας εκτύπωση (χωρίς να ανοίξετε τα έγγραφα) χρησιμοποιώντας Cups IPP διασύνδεση (Ο Εκτυπωτής πρέπει να είναι ορατός από τον server, και το CUPS πρέπει να έχει εγκατασταθεί στο server).
 Module55000Name=Δημοσκόπηση, έρευνα ή ψηφοφορία
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed memb
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=Other menu entries manage optional parameters.
 LogEvents=Security audit events
 Audit=Ιστορικό εισόδου χρηστών
@@ -1054,8 +1060,9 @@ LogEventDesc=You can enable here the logging for Dolibarr security events. Admin
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1188,11 +1195,11 @@ UserMailRequired=EMail required to create a new user
 HRMSetup=HRM module setup
 ##### Company setup #####
 CompanySetup=Ρυθμίσεις αρθρώματος Εταιριών
-CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier)
-AccountCodeManager=Module for accounting code generation (customer or supplier)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
 NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
 ModelModules=Πρότυπα εγγράφων
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
@@ -1203,6 +1210,9 @@ MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
 TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=Ελεύθερο κείμενο στις προσφορ
 WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ρωτήστε για τον τραπεζικό λογαριασμό προορισμού της προσφοράς
 ##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=Order management setup
 OrdersNumberingModules=Orders numbering models
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe
 OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
 OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
 ##### Stock #####
-StockSetup=Ρύθμιση module Αποθήκη
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
 ##### Menu #####
 MenuDeleted=Menu deleted
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
 MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
 SuppliersSetup=Supplier module setup
-SuppliersCommandModel=Complete template of supplier order (logo...)
-SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=Μη χρησιμοποιείται διφορούμε
 SalariesSetup=Ρύθμιση module μισθών
 SortOrder=Σειρά ταξινόμησης
 Format=Μορφή
-TypePaymentDesc=0:Τύπος πληρωμής πελάτη, 1:Τύπος πληρωμής προμηθευτή, 2:Τύπος πληρωμής τόσο για τους πελάτες όσο και για τους προμηθευτές
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Install of external module from applic
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
-TextTitleColor=Χρώμα τίτλου σελίδας
+TextTitleColor=Text color of Page title
 LinkColor=Χρώμα σε συνδέσμους
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=Χρώμα φόντου για το επάνω μενού
 TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Χρώμα φόντου για το αριστερό μενού
 BackgroundTableTitleColor=Χρώμα φόντου για τη γραμμή επικεφαλίδας του πίνακα
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Χρώμα φόντου για τις περιττές (μονές) γραμμές του πίνακα
 BackgroundTableLineEvenColor=Χρώμα φόντου για τις άρτιες (ζυγές) γραμμές του πίνακα
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
 ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=Για αποστολή παραγγελίας πελάτη
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-MailToMember=To send email from member page
-MailToUser=To send email from user page
-MailToProject= To send email from project page
+MailToSendProposal=Προσφορές πελατών
+MailToSendOrder=Παραγγελίες πελατών
+MailToSendInvoice=Τιμολόγια πελατών
+MailToSendShipment=Αποστολές
+MailToSendIntervention=Παρεμβάσεις
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Συμβόλαια
+MailToThirdparty=Πελ./Προμ.
+MailToMember=Μέλη
+MailToUser=Χρήστες
+MailToProject=Projects page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1780,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/el_GR/bills.lang b/htdocs/langs/el_GR/bills.lang
index 5d08d610f6a..a4aae2d100c 100644
--- a/htdocs/langs/el_GR/bills.lang
+++ b/htdocs/langs/el_GR/bills.lang
@@ -109,7 +109,7 @@ CancelBill=Ακύρωση Τιμολογίου
 SendRemindByMail=Αποστολή υπενθύμισης με email
 DoPayment=Enter payment
 DoPaymentBack=Enter refund
-ConvertToReduc=Μετατροπή σε μελλοντική έκπτωση
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Εισαγωγή πληρωμής από πελάτη
@@ -120,7 +120,7 @@ BillStatus=Κατάσταση τιμολογίου
 StatusOfGeneratedInvoices=Κατάσταση δημιουργηθέντων τιμολογίων
 BillStatusDraft=Πρόχειρο (απαιτείται επικύρωση)
 BillStatusPaid=Πληρωμένο
-BillStatusPaidBackOrConverted=Refund or converted into discount
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Εγκαταλελειμμένο
 BillStatusValidated=Επικυρωμένο (χρήζει πληρωμής)
@@ -296,10 +296,10 @@ DiscountType=Discount type
 NoteReason=Σημείωση/Αιτία
 ReasonDiscount=Αιτία
 DiscountOfferedBy=Παραχωρούνται από
-DiscountStillRemaining=Discounts available
-DiscountAlreadyCounted=Discounts already consumed
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+SupplierDiscounts=Vendors discounts
 BillAddress=Διεύθυνση χρέωσης
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but
 PaymentNote=Σημείωση πληρωμής
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Κάθε %s ημέρες
 FrequencyPer_m=Κάθε %s μήνες
 FrequencyPer_y=Κάθε %s χρόνια
@@ -505,9 +511,14 @@ SituationAmount=Κατάσταση τιμολογίου ποσό (καθαρό)
 SituationDeduction=Αφαίρεση κατάστασης
 ModifyAllLines=Τροποποίηση σε όλες τις γραμμές
 CreateNextSituationInvoice=Δημιουργήστε την επόμενη κατάσταση
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=Το τιμολόγιο δεν είναι το τελευταίο της σειράς και δεν πρέπει να τροποποιηθεί
 DisabledBecauseNotLastInCycle=Η επόμενη κατάσταση υπάρχει ήδη.
 DisabledBecauseFinal=Η κατάσταση αυτή είναι οριστική.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=Κ
 CantBeLessThanMinPercent=Η πρόοδος δεν μπορεί να είναι μικρότερη από την αξία του στην προηγούμενη κατάσταση.
 NoSituations=Δεν υπάρχουν ανοικτές καταστάσεις
 InvoiceSituationLast=Τελικό και γενικό τιμολόγιο
@@ -532,3 +543,4 @@ AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/el_GR/categories.lang b/htdocs/langs/el_GR/categories.lang
index 4b61c434dc2..c8170e9ebfa 100644
--- a/htdocs/langs/el_GR/categories.lang
+++ b/htdocs/langs/el_GR/categories.lang
@@ -16,7 +16,7 @@ MembersCategoriesArea=Πεδίο Ετικέτα/Κατηγορία Μελών
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Περιοχή Ετικετών/Κατηγοριών Λογαριασμών
 ProjectsCategoriesArea=Projects tags/categories area
-SubCats=Υποκατηγορίες
+SubCats=Sub-categories
 CatList=Λίστα Ετικετών/Κατηγοριών
 NewCategory=Νέα Ετικέτα/Κατηγορία
 ModifCat=Τροποποίηση Ετικέτας/Κατηγορίας
@@ -85,3 +85,4 @@ CategorieRecursivHelp=Εάν είναι ενεργοποιημένο, το πρ
 AddProductServiceIntoCategory=Προσθέστε το ακόλουθο προϊόν/υπηρεσία
 ShowCategory=Εμφάνιση ετικέτας/κατηγορίας
 ByDefaultInList=By default in list
+ChooseCategory=Choose category
diff --git a/htdocs/langs/el_GR/commercial.lang b/htdocs/langs/el_GR/commercial.lang
index b20ec8086ff..fcd6f86ea4e 100644
--- a/htdocs/langs/el_GR/commercial.lang
+++ b/htdocs/langs/el_GR/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=Κλείσιμο
 ActionAC_EMAILING=Αποστολή μαζικών email
 ActionAC_COM=Αποστολή παραγγελίας πελάτη με email
 ActionAC_SHIP=Αποστολή αποστολής με e-mail
-ActionAC_SUP_ORD=Αποστολή παραγγελίας προμηθευτή με email
-ActionAC_SUP_INV=Αποστολή τιμολογίου προμηθευτή με email
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=Άλλο
 ActionAC_OTH_AUTO=Αυτόματα εισηγμένα συμβάντα
 ActionAC_MANUAL=Χειροκίνητα εισηγμένα συμβάντα
diff --git a/htdocs/langs/el_GR/companies.lang b/htdocs/langs/el_GR/companies.lang
index 289d7f925dd..ef61b1842c5 100644
--- a/htdocs/langs/el_GR/companies.lang
+++ b/htdocs/langs/el_GR/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Είστε βέβαιοι ότι θέλετε να διαγ
 MenuNewThirdParty=Νέα εγγραφή
 MenuNewCustomer=Νέος Πελάτης
 MenuNewProspect=Νέα Προοπτική
-MenuNewSupplier=Νέος Προμηθευτής
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=Νέος Ιδιώτης
-NewCompany=Νέα εταιρία (προοπτική, πελάτης, προμηθευτής))
-NewThirdParty=Νέος Πελ./Προμ. (προοπτική, πελάτης, προμηθευτής)
-CreateDolibarrThirdPartySupplier=Δημιουργήστε ένα Πελ.Προμ. (προμηθευτής)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=Create thirdpary
 CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Περιοχή προοπτικής
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=Προοπτικές
 ThirdPartyCustomers=Πελάτες
 ThirdPartyCustomersStats=Πελάτες
 ThirdPartyCustomersWithIdProf12=Πελάτες με %s ή %s
-ThirdPartySuppliers=Προμηθευτές
+ThirdPartySuppliers=Vendors
 ThirdPartyType=Τύπος Πελ./Προμ.
 Individual=Ιδιώτης
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
@@ -77,11 +77,11 @@ Web=Ιστοσελίδα
 Poste= Θέση
 DefaultLang=Γλώσσα
 VATIsUsed=Sales tax is used
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
-ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Total proposals
 OverAllOrders=Total orders
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=Τύπος RE
 TypeLocaltax2ES=Τύπος IRPF
 WrongCustomerCode=Άκυρος κωδικός πελάτη
-WrongSupplierCode=Άκυρος κωδικός προμηθευτή
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Μοντέλου κωδικού πελάτη
-SupplierCodeModel=Μοντέλο κωδικού προμηθευτή
+SupplierCodeModel=Vendor code model
 Gencod=Barcode
 ##### Professional ID #####
 ProfId1Short=Επάγγελμα
@@ -267,7 +267,7 @@ Prospect=Προοπτική
 CustomerCard=Καρτέλα Πελάτη
 Customer=Πελάτης
 CustomerRelativeDiscount=Σχετική έκπτωση πελάτη
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=Σχετική έκπτωση
 CustomerAbsoluteDiscountShort=Απόλυτη έκπτωση
 CompanyHasRelativeDiscount=This customer has a discount of <b>%s%%</b>
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this suppl
 CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
 CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
 CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=Καμία
 Supplier=Προμηθευτής
 AddContact=Δημιουργία επαφής
@@ -304,13 +304,13 @@ DeleteACompany=Διαγραφή εταιρίας
 PersonalInformations=Προσωπικά δεδομένα
 AccountancyCode=Λογιστική λογαριασμού
 CustomerCode=Κωδικός Πελάτη
-SupplierCode=Κωδικός Προμηθευτή
+SupplierCode=Vendor code
 CustomerCodeShort=Κωδικός Πελάτη
-SupplierCodeShort=Κωδικός Προμηθευτή
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=Κωδικός πελάτη, μοναδικός για όλους τους πελάτες
-SupplierCodeDesc=Κωδικός προμηθευτή, μοναδικός για όλους τους προμηθευτές
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=Απαιτείται αν το στοιχείο είναι πελάτης ή προοπτική
-RequiredIfSupplier=Απαιτείται αν ο Πελ./Προμ. είναι προμηθευτής
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=Η εγκυρότητα καθορίζεται από το άρθρωμα
 ThisIsModuleRules=Κανόνες αρθρώματος
 ProspectToContact=Προοπτική σε Επαφή
@@ -338,7 +338,7 @@ MyContacts=Αντιπρόσωποι επικοινωνίας
 Capital=Κεφάλαιο
 CapitalOf=Capital of %s
 EditCompany=Επεξεργασία Εταιρίας
-ThisUserIsNot=Αυτός ο χρήστης δεν είναι προοπτική πελάτης ούτε προμηθευτής
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=Έλεγχος
 VATIntraCheckDesc=Ο σύνδεσμος <b>%s</b> σας επιτρέπει να επικοινωνήσετε τον ευρωπαϊκό οργανισμό ελέγχου ΑΦΜ. Απαιτείται σύνδεση με το Internet.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -396,7 +396,7 @@ ImportDataset_company_4=Third parties/Sales representatives (Assign sales repres
 PriceLevel=Επίπεδο τιμής
 DeliveryAddress=Διεύθυνση αποστολής
 AddAddress=Δημιουργία διεύθυνσης
-SupplierCategory=Κατηγορία Προμηθευτή
+SupplierCategory=Vendor category
 JuridicalStatus200=Ανεξάρτητος
 DeleteFile=Διαγραφή Αρχείου
 ConfirmDeleteFile=Είστε σίγουροι ότι θέλετε να διαγράψετε το αρχείο;
@@ -406,7 +406,7 @@ FiscalYearInformation=Πληροφορίες Οικονομικού Έτους
 FiscalMonthStart=Μήνας Εκκίνησης Οικονομικού Έτους
 YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
 YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
-ListSuppliersShort=Λίστα Προμηθευτών
+ListSuppliersShort=List of vendors
 ListProspectsShort=Λίστα Προοπτικών
 ListCustomersShort=Λίστα Πελατών
 ThirdPartiesArea=Περιοχή Πελ./Προμ. και επαφών
@@ -420,7 +420,7 @@ CurrentOutstandingBill=Τρέχον εκκρεμείς λογαριασμός
 OutstandingBill=Μέγιστο. για εκκρεμείς λογαριασμό
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=Customer/supplier code is free. This code can be modified at any time.
 ManagingDirectors=Διαχειριστής (ες) ονομασία (CEO, διευθυντής, πρόεδρος ...)
 MergeOriginThirdparty=Διπλότυπο Πελ./Προμ. ( Πελ./Προμ. θέλετε να διαγραφεί)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/el_GR/compta.lang b/htdocs/langs/el_GR/compta.lang
index 895a5e0a9c3..973ad9b8a09 100644
--- a/htdocs/langs/el_GR/compta.lang
+++ b/htdocs/langs/el_GR/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=Σύνολο καθαρών πληρωμένων
 VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
-VATSummary=Tax Balance
+VATSummary=Tax monthly
+VATBalance=Tax Balance
 VATPaid=Tax paid
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=Περιοχή Οικονομικών/Περιουσια
 NewPayment=Νέα Πληρωμή
 Payments=Πληρωμές
 PaymentCustomerInvoice=Πληρωμή τιμολογίου πελάτη
-PaymentSupplierInvoice=Πληρωμή τιμολογίου προμηθευτή
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Πληρωμή Κοινωνικής/Φορολογικής εισφοράς
 PaymentVat=Πληρωμή Φ.Π.Α.
 ListPayment=Λίστα πληρωμών
 ListOfCustomerPayments=Λίστα πληρωμών πελατών
-ListOfSupplierPayments=Λίστα πληρωμών προμηθευτών
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Ημερομηνία έναρξης περιόδου
 DateEndPeriod=Ημερομηνία λήξης περιόδου
 newLT1Payment=New tax 2 payment
@@ -110,7 +111,7 @@ ShowVatPayment=Εμφάνιση πληρωμής φόρου
 TotalToPay=Σύνολο πληρωμής
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
 CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
 SupplierAccountancyCodeShort=Sup. account. code
 AccountNumber=Αριθμός Λογαριασμού
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=Αναφορά Πελ./Προμ. RE
 LT2ReportByCustomersES=Έκθεση του τρίτου IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Αναφορά από τον ΦΠΑ των πελατών εισπράττεται και καταβάλλεται
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
 Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
-ByProductsAndServices=Ανά προϊόντα και υπηρεσίες
+ByProductsAndServices=By product and service
 RefExt=Εξωτερικές αναφορές
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
 LinkedOrder=Σύνδεση με παραγγελία
@@ -215,7 +218,8 @@ Mode1=Μέθοδος 1
 Mode2=Μέθοδος 2
 CalculationRuleDesc=Για να υπολογιστεί το συνολικό ΦΠΑ, υπάρχουν δύο μέθοδοι: <br> Μέθοδος 1 στρογγυλοποίηση ΦΠΑ για κάθε γραμμή, στη συνέχεια, αθροίζοντας τους. <br> Μέθοδος 2 αθροίζοντας όλων των ΦΠΑ σε κάθε γραμμή, τότε η στρογγυλοποίηση είναι στο αποτέλεσμα. <br> Το τελικό αποτέλεσμα μπορεί να διαφέρει από λίγα λεπτά. Προεπιλεγμένη λειτουργία είναι η λειτουργία <b>%s</b>.
 CalculationRuleDescSupplier=According to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Αναφορά του κύκλου εργασιών ανά προϊόν, όταν χρησιμοποιείτε <b>ταμειακή λογιστική</b> η λειτουργία δεν είναι σχετική. Η αναφορά αυτή είναι διαθέσιμη μόνο όταν χρησιμοποιείτε <b>λογιστική δέσμευση</b> τρόπος (ανατρέξτε τη Ρύθμιση του module λογιστικής).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Τρόπος υπολογισμού
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
@@ -242,3 +246,10 @@ FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/el_GR/dict.lang b/htdocs/langs/el_GR/dict.lang
index 6938c85aacd..1b10a64cfd6 100644
--- a/htdocs/langs/el_GR/dict.lang
+++ b/htdocs/langs/el_GR/dict.lang
@@ -5,7 +5,8 @@ CountryIT=Ιταλία
 CountryES=Ισπανία
 CountryDE=Γερμανία
 CountryCH=Σουηδία
-CountryGB=Μεγάλη Βρετανία
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=Ηνωμένο Βασίλειο
 CountryUK=Ηνωμένο Βασίλειο
 CountryIE=Ιρλανδία
 CountryCN=Κίνα
diff --git a/htdocs/langs/el_GR/ecm.lang b/htdocs/langs/el_GR/ecm.lang
index b39dffe3081..ca19c547e78 100644
--- a/htdocs/langs/el_GR/ecm.lang
+++ b/htdocs/langs/el_GR/ecm.lang
@@ -39,9 +39,10 @@ ShowECMSection=Εμφάνιση φακέλου
 DeleteSection=Διαγραφή φακέλου
 ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
 ECMDirectoryForFiles=Relative directory for files
-CannotRemoveDirectoryContainsFiles=Removed not possible because it contains some files
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=Διαχειριστής Αρχείων
-ECMSelectASection=Select a directory on left tree...
+ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
diff --git a/htdocs/langs/el_GR/errors.lang b/htdocs/langs/el_GR/errors.lang
index 38f36b1aee7..dd51f028504 100644
--- a/htdocs/langs/el_GR/errors.lang
+++ b/htdocs/langs/el_GR/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Απαιτείται Bar code
 ErrorCustomerCodeAlreadyUsed=Ο κωδικός πελάτη που έχει ήδη χρησιμοποιηθεί
 ErrorBarCodeAlreadyUsed=Το Bar code χρησιμοποιείται ήδη
 ErrorPrefixRequired=Απαιτείται Πρόθεμα
-ErrorBadSupplierCodeSyntax=Bad σύνταξη για τον κωδικό προμηθευτή
-ErrorSupplierCodeRequired=Κωδικός προμηθευτή που απαιτούνται
-ErrorSupplierCodeAlreadyUsed=Κωδικός προμηθευτή που ήδη χρησιμοποιείται
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Λάθος παράμετρος
 ErrorBadValueForParameter=Η τιμή '%s' δεν είναι έγγυρη για την παράμετρο '%s'
 ErrorBadImageFormat=Το αρχείο εικόνας δεν έχει μια υποστηριζόμενη μορφή (Η PHP σας δεν υποστηρίζει λειτουργίες για να μετατρέψετε τις εικόνες αυτής της μορφής)
@@ -87,7 +87,7 @@ ErrorsOnXLines=Λάθη σε <b>%s</b> γραμμές πηγή
 ErrorFileIsInfectedWithAVirus=Το πρόγραμμα προστασίας από ιούς δεν ήταν σε θέση να επικυρώσει το αρχείο (αρχείο μπορεί να μολυνθεί από έναν ιό)
 ErrorSpecialCharNotAllowedForField=Ειδικοί χαρακτήρες δεν επιτρέπονται για το πεδίο &quot;%s&quot;
 ErrorNumRefModel=Μια αναφορά υπάρχει στη βάση δεδομένων (%s) και δεν είναι συμβατές με αυτόν τον κανόνα αρίθμηση. Αφαιρέστε το αρχείο ή μετονομαστεί αναφοράς για να ενεργοποιήσετε αυτή την ενότητα.
-ErrorQtyTooLowForThisSupplier=Ποσότητα πολύ χαμηλή αυτής της επιχείρησης ή καμία τιμή που ορίζεται για το προϊόν αυτής της επιχείρησης
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Σφάλμα στην μάσκα
 ErrorBadMaskFailedToLocatePosOfSequence=Σφάλμα, μάσκα χωρίς τον αύξοντα αριθμό
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
-ErrorSupplierCountryIsNotDefined=Η χώρα του προμηθευτή δεν καθορίστηκε. Κάντε πρώτα την διόρθωση.
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
diff --git a/htdocs/langs/el_GR/install.lang b/htdocs/langs/el_GR/install.lang
index b1c5b231c8e..68e327f6649 100644
--- a/htdocs/langs/el_GR/install.lang
+++ b/htdocs/langs/el_GR/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=Το αρχείο ρυθμίσεων <
 ConfFileCouldBeCreated=Το αρχείο ρυθμίσεων <b>%s</b>θα μπορούσε να δημιουργηθεί.
 ConfFileIsNotWritable=Το αρχείο ρυθμίσεων <b>%s</b> δεν είναι εγγράψιμο. Ελέγξτε τις άδειες. Για πρώτη εγκατάσταση, ο web server σας θα πρέπει να έχει άδεια για να μπορεί να εγγράφει σε αυτό το αρχείο κατά την διάρκεια της διαδικασίας ρύθμισης. (Π.χ. "chmod 666" σε ένα ΛΣ τύπου Unix).
 ConfFileIsWritable=Το αρχείο ρυθμίσεων <b>%s</b> είναι εγγράψιμο.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Φορτώσετε εκ νέου όλες τις πληροφορίες από το αρχείο ρυθμίσεων.
 PHPSupportSessions=Η PHP υποστηρίζει συνεδρίες.
 PHPSupportPOSTGETOk=Η PHP υποστηρίζει μεταβλητές POST και GET.
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Αποτυχία δημιουργίας λογαρια
 WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should remove the <b>install<b> directory or rename it to <b>install.lock</b> in order to avoid its malicious use.
 FunctionNotAvailableInThisPHP=Not available on this PHP
 ChoosedMigrateScript=Choose migration script
-DataMigration=Data migration
-DatabaseMigration=Structure database migration
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script processing
 ChooseYourSetupMode=Choose your setup mode and click "Start"...
 FreshInstall=Fresh install
@@ -146,7 +147,7 @@ NothingToDo=Nothing to do
 # upgrade
 MigrationFixData=Fix for denormalized data
 MigrationOrder=Data migration for customer's orders
-MigrationSupplierOrder=Data migration for supplier's orders
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Data migration for commercial proposals
 MigrationInvoice=Data migration for customer's invoices
 MigrationContract=Data migration for contracts
@@ -196,6 +197,8 @@ MigrationEvents=Μετακίνηση γεγονότων για να προσθέ
 MigrationEventsContact=Migration of events to add event contact into assignement table
 MigrationRemiseEntity=Ενημέρωση φορέα τιμών πεδίου στον πίνακα llx_societe_remise
 MigrationRemiseExceptEntity=Ενημέρωση φορέα τιμών πεδίου στον πίνακα llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
 MigrationReloadModule=Επαναφόρτωση ενθεμάτων %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 ShowNotAvailableOptions=Εμφάνιση μη διαθέσιμων επιλογών
diff --git a/htdocs/langs/el_GR/ldap.lang b/htdocs/langs/el_GR/ldap.lang
index c61399f25fb..575d9218a0b 100644
--- a/htdocs/langs/el_GR/ldap.lang
+++ b/htdocs/langs/el_GR/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Κωδικός πρόσβασης για το Domain
 YouMustChangePassNextLogon=Κωδικός πρόσβασης για <b>%s</b> χρήστη στο <b>%s</b> Domain πρέπει να αλλάξει.
 UserMustChangePassNextLogon=Ο χρήστης πρέπει να αλλάξει τον κωδικό πρόσβασης για το %s Domain
 LDAPInformationsForThisContact=Πληροφορίες στο LDAP βάση δεδομένων για αυτήν την επαφή
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Member type synchronized
 ContactSynchronized=Επικοινωνία συγχρονισμένη
 ForceSynchronize=Δυναμικός συγχρονισμός Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Αποτυχία ανάγνωσης LDAP βάση δεδομένων. Ελέγξτε LDAP εγκατάσταση module και την προσβασιμότητα της βάσης δεδομένων.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/el_GR/loan.lang b/htdocs/langs/el_GR/loan.lang
index 67e7614706e..6aa5b4546dd 100644
--- a/htdocs/langs/el_GR/loan.lang
+++ b/htdocs/langs/el_GR/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=Κεφάλαιο Κίνησης
 Insurance=Ασφάλεια Αυτοκινήτου
 Interest=Χρεωστικοί Τόκοι
 Nbterms=Αριθμός των όρων
+Term=Term
 LoanAccountancyCapitalCode=Accounting account capital
 LoanAccountancyInsuranceCode=Accounting account insurance
 LoanAccountancyInterestCode=Accounting account interest
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=Επιβεβαίωση διαγραφής δανείου
 LoanDeleted=Το Δάνειο διαγράφηκε με επιτυχία
 ConfirmPayLoan=Confirm classify paid this loan
 LoanPaid=Πληρωμή δανείου
-# Calc
-LoanCalc=Υπολογιστής τραπεζικού δανείου
-PurchaseFinanceInfo=Purchase & Financing Information
-SalePriceOfAsset=Sale Price of Asset
-PercentageDown=Percentage Down
-LengthOfMortgage=Διάρκεια του δανείου
-AnnualInterestRate=Annual Interest Rate
-ExplainCalculations=Εξήγηση υπολογισμού
-ShowMeCalculationsAndAmortization=Show me the calculations and amortization
-MortgagePaymentInformation=Πληροφορίες πληρωμής υποθήκης
-DownPayment=Down Payment
-DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
-InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
-MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
-MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
-MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
-MonthlyPaymentDesc=The montly payment is figured out using the following formula
-AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
-AmountFinanced=Amount Financed
-AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
-Totalsforyear=Συνολικά για το έτος
-MonthlyPayment=Μηνιαίες πληρωμές
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
-GoToInterest=%s will go towards INTEREST
-GoToPrincipal=%s will go towards PRINCIPAL
-YouWillSpend=You will spend %s in year %s
 ListLoanAssociatedProject=List of loan associated with the project
 AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Χρεωστικοί Τόκοι
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-FinancialCommitment=Financial commitment
 CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/langs/el_GR/mails.lang b/htdocs/langs/el_GR/mails.lang
index 1ddf71aeb5d..5930b818f81 100644
--- a/htdocs/langs/el_GR/mails.lang
+++ b/htdocs/langs/el_GR/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Αποστολέας
 MailErrorsTo=Σφάλματα σε
 MailReply=Απάντηση σε
 MailTo=Παραλήπτης(ες)
+MailToUsers=To user(s)
 MailCC=Αντιγραφή σε
+MailToCCUsers=Copy to users(s)
 MailCCC=Cached copy to
 MailTopic=EMail topic
 MailText=Μήνυμα
@@ -164,4 +166,4 @@ InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Πληροφορίες
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang
index f24d4c4a3dd..1e421f17436 100644
--- a/htdocs/langs/el_GR/main.lang
+++ b/htdocs/langs/el_GR/main.lang
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is se
 Administrator=Διαχειριστής
 Undefined=Ακαθόριστο
 PasswordForgotten=Έχετε ξεχάσει τον κωδικό πρόσβασής σας;
+NoAccount=No account?
 SeeAbove=Δείτε παραπάνω
 HomeArea=Αρχική
 LastConnexion=Latest connection
@@ -231,7 +232,7 @@ Limit=Όριο
 Limits=Όρια
 Logout=Αποσύνδεση
 NoLogoutProcessWithAuthMode=Δεν εφαρμόζεται το χαρακτηριστικό αποσύνδεσης με λειτουργία ελέγχου ταυτότητας <b>%s</b>
-Connection=Σύνδεση
+Connection=Είσοδος
 Setup=Ρυθμίσεις
 Alert=Συναγερμός
 MenuWarnings=Συναγερμοί
@@ -402,6 +403,7 @@ DefaultTaxRate=Default tax rate
 Average=Μ.Ο.
 Sum=Σύνολο
 Delta=Δέλτα
+RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Επιλογή
@@ -414,7 +416,7 @@ Favorite=Αγαπημένα
 ShortInfo=Info.
 Ref=Κωδ.
 ExternalRef=Κωδ. extern
-RefSupplier=Αριθ. Τιμολογίου
+RefSupplier=Ref. vendor
 RefPayment=Κωδ. πληρωμής
 CommercialProposalsShort=Εμπορικές προτάσεις
 Comment=Σχόλιο
@@ -493,7 +495,7 @@ Received=Παραλήφθηκε
 Paid=Πληρωμές
 Topic=Αντικείμενο
 ByCompanies=Ανά στοιχείο
-ByUsers=Ανά χρήστη
+ByUsers=By user
 Links=Σύνδεσμοι
 Link=Σύνδεσμος
 Rejects=Απορρίψεις
@@ -619,9 +621,9 @@ BuildDoc=Δημιουργία Doc
 Entity=Οντότητα
 Entities=Οντότητες
 CustomerPreview=Προεπισκόπηση Πελάτη
-SupplierPreview=Προεπισκόπηση Προμηθευτή
+SupplierPreview=Vendor preview
 ShowCustomerPreview=Εμφάνιση Προεπισκόπησης Πελάτη
-ShowSupplierPreview=Εμφάνιση Προεπισκόπησης Προμηθευτή
+ShowSupplierPreview=Show vendor preview
 RefCustomer=Κωδ. Πελάτη
 Currency=Νόμισμα
 InfoAdmin=Πληροφορία για τους διαχειριστές
@@ -629,7 +631,7 @@ Undo=Αναίρεση
 Redo=Επανεκτέλεση
 ExpandAll=Επέκταση όλων
 UndoExpandAll=Αναίρεση επέκτασης
-SeeAll=See all
+SeeAll=Εμφάνιση όλων
 Reason=Λόγος
 FeatureNotYetSupported=Η δυνατότητα δεν υποστηρίζεται ακόμη
 CloseWindow=Κλείσιμο Παραθύρου
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=Προϊόντα ή Υπηρεσίες
 SearchIntoProjects=Έργα
 SearchIntoTasks=Εργασίες
 SearchIntoCustomerInvoices=Τιμολόγια πελατών
-SearchIntoSupplierInvoices=Τιμολόγια προμηθευτών
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Παραγγελίες πελατών
-SearchIntoSupplierOrders=Παραγγελίες προμηθευτών
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=Προσφορές πελατών
-SearchIntoSupplierProposals=Προσφορές προμηθευτών
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Παρεμβάσεις
 SearchIntoContracts=Συμβόλαια
 SearchIntoCustomerShipments=Αποστολές Πελάτη
@@ -941,3 +943,5 @@ Remote=Remote
 LocalAndRemote=Local and Remote
 KeyboardShortcut=Keyboard shortcut
 AssignedTo=Ανάθεση σε
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/el_GR/margins.lang b/htdocs/langs/el_GR/margins.lang
index cbcb0f54ef5..f11593a736a 100644
--- a/htdocs/langs/el_GR/margins.lang
+++ b/htdocs/langs/el_GR/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=Ως υπηρεσία
 UseDiscountOnTotal=Στο υποσύνολο
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Καθορίζει αν η συνολική έκπτωση που θεωρείται ως ένα προϊόν, μια υπηρεσία, ή μόνον επί του υποσυνόλου για τον υπολογισμό του περιθωρίου κέρδους.
 MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best supplier price
+MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Περιθώριο στην τιμή κόστους
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Τιμή κόστους
 UnitCharges=Χρεώσεων
 Charges=Επιβαρύνσεις
diff --git a/htdocs/langs/el_GR/members.lang b/htdocs/langs/el_GR/members.lang
index 5bc0184514a..d81d291808c 100644
--- a/htdocs/langs/el_GR/members.lang
+++ b/htdocs/langs/el_GR/members.lang
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
diff --git a/htdocs/langs/el_GR/opensurvey.lang b/htdocs/langs/el_GR/opensurvey.lang
index 7303e04d49e..1c9d1ed35f5 100644
--- a/htdocs/langs/el_GR/opensurvey.lang
+++ b/htdocs/langs/el_GR/opensurvey.lang
@@ -58,3 +58,4 @@ MoreChoices=Εισάγετε περισσότερες επιλογές για τ
 SurveyExpiredInfo=Η δημοσκόπηση αυτή έχει λήξει ή ο χρόνος ψηφοφορίας έληξε.
 EmailSomeoneVoted=%s έχει γεμίσει μια γραμμή. \nΜπορείτε να βρείτε τη δημοσκόπηση σας στο σύνδεσμο:\n %s
 ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/el_GR/orders.lang b/htdocs/langs/el_GR/orders.lang
index d02c05a52bf..b3c56a4b4dd 100644
--- a/htdocs/langs/el_GR/orders.lang
+++ b/htdocs/langs/el_GR/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Περιοχή παραγγελιών πελατών
-SuppliersOrdersArea=Περιοχή παραγγελιών προμηθευτών
+SuppliersOrdersArea=Purchase orders area
 OrderCard=Καρτέλα παραγγελίας
 OrderId=Αρ.Παραγγελίας
 Order=Παραγγελία
@@ -13,18 +13,18 @@ OrderToProcess=Παραγγελία προς επεξεργασία
 NewOrder=Νέα παραγγελία
 ToOrder=Δημιουργία πραγγελίας
 MakeOrder=Δημιουργία παραγγελίας
-SupplierOrder=Παραγγελία Προμηθευτή
-SuppliersOrders=Παραγγελίας Προμηθευτών
-SuppliersOrdersRunning=Τρέχουσες παραγγελίες προμηθευτών
-CustomerOrder=Παραγγελία πελάτη
-CustomersOrders=Παραγγελίες πελατών
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=Παραγγελία του πελάτη
+CustomersOrders=Παραγγελίες πελάτη
 CustomersOrdersRunning=Τρέχουσες παραγγελίες πελατών
 CustomersOrdersAndOrdersLines=Customer orders and order lines
 OrdersDeliveredToBill=Customer orders delivered to bill
 OrdersToBill=Παραγγελίες πελάτη που έχουν παραδοθεί
 OrdersInProcess=Παραγγελίες πελάτη σε επεξεργασία
 OrdersToProcess=Παραγγελίες πελατών για επεξεργασία
-SuppliersOrdersToProcess=Παραγγελίες προμηθευτών προς επεξεργασία
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=Ακυρωμένη
 StatusOrderDraftShort=Προσχέδιο
 StatusOrderValidatedShort=Επικυρωμένη
@@ -75,15 +75,15 @@ ShowOrder=Εμφάνιση παραγγελίας
 OrdersOpened=Παραγγελίες για επεξεργασία
 NoDraftOrders=Δεν υπάρχουν προσχέδια παραγγελιών
 NoOrder=Αρ. παραγγελίας
-NoSupplierOrder=No supplier order
+NoSupplierOrder=No purchase order
 LastOrders=Τελευταίες %s παραγγελίες πελατών
 LastCustomerOrders=Τελευταίες %s παραγγελίες πελατών
-LastSupplierOrders=Latest %s supplier orders
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=Τελευταίες %s τροποποιημένες παραγγελίες
 AllOrders=Όλες οι παραγγελίες
 NbOfOrders=Πλήθος παραγγελιών
 OrdersStatistics=Στατιστικά παραγγελιών
-OrdersStatisticsSuppliers=Supplier order's statistics
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Πλήθος παραγγελιών ανά μήνα
 AmountOfOrdersByMonthHT=Ποσό των παραγγελιών ανά μήνα (μετά από φόρους)
 ListOfOrders=Λίστα παραγγελιών
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</
 GenerateBill=Δημιουργία τιμολογίου
 ClassifyShipped=Χαρακτηρισμός ως παραδοτέο
 DraftOrders=Προσχέδια παραγγελιών
-DraftSuppliersOrders=Draft suppliers orders
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=Παραγγελίες σε εξέλιξη
 RefOrder=Κωδ. παραγγελίας
 RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for supplier
-RefOrderSupplierShort=Ref. order supplier
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=Αποστολή παραγγελίας με email
 ActionsOnOrder=Ενέργειες στην παραγγελία
 NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
 DispatchSupplierOrder=Receiving supplier order %s
 FirstApprovalAlreadyDone=Η πρώτη έγκριση ήδη έγινε
 SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=Supplier order %s received %s
-SupplierOrderSubmitedInDolibarr=Supplier order %s submited
-SupplierOrderClassifiedBilled=Supplier order %s set billed
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Άλλες παραγγελίες
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
@@ -125,11 +125,11 @@ TypeContact_commande_internal_SHIPPING=Representative following-up shipping
 TypeContact_commande_external_BILLING=Customer invoice contact
 TypeContact_commande_external_SHIPPING=Customer shipping contact
 TypeContact_commande_external_CUSTOMER=Customer contact following-up order
-TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
-TypeContact_order_supplier_external_BILLING=Supplier invoice contact
-TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact
-TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
 Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
 Error_OrderNotChecked=Δεν υπάρχουν παραγγελίες στο επιλεγμένο τιμολόγιο
diff --git a/htdocs/langs/el_GR/other.lang b/htdocs/langs/el_GR/other.lang
index f7a2ef805fa..09d39caf8e2 100644
--- a/htdocs/langs/el_GR/other.lang
+++ b/htdocs/langs/el_GR/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=Τα αρχεία είναι πολύ μεγάλο
 PleaseBePatient=Please be patient...
 NewPassword=New password
 ResetPassword=Reset password
-RequestToResetPasswordReceived=Η αίτηση για την αλλαγή του κωδικού σας στο Dolibarr  έχει παραληφθεί
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=Αυτό είναι το νέο σας κλειδί για να συνδεθείτε
 NewKeyWillBe=Το νέο σας κλειδί για να συνδεθείτε με το λογισμικό είναι
 ClickHereToGoTo=Κάντε κλικ εδώ για να μεταβείτε στο %s
@@ -233,6 +233,8 @@ PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=Exports area
 AvailableFormats=Available formats
diff --git a/htdocs/langs/el_GR/productbatch.lang b/htdocs/langs/el_GR/productbatch.lang
index 773461bd4fc..32d3000dda0 100644
--- a/htdocs/langs/el_GR/productbatch.lang
+++ b/htdocs/langs/el_GR/productbatch.lang
@@ -16,7 +16,7 @@ printEatby=Eat-by: %s
 printSellby=Πώληση ανά: %s
 printQty=Ποσότητα: %d
 AddDispatchBatchLine=Προσθέστε μια γραμμή για Χρόνο Διάρκειας αποστολής
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic increase/decrease stock mode is forced to shipping validate and manual dispatching for reception and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=Αυτό το προιόν δεν χρησιμοποιεί Αρ. Παρτίδας/σειριακό
 ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
diff --git a/htdocs/langs/el_GR/products.lang b/htdocs/langs/el_GR/products.lang
index 0bf30370753..7038ceef021 100644
--- a/htdocs/langs/el_GR/products.lang
+++ b/htdocs/langs/el_GR/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=Νέα Τιμή
 MinPrice=Ελάχιστη Τιμή Πώλησης
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=Η τιμή πώλησης δεν μπορεί να είναι μικρότερη από την ορισμένη ελάχιστη τιμή πώλησης (%s χωρίς Φ.Π.Α.)
 ContractStatusClosed=Κλειστό
 ErrorProductAlreadyExists=Ένα προϊόν με κωδικό %s υπάρχει ήδη.
@@ -155,7 +156,7 @@ BuyingPrices=Τιμές Αγοράς
 CustomerPrices=Τιμές Πελατών
 SuppliersPrices=Τιμές Προμηθευτών
 SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
-CustomCode=Customs/Commodity/HS code
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=Χώρα προέλευσης
 Nature=Nature
 ShortLabel=Σύντομη ετικέτα
diff --git a/htdocs/langs/el_GR/projects.lang b/htdocs/langs/el_GR/projects.lang
index fdd88c8f6be..b75b790a269 100644
--- a/htdocs/langs/el_GR/projects.lang
+++ b/htdocs/langs/el_GR/projects.lang
@@ -77,6 +77,7 @@ Time=Χρόνος
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=Κατάλογος των εμπορικών προτάσεων που σχετίζονται με το έργο
 ListOrdersAssociatedProject=List of customer orders associated with the project
@@ -226,4 +227,4 @@ AllowCommentOnProject=Allow user comments on projects
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/el_GR/stocks.lang b/htdocs/langs/el_GR/stocks.lang
index 5d3846efb15..dd80896b4ab 100644
--- a/htdocs/langs/el_GR/stocks.lang
+++ b/htdocs/langs/el_GR/stocks.lang
@@ -203,3 +203,4 @@ RegulateStock=Regulate Stock
 ListInventory=Λίστα
 StockSupportServices=Stock management support services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/el_GR/stripe.lang b/htdocs/langs/el_GR/stripe.lang
index 8c3ee41a5b9..58a88459b1f 100644
--- a/htdocs/langs/el_GR/stripe.lang
+++ b/htdocs/langs/el_GR/stripe.lang
@@ -58,8 +58,8 @@ NameOnCard=Name on card
 CardNumber=Card Number
 ExpiryDate=Expiry Date
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/el_GR/supplier_proposal.lang b/htdocs/langs/el_GR/supplier_proposal.lang
index 5a6d3314866..430b21506f9 100644
--- a/htdocs/langs/el_GR/supplier_proposal.lang
+++ b/htdocs/langs/el_GR/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Εμπορικές προτάσεις προμηθευτών
-supplier_proposalDESC=Διαχειριστείτε τα αιτήματα των τιμών προς τους προμηθευτές
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
 SupplierProposalNew=Νέα αίτηση τιμής
 CommRequest=Αίτηση τιμής
 CommRequests=Αιτήματα τιμών
 SearchRequest=Αναζήτηση αιτήματος
 DraftRequests=Πρόχειρα αιτήματα
-SupplierProposalsDraft=Draft supplier proposals
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=Τελευταίες %s τροποποιημένες αιτήσεις τιμών
 RequestsOpened=Ανοιχτές αιτήσεις τιμών
-SupplierProposalArea=Περιοχή προτάσεων προμηθευτών
-SupplierProposalShort=Πρόταση προμηθευτή
-SupplierProposals=Προσφορές προμηθευτών
-SupplierProposalsShort=Προσφορές προμηθευτών
+SupplierProposalArea=Vendor proposals area
+SupplierProposalShort=Vendor proposal
+SupplierProposals=Vendor proposals
+SupplierProposalsShort=Vendor proposals
 NewAskPrice=Νέα αίτηση τιμής
 ShowSupplierProposal=Προβολή αίτησης τιμής
 AddSupplierProposal=Δημιουργία μίας αίτησης τιμής
-SupplierProposalRefFourn=Αναφ. προμηθευτή
+SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=Ημερομηνία παράδοσης
 SupplierProposalRefFournNotice=Before closing to "Accepted", think to grasp suppliers references.
 ConfirmValidateAsk=Είστε σίγουροι ότι θέλετε να επικυρώσετε την αίτηση τιμής στο όνομα <b>%s</b> ;
@@ -47,9 +47,9 @@ CommercialAsk=Αίτηση τιμής
 DefaultModelSupplierProposalCreate=Δημιουργία προεπιλεγμένων μοντέλων
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposals=List of supplier proposal requests
-ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
-SupplierProposalsToClose=Supplier proposals to close
-SupplierProposalsToProcess=Supplier proposals to process
+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
diff --git a/htdocs/langs/el_GR/suppliers.lang b/htdocs/langs/el_GR/suppliers.lang
index e64f54bffab..a3b8344d0c9 100644
--- a/htdocs/langs/el_GR/suppliers.lang
+++ b/htdocs/langs/el_GR/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Προμηθευτές
-SuppliersInvoice=Τιμολόγιο προμηθευτή
-ShowSupplierInvoice=Εμφάνιση τιμολογίου προμηθευτή
-NewSupplier=Νέος προμηθευτής
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=Ιστορικό
-ListOfSuppliers=Λίστα προμηθευτών
-ShowSupplier=Εμφάνιση προμηθευτή
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=Ημερ. παραγγελίας
 BuyingPriceMin=Καλύτερη τιμή αγοράς
 BuyingPriceMinShort=Καλύτερη τιμή αγοράς
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Ορισμένα υπο-προϊόντα δεν έχουν καμία τιμή που να ορίζεται
 AddSupplierPrice=Προσθήκη τιμής αγοράς
 ChangeSupplierPrice=Αλλαγή τιμής αγοράς
-SupplierPrices=Τιμές Προμηθευτών
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Ο προμηθευτής αναφοράς έχει ήδη συσχετιστεί με μια αναφορά: %s
-NoRecordedSuppliers=Δεν υπάρχουν προμηθευτές
-SupplierPayment=Πληρωμή προμηθευτή
-SuppliersArea=Περιοχή προμηθευτών
-RefSupplierShort=Κωδ. προμηθευτή
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=Διαθεσιμότητα
-ExportDataset_fournisseur_1=Λίστα τιμολογίων προμηθευτή και  γραμμές τιμολογίου
-ExportDataset_fournisseur_2=Τιμολόγια και πληρωμές προμηθευτή
-ExportDataset_fournisseur_3=Παραγγελίες σε προμηθευτές και σειρά γραμμών
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=Έγκριση της παραγγελίας
 ConfirmApproveThisOrder=Είστε σίγουροι πως θέλετε να επικυρώσετε την παραγγελία <b>%s</b>;
 DenyingThisOrder=Απόρριψη παραγγελίας
 ConfirmDenyingThisOrder=Είστε σίγουροι πως θέλετε να αρνηθήτε αυτή την παραγγελία <b>%s</b>;
 ConfirmCancelThisOrder=Είστε σίγουροι πως θέλετε να ακυρώσετε αυτή την παραγγελία <b>%s</b>;
-AddSupplierOrder=Δημιουργία παραγγελίας προμηθευτή
-AddSupplierInvoice=Δημιουργία τιμολογίου προμηθευτή
-ListOfSupplierProductForSupplier=Λίστα προϊόντων και τιμών του προμηθευτή <b>%s</b>
-SentToSuppliers=Αποστολή σε προμηθευτές
-ListOfSupplierOrders=Λίστα παραγγελιών των προμηθευτών
-MenuOrdersSupplierToBill=Παραγγελίες προμηθευτών για τιμολόγηση
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Καθυστέρηση παράδοσης σε ημέρες
 DescNbDaysToDelivery=Η μεγαλύτερη καθυστέρηση παραδόσεων των προϊόντων από αυτή τη παραγγελία
-SupplierReputation=Supplier reputation
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Να μην γίνει παραγγελία
 NotTheGoodQualitySupplier=Λάθος ποσότητα
 ReputationForThisProduct=Reputation
 BuyerName=Όνομα αγοραστή
 AllProductServicePrices=All product / service prices
 AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=Τιμές Προμηθευτών
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/el_GR/website.lang b/htdocs/langs/el_GR/website.lang
index 6686d75c52a..4c1415912ee 100644
--- a/htdocs/langs/el_GR/website.lang
+++ b/htdocs/langs/el_GR/website.lang
@@ -73,7 +73,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
diff --git a/htdocs/langs/el_GR/workflow.lang b/htdocs/langs/el_GR/workflow.lang
index 88615bb9fe2..2b8baea5955 100644
--- a/htdocs/langs/el_GR/workflow.lang
+++ b/htdocs/langs/el_GR/workflow.lang
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source custome
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/en_AU/admin.lang b/htdocs/langs/en_AU/admin.lang
index c353d325e3f..8d26ea307fe 100644
--- a/htdocs/langs/en_AU/admin.lang
+++ b/htdocs/langs/en_AU/admin.lang
@@ -2,7 +2,6 @@
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
-HideAnyVATInformationOnPDF=Hide all information related to GST on generated PDF
 OldVATRates=Old GST rate
 NewVATRates=New GST rate
 DictionaryVAT=GST Rates or Sales Tax Rates
@@ -13,5 +12,4 @@ LocalTax1IsNotUsedDesc=Do not use other type of tax (other than GST)
 LocalTax2IsUsedDesc=Use a third type of tax (other than GST)
 LocalTax2IsNotUsedDesc=Do not use other type of tax (other than GST)
 OptionVatMode=GST due
-TextTitleColor=Colour of page title
 LinkColor=Colour of links
diff --git a/htdocs/langs/en_CA/admin.lang b/htdocs/langs/en_CA/admin.lang
index 9bf5497f19b..6fbba44c314 100644
--- a/htdocs/langs/en_CA/admin.lang
+++ b/htdocs/langs/en_CA/admin.lang
@@ -7,3 +7,5 @@ LocalTax1IsUsedDesc=Use a second tax (PST)
 LocalTax1IsNotUsedDesc=Do not use second tax (PST)
 LocalTax1Management=PST Management
 LocalTax2IsNotUsedDesc=Do not use second tax (PST)
+CompanyZip=Postal code
+LDAPFieldZip=Postal code
diff --git a/htdocs/langs/en_CA/companies.lang b/htdocs/langs/en_CA/companies.lang
index 7642b8d03eb..fb4a2125300 100644
--- a/htdocs/langs/en_CA/companies.lang
+++ b/htdocs/langs/en_CA/companies.lang
@@ -1,3 +1,4 @@
 # Dolibarr language file - Source file is en_US - companies
+Zip=Postal code
 LocalTax1IsUsedES=PST is used
 LocalTax1IsNotUsedES=GST is not used
diff --git a/htdocs/langs/en_GB/accountancy.lang b/htdocs/langs/en_GB/accountancy.lang
index 7cf7fd02136..3184e8692c1 100644
--- a/htdocs/langs/en_GB/accountancy.lang
+++ b/htdocs/langs/en_GB/accountancy.lang
@@ -8,10 +8,10 @@ OverviewOfAmountOfLinesBound=Overview of number of lines already bound to an fin
 DeleteCptCategory=Remove finance account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this finance account from the account group?
 JournalizationInLedgerStatus=Status of journals
+AlreadyInGeneralLedger=Already journalised in ledgers
 NotYetInGeneralLedger=Not yet journalised in ledgers
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalised finance group
 MainAccountForCustomersNotDefined=Main finance account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main finance account for suppliers 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:
@@ -26,20 +26,22 @@ AccountancyAreaDescDonation=STEP %s: Define default finance accounts for donatio
 AccountancyAreaDescMisc=STEP %s: Define mandatory default accounts and default finance accounts for miscellaneous transactions. For this, use the menu entry %s.
 AccountancyAreaDescLoan=STEP %s: Define default finance accounts for loans. For this, use the menu entry %s.
 AccountancyAreaDescBank=STEP %s: Define finance accounts and journal code for each bank and financial accounts. For this, use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Define finance accounts on your products/services. For this, use the menu entry %s.
+AccountancyAreaDescProd=STEP %s: Define finance accounts for your products/services. For this, use the menu entry %s.
 AccountancyAreaDescBind=STEP %s: Checking links between existing %s lines and finance account is done, so application will be able to journalise transactions in Ledger with one click. To complete missing links use the menu entry %s.
 AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click button <strong>%s</strong>.
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make future modifications.
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not completed (accounting code journal not defined for all bank accounts)
 Addanaccount=Add a financial account
 AccountAccounting=Financial Account
 SubledgerAccount=Sub-ledger Account
 ShowAccountingAccount=Show finance account
 ShowAccountingJournal=Show finance journal
 AccountAccountingSuggest=Suggested Financial Account
+MenuVatAccounts=VAT accounts
 ProductsBinding=Product accounts
 Ventilation=Link to accounts
 CustomersVentilation=Linked Customer invoice
-SuppliersVentilation=Linked Supplier Invoice
+SuppliersVentilation=Vendor invoice linking
 ExpenseReportsVentilation=Expense report links
 UpdateMvts=Modify a transaction
 WriteBookKeeping=Journalise transactions in Ledger
@@ -82,24 +84,25 @@ GroupByAccountAccounting=Group by finance account
 AccountingAccountGroupsDesc=Here you can define some groups of financial accounts. They will be used for personalised accounting reports.
 ByPersonalizedAccountGroups=By personalised groups
 ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to this transaction will be deleted)
-DescJournalOnlyBindedVisible=This is a view of records that are linked to an finance account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of records that are linked to a finance account and can be posted into the Ledger.
 FeeAccountNotDefined=Account for fees not defined
 NumMvts=Transaction Number
+ListeMvts=List of transactions
 ErrorDebitCredit=Debit and Credit fields cannot have values at the same time
 AddCompteFromBK=Add finance accounts to the group
 ReportThirdParty=List third party accounts
-DescThirdPartyReport=View the list of the third party customers and suppliers and their financial accounts
+DescThirdPartyReport=Check the list of third party customers and vendors and their financial accounts
 ListAccounts=List of the financial accounts
+UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and suspense account not defined. Blocking error
 Pcgtype=Group account
 Pcgsubtype=Subgroup account
-PcgtypeDesc=Group and subgroup accounts are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for finance accounts of products to build the expense/income report.
+PcgtypeDesc=Group and subgroup accounts are used as a predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups of finance accounts to build the income/expense report.
 DescVentilCustomer=View the list of customer invoice lines linked (or not) to a product financial account
-DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the links between your invoice lines and the finance account of your chart of accounts, with just one click of the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still have some lines not linked to any account, you will have to make a manual link from the menu "<strong>%s</strong>".
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will create links between your invoice lines and the accounts in your chart of accounts with just one click of the button <strong>"%s"</strong>. If the account was not set on product/service cards or if you still have some lines not linked to any account, you will have to make a manual link from the menu "<strong>%s</strong>".
 DescVentilDoneCustomer=View a detailed list of invoices, customers and their product financial account
 DescVentilTodoCustomer=Link invoice lines not already linked with a product finance account
 ChangeAccount=Change the product/service finance account for selected lines with the following finance account:
-DescVentilSupplier=View a list of supplier invoice lines linked or not yet linked to a product finance account
-DescVentilDoneSupplier=View a list of the lines of invoices, suppliers and their finance account
+DescVentilDoneSupplier=Check the list of vendor invoices and their financial account
 DescVentilTodoExpenseReport=Link expense report lines not already linked with a fee finance account
 DescVentilExpenseReport=View here the list of expense report lines linked (or not) to a fee finance account
 DescVentilExpenseReportMore=If you setup an account on the type of expense report lines, the application will be able to make all the links between your expense report lines and the finance account in your chart of accounts, with one click with the button <strong>"%s"</strong>. If the account was not set in the fees dictionary or if you still have some lines not linked to any account, you will have to make a manual link from the menu "<strong>%s</strong>".
@@ -107,6 +110,7 @@ DescVentilDoneExpenseReport=View here the list of the lines of expense reports a
 ValidateHistory=Link Automatically
 AutomaticBindingDone=Automatic link done
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this finance account because it is used
+MvtNotCorrectlyBalanced=Transaction not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Link card
 GeneralLedgerIsWritten=Transactions are written to the Ledger
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalised. If there is no other error message, this is probably because they were already journalised.
@@ -123,7 +127,10 @@ AccountingJournal=Finance journal
 NewAccountingJournal=New finance journal
 ShowAccoutingJournal=Show finance journal
 ErrorAccountingJournalIsAlreadyUse=This journal is already in use
-Modelcsv_CEGID=Export towards CEGID Expert Accounting
+AccountingAccountForSalesTaxAreDefinedInto=Note: Financial account for Sales Tax is defined in menu <b>%s</b> - <b>%s</b>
+Modelcsv=Example of export
+Selectmodelcsv=Select an example of export
+Modelcsv_CEGID=Export to CEGID Expert Accounting
 Modelcsv_COALA=Export to Sage
 Modelcsv_bob50=Export to Sage BOB 50
 Modelcsv_ciel=Export to Sage Ciel Compta or Compta Evolution
@@ -141,7 +148,7 @@ OptionModeProductSellDesc=Show all products with finance accounts for sales.
 OptionModeProductBuyDesc=Show all products with finance accounts for purchases.
 CleanFixHistory=Remove accounting code from lines that do not exist in chart of accounts
 CleanHistory=Reset all links for selected year
-ValueNotIntoChartOfAccount=This account does not exist in the chart of account
+ValueNotIntoChartOfAccount=This account does not exist in the chart of accounts
 Range=Range of finance accounts
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory setup steps were not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=No finance account group available for country %s (See Home - Setup - Dictionary)
diff --git a/htdocs/langs/en_GB/admin.lang b/htdocs/langs/en_GB/admin.lang
index e5a6744ee87..07601556b77 100644
--- a/htdocs/langs/en_GB/admin.lang
+++ b/htdocs/langs/en_GB/admin.lang
@@ -88,5 +88,7 @@ Permission300=Read barcodes
 Permission301=Create/modify barcodes
 Permission302=Delete barcodes
 DictionaryAccountancyJournal=Finance journals
+CompanyZip=Postcode
+LDAPFieldZip=Postcode
 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
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to automatically generate codes, you must first set a rule to define the barcode number.
diff --git a/htdocs/langs/en_GB/bills.lang b/htdocs/langs/en_GB/bills.lang
index 1e0ab2069a7..312bfea9213 100644
--- a/htdocs/langs/en_GB/bills.lang
+++ b/htdocs/langs/en_GB/bills.lang
@@ -7,7 +7,6 @@ ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?
 PaymentsBackAlreadyDone=Refunds already done
 PaymentHigherThanReminderToPay=Payment higher than balance outstanding
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the balance outstanding. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
-ConvertToReduc=Convert to future discount
 ErrorVATIntraNotConfigured=Intracommunitary VAT number not yet defined
 ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all other does not suit, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too high because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmValidatePayment=Are you sure you want to validate this payment? No changes can be made once payment is validated.
diff --git a/htdocs/langs/en_GB/loan.lang b/htdocs/langs/en_GB/loan.lang
index 0cc88ee263e..cf7160c883c 100644
--- a/htdocs/langs/en_GB/loan.lang
+++ b/htdocs/langs/en_GB/loan.lang
@@ -2,18 +2,14 @@
 PaymentLoan=Loan repayment\n
 LoanPayment=Loan repayment\n
 ShowLoanPayment=Show Loan Repayment\n
+LoanAccountancyCapitalCode=Financial account - Capital
+LoanAccountancyInsuranceCode=Financial account - Insurance
+LoanAccountancyInterestCode=Financial account - Interest
 ConfirmPayLoan=Confirm Loan Classification - Paid
 LoanPaid=Loan Repaid
-LoanCalc=Bank Loan Calculator
-PercentageDown=Percentage Deposit
-ShowMeCalculationsAndAmortization=Show me the calculations and amortisation
-MortgagePaymentInformation=Mortgage Repayment Information
-DownPayment=Initial Deposit
-DownPaymentDesc=The <b>Initial Deposit</b> = The price of the home multiplied by the deposit percentage divided by 100 (for 5% deposit becomes 5/100 or 0.05)\n
-InterestRateDesc=The <b>interest rate</b> = The annual interest rate divided by 100\n
-MonthTermDesc=The <b>monthly term</b> of the loan in months = The duration of the loan in years multiplied by 12\n
-MonthlyPaymentDesc=The monthly payment is calculated using the following formula\n
-AmortizationPaymentDesc=The <a href="#amortization">amortisation</a> calculates how much of your monthly repayment goes towards the bank's interest, and how much goes into paying off the principal of your loan.\n
-AmortizationMonthlyPaymentOverYears=Amortisation For Monthly Payment: <b>%s</b> over %s years\n
-MonthlyPayment=Monthly Repayment\n
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to calculate the monthly repayments of a loan, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is offered as an initial deposit. Also taken into consideration are any local property taxes, and their effect on the total monthly mortgage repayment.<br>\n
+ListLoanAssociatedProject=List of loans associated with this project
+AddLoan=Create new loan
+CapitalRemain=Capital Balance
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Financial account - Capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Financial account - Interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Financial account - Insurance by default
diff --git a/htdocs/langs/en_GB/main.lang b/htdocs/langs/en_GB/main.lang
index 2dd70365ce4..f6f528c8777 100644
--- a/htdocs/langs/en_GB/main.lang
+++ b/htdocs/langs/en_GB/main.lang
@@ -49,3 +49,4 @@ Informations=Information
 AccordingToGeoIPDatabase=(according to GeoIP lookup)
 NoPhotoYet=No picture available yet
 WebSite=Website
+SearchIntoSupplierProposals=Vendor quotes
diff --git a/htdocs/langs/en_GB/projects.lang b/htdocs/langs/en_GB/projects.lang
index 5b9cb9a0de0..f506b1a134e 100644
--- a/htdocs/langs/en_GB/projects.lang
+++ b/htdocs/langs/en_GB/projects.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - projects
 CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referrers tab.
-SendProjectRef=About project %s
diff --git a/htdocs/langs/en_GB/supplier_proposal.lang b/htdocs/langs/en_GB/supplier_proposal.lang
index af7df3db950..7aac46af69e 100644
--- a/htdocs/langs/en_GB/supplier_proposal.lang
+++ b/htdocs/langs/en_GB/supplier_proposal.lang
@@ -1,7 +1,17 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
+SupplierProposal=Vendor commercial quotes
+SupplierProposalsDraft=Draft vendor quotes
+SupplierProposalArea=Vendor Quotes area
+SupplierProposalShort=Vendor quote
+SupplierProposals=Vendor quotes
+SupplierProposalsShort=Vendor quotes
 SupplierProposalRefFournNotice=Before closing as "Accepted", think of obtaining suppliers references.
 CopyAskFrom=Create a price request by copying an existing request
 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...)
 DefaultModelSupplierProposalCreate=Default template creation
+ListOfSupplierProposals=List of vendor quotes requested
+ListSupplierProposalsAssociatedProject=List of vendor quotes associated with project
+SupplierProposalsToClose=Vendor quotes to close
+SupplierProposalsToProcess=Vendor quotes to process
diff --git a/htdocs/langs/en_GB/suppliers.lang b/htdocs/langs/en_GB/suppliers.lang
index ff581fec4a6..1028dda9bbc 100644
--- a/htdocs/langs/en_GB/suppliers.lang
+++ b/htdocs/langs/en_GB/suppliers.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - suppliers
-SuppliersInvoice=Supplier's invoice
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=This supplier is already associated with a Product: %s
diff --git a/htdocs/langs/en_GB/users.lang b/htdocs/langs/en_GB/users.lang
index e2ca89d6287..c38e02240f5 100644
--- a/htdocs/langs/en_GB/users.lang
+++ b/htdocs/langs/en_GB/users.lang
@@ -1,12 +1,18 @@
 # Dolibarr language file - Source file is en_US - users
+SubjectNewPassword=Password changed for %s
 DefaultRightsDesc=Define here <u>default</u> permissions that are automatically granted to a <u>new created</u> user (Go to user card to change permissions of an existing user).
 CreateGroup=Create a group
 RemoveFromGroup=Remove from a group
+ConfirmPasswordReset=Confirm password change
 NonAffectedUsers=Non-assigned users
 UsePersonalValue=Use a personal choice
+CreateInternalUserDesc=This form allows you to create an internal user for your company/organisation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+InternalExternalDesc=An <b>internal</b> user is a part of your company/organisation.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions define rights on Dolibarr, also an external user can have a different menu manager to internal users (See Home - Setup - Display)
 PermissionInheritedFromAGroup=Permission granted through inherited rights from one of the user groups.
 UserWillBeInternalUser=Created user will be an internal user (because they are not linked to a particular third party)
 UserWillBeExternalUser=Created user will be an external user (because they are linked to a particular third party)
 NewUserPassword=Password changed for %s
 NbOfUsers=No. of users
+NbOfPermissions=No. of permissions
+ExpectedWorkedHours=Expected hours worked per week
 ColorUser=Colour for the user
diff --git a/htdocs/langs/en_GB/website.lang b/htdocs/langs/en_GB/website.lang
index 3663bd47db5..45efd3453c6 100644
--- a/htdocs/langs/en_GB/website.lang
+++ b/htdocs/langs/en_GB/website.lang
@@ -2,4 +2,3 @@
 WebsiteSetupDesc=Create here as many entries for websites as you need. Then go into menu Websites to edit them.
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge an SEO URL when the website is run from a Virtual host of a Web server (like Apache, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> is not yet available. You must first add a page.
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
diff --git a/htdocs/langs/en_IN/admin.lang b/htdocs/langs/en_IN/admin.lang
index 9e01f754dbe..0bfd73504c2 100644
--- a/htdocs/langs/en_IN/admin.lang
+++ b/htdocs/langs/en_IN/admin.lang
@@ -17,3 +17,4 @@ ProposalsPDFModules=Quotation documents models
 FreeLegalTextOnProposal=Free text on quotations
 WatermarkOnDraftProposal=Watermark on draft quotations (none if empty)
 FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (quotations, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formating when building PDF files.</font>
+MailToSendProposal=Customer quotations
diff --git a/htdocs/langs/en_IN/main.lang b/htdocs/langs/en_IN/main.lang
index 69d56d0dcf0..317a4f4f17e 100644
--- a/htdocs/langs/en_IN/main.lang
+++ b/htdocs/langs/en_IN/main.lang
@@ -25,4 +25,3 @@ CommercialProposalsShort=Quotations
 LinkToProposal=Link to quotation
 LinkToSupplierProposal=Link to supplier quotation
 SearchIntoCustomerProposals=Customer quotations
-SearchIntoSupplierProposals=Supplier quotations
diff --git a/htdocs/langs/en_IN/projects.lang b/htdocs/langs/en_IN/projects.lang
index 8c832c99ff6..bece63d2190 100644
--- a/htdocs/langs/en_IN/projects.lang
+++ b/htdocs/langs/en_IN/projects.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - projects
 OppStatusPROPO=Quotation
-SendProjectRef=About project %s
diff --git a/htdocs/langs/en_IN/supplier_proposal.lang b/htdocs/langs/en_IN/supplier_proposal.lang
deleted file mode 100644
index 586c5d5ceb9..00000000000
--- a/htdocs/langs/en_IN/supplier_proposal.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposals=Supplier quotations
-SupplierProposalsShort=Supplier quotations
-ListOfSupplierProposals=List of supplier quotation requests
diff --git a/htdocs/langs/es_CL/accountancy.lang b/htdocs/langs/es_CL/accountancy.lang
index 6fd5e95017d..bac34852928 100644
--- a/htdocs/langs/es_CL/accountancy.lang
+++ b/htdocs/langs/es_CL/accountancy.lang
@@ -32,7 +32,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
 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
 AccountancyArea=Área de contabilidad
@@ -103,6 +102,7 @@ BANK_DISABLE_DIRECT_INPUT=Deshabilitar la grabación directa de transacciones en
 ACCOUNTING_SELL_JOURNAL=Libro de ventas
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Diario misceláneo
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Diario del informe de gastos
+ACCOUNTING_HAS_NEW_JOURNAL=Tiene un nuevo diario
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Cuenta contable de transferencia
 ACCOUNTING_ACCOUNT_SUSPENSE=Cuenta de contabilidad de espera
 DONATION_ACCOUNTINGACCOUNT=Cuenta de contabilidad para registrar donaciones
@@ -129,6 +129,7 @@ ThirdpartyAccountNotDefined=Cuenta para un tercero no definido
 ProductAccountNotDefined=Cuenta para producto no definido
 FeeAccountNotDefined=Cuenta por tarifa no definida
 BankAccountNotDefined=Cuenta bancaria no definida
+ThirdPartyAccount=Cuenta de terceros
 NewAccountingMvt=Nueva transacción
 NumMvts=Numero de transacciones
 ListeMvts=Lista de movimientos
@@ -140,6 +141,7 @@ ListAccounts=Lista de cuentas contables
 UnknownAccountForThirdparty=Cuenta de terceros desconocida. Usaremos %s
 UnknownAccountForThirdpartyBlocking=Cuenta de terceros desconocida. Error de bloqueo
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Cuenta de terceros desconocida y cuenta de espera no definida. Error de bloqueo
+PaymentsNotLinkedToProduct=Pago no vinculado a ningún producto / servicio
 PcgtypeDesc=El grupo y el subgrupo de cuenta se usan como criterios predefinidos de "filtro" y "agrupamiento" para algunos informes contables. Por ejemplo, 'INGRESO' o 'GASTO' se utilizan como grupos para cuentas contables de productos para generar el informe de gastos / ingresos.
 TotalVente=Volumen de negocios total antes de impuestos
 TotalMarge=Margen total de ventas
@@ -148,8 +150,7 @@ DescVentilMore=En la mayoría de los casos, si utiliza productos o servicios pre
 DescVentilDoneCustomer=Consulte aquí la lista de las líneas de clientes de facturas y su cuenta de contabilidad de productos
 DescVentilTodoCustomer=Vincular líneas de factura que ya no están vinculadas con una cuenta de contabilidad de producto
 ChangeAccount=Cambie la cuenta de contabilidad de producto / servicio para líneas seleccionadas con la siguiente cuenta de contabilidad:
-DescVentilSupplier=Consulte aquí la lista de líneas de factura de proveedores vinculadas o aún no vinculadas a una cuenta de contabilidad de producto
-DescVentilDoneSupplier=Consulte aquí la lista de las líneas de proveedor de facturas y su cuenta de contable
+DescVentilDoneSupplier=Consulte aquí la lista de las líneas de vendedores de facturas y su cuenta de contabilidad
 DescVentilTodoExpenseReport=Vincular las líneas de informe de gastos que ya no están vinculadas con una cuenta de contabilidad de tarifas
 DescVentilExpenseReport=Consulte aquí la lista de líneas de informe de gastos vinculadas (o no) a una cuenta de contabilidad de tasas
 DescVentilExpenseReportMore=Si configura la cuenta de contabilidad en el tipo de líneas de informe de gastos, la aplicación podrá realizar todos los enlaces entre sus líneas de informe de gastos y la cuenta de contabilidad de su plan de cuentas, solo con un clic con el botón <strong>"%s"</strong>. Si la cuenta no se configuró en el diccionario de tarifas o si aún tiene algunas líneas no vinculadas a ninguna cuenta, deberá realizar una vinculación manual desde el menú "<strong>%s</strong>".
@@ -157,7 +158,7 @@ DescVentilDoneExpenseReport=Consulte aquí la lista de las líneas de informes d
 ValidateHistory=Enlazar automáticamente
 AutomaticBindingDone=Encuadernación automática hecha
 ErrorAccountancyCodeIsAlreadyUse=No puede eliminar esta cuenta porque está siendo usada
-MvtNotCorrectlyBalanced=El movimiento no está correctamente equilibrado. Crédito = %s. Débito = %s
+MvtNotCorrectlyBalanced=El movimiento no está correctamente equilibrado. Débito = %s | Crédito = %s
 FicheVentilation=Tarjeta de enlace
 GeneralLedgerIsWritten=Las transacciones se escriben en el Libro mayor
 GeneralLedgerSomeRecordWasNotRecorded=Algunas de las transacciones no pueden ser contabilizadas. Si no hay otro mensaje de error, esto es probablemente porque ya estaban en el diario.
@@ -172,8 +173,10 @@ CategoryDeleted=La categoría de la cuenta de contabilidad ha sido eliminada
 AccountingJournals=Libros contables
 AccountingJournal=Diario de contabilidad
 NewAccountingJournal=Nueva revista de contabilidad
+AccountingJournalType1=Operaciones misceláneas
 AccountingJournalType5=Informe de gastos
 ErrorAccountingJournalIsAlreadyUse=Este diario ya es uso
+AccountingAccountForSalesTaxAreDefinedInto=Nota: La cuenta de contabilidad para el impuesto a las ventas se define en el menú <b> %s </ b> - <b> %s </ b>
 ExportDraftJournal=Exportar borrador del diario
 Selectmodelcsv=Seleccione un modelo
 Modelcsv_normal=Exportación clasica
@@ -204,3 +207,5 @@ Binded=Líneas atadas
 ToBind=Líneas para enlazar
 UseMenuToSetBindindManualy=No es posible la autodetección, use el menú <a href="%s"> %s </a> para realizar el enlace manualmente
 WarningReportNotReliable=Advertencia, este informe no se basa en el Libro mayor, por lo que no contiene la transacción modificada manualmente en el Libro mayor. Si su periodización está actualizada, la vista de la contabilidad es más precisa.
+ExpenseReportJournal=Diario del informe de gastos
+InventoryJournal=Revista de inventario
diff --git a/htdocs/langs/es_CL/admin.lang b/htdocs/langs/es_CL/admin.lang
index d91055b2389..cc92e69b0c6 100644
--- a/htdocs/langs/es_CL/admin.lang
+++ b/htdocs/langs/es_CL/admin.lang
@@ -196,7 +196,7 @@ MAIN_MAIL_SMTP_SERVER=Servidor SMTP/SMTP (por defecto en php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Puerto SMTP / SMTPS (no definido en PHP en sistemas tipo Unix)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Servidor SMTP / SMTPS (no definido en PHP en sistemas tipo Unix)
 MAIN_MAIL_EMAIL_FROM=Correo electrónico remitente para correos electrónicos automáticos (por defecto en php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Correo electrónico utilizado como campo 'Errores a' en los correos electrónicos enviados
+MAIN_MAIL_ERRORS_TO=Eemail utilizado para los correos electrónicos de devoluciones de errores (campos 'Errores-Para' en los correos electrónicos enviados)
 MAIN_MAIL_AUTOCOPY_TO=Envíe sistemáticamente una copia oculta de todos los correos electrónicos enviados a
 MAIN_DISABLE_ALL_MAILS=Deshabilitar todos los envíos de correos electrónicos (para propósitos de prueba o demostraciones)
 MAIN_MAIL_FORCE_SENDTO=Enviar todos los correos electrónicos a (en lugar de destinatarios reales, para fines de prueba)
@@ -215,7 +215,6 @@ FeatureNotAvailableOnLinux=Característica no disponible en sistemas como Unix.
 SubmitTranslation=Si la traducción de este idioma no está completa o si encuentra errores, puede corregir esto editando archivos en el directorio <b>langs/%s</b> y envíe su cambio a www.transifex.com/dolibarr-association/dolibarr/
 SubmitTranslationENUS=Si la traducción de este idioma no está completa o si encuentra errores, puede corregir esto editando archivos en el directorio <b>langs /%s</b> y enviando archivos modificados en dolibarr.org/forum o para desarrolladores en github.com/Dolibarr/dolibarr.
 ModulesSetup=Módulos / configuración de la aplicación
-ModuleFamilySrm=Gestión de relaciones con proveedores (SRM)
 ModuleFamilyProjects=Proyectos / trabajo colaborativo
 ModuleFamilyTechnic=Herramientas de varios módulos
 ModuleFamilyFinancial=Módulos financieros (Contabilidad / Tesorería)
@@ -284,7 +283,8 @@ SecurityToken=Clave para asegurar URLs
 NoSmsEngine=No hay un administrador de envío de SMS disponible. SMS sender manager no están instalados con distribución predeterminada (porque dependen de un proveedor externo) pero puede encontrar algunos en %s
 PDFDesc=Puede establecer cada opción global relacionada con la generación de PDF
 PDFAddressForging=Reglas para forjar cuadros de direcciones
-HideAnyVATInformationOnPDF=Ocultar toda la información relacionada con el IVA en PDF generado
+HideAnyVATInformationOnPDF=Ocultar toda la información relacionada con Impuesto a las ventas / IVA en PDF generado
+PDFRulesForSalesTax=Reglas para el impuesto a las ventas / IVA
 HideLocalTaxOnPDF=Ocultar %s tasa en venta de impuestos en la columna de PDF
 HideDescOnPDF=Ocultar la descripción de productos en PDF generado
 HideRefOnPDF=Ocultar REF. de productos en PDF generado
@@ -342,11 +342,13 @@ NoDetails=No hay más detalles en el pie de página
 DisplayCompanyManagers=Mostrar nombres de administrador
 DisplayCompanyInfoAndManagers=Mostrar los nombres de administrador y dirección de la compañía
 EnableAndSetupModuleCron=Si desea que esta factura recurrente sea generada automáticamente, el módulo *%s* debe estar habilitado y configurado correctamente. De lo contrario, la generación de facturas se debe hacer manualmente desde esta plantilla con el botón * Crear *. Tenga en cuenta que incluso si activó la generación automática, puede iniciar de forma segura la generación manual. La generación de duplicados para el mismo período no es posible.
-ModuleCompanyCodeAquarium=Devuelva un código de contabilidad creado por: <br> %s seguido de un código de proveedor de terceros para un código de contabilidad de proveedor, <br> %s seguido de un código de cliente de terceros para un código de contabilidad de cliente.
+ModuleCompanyCodeCustomerAquarium=%s seguido por un código de cliente externo para un código de contabilidad del cliente
+ModuleCompanyCodeSupplierAquarium=%s seguido por un código de proveedor externo para un código de contabilidad de proveedor
 ModuleCompanyCodePanicum=Devuelve un código de contabilidad vacío.
 ModuleCompanyCodeDigitaria=El código de contabilidad depende del código de un tercero. El código se compone del carácter "C" en la primera posición seguido de los primeros 5 caracteres del código de terceros.
 Use3StepsApproval=De forma predeterminada, los pedidos de compra deben ser creados y aprobados por 2 usuarios diferentes (un paso / usuario para crear y un paso / usuario para aprobar. Tenga en cuenta que si el usuario tiene ambos permisos para crear y aprobar, un paso / usuario será suficiente) . Puede solicitar con esta opción que presente un tercer paso / aprobación del usuario, si el monto es mayor que un valor dedicado (por lo que se necesitarán 3 pasos: 1 = validación, 2 = primera aprobación y 3 = segunda aprobación si el monto es suficiente). <br> Configure esto como vacío si una aprobación (2 pasos) es suficiente, configúrelo a un valor muy bajo (0.1) si siempre se requiere una segunda aprobación (3 pasos).
 UseDoubleApproval=Utilice una aprobación de 3 pasos cuando la cantidad (sin impuestos) sea más alta que ...
+WarningPHPMail=ADVERTENCIA: a menudo es mejor configurar los correos electrónicos salientes para usar el servidor de correo electrónico de su proveedor en lugar de la configuración predeterminada. Algunos proveedores de correo electrónico (como Yahoo) no le permiten enviar un correo electrónico desde otro servidor que no sea su propio servidor. Su configuración actual utiliza el servidor de la aplicación para enviar correos electrónicos y no el servidor de su proveedor de correo electrónico, por lo que algunos destinatarios (el compatible con el restrictivo protocolo DMARC) le preguntarán a su proveedor de correo electrónico si pueden aceptar su correo electrónico y algunos proveedores de correo electrónico. (como Yahoo) puede responder "no" porque el servidor no es un servidor de ellos, por lo que es posible que no se acepten algunos de sus correos electrónicos enviados (tenga cuidado también con la cuota de envío de su proveedor de correo electrónico). Si su proveedor de correo electrónico (como Yahoo) tiene esta restricción, debe cambiar Configuración de correo electrónico para elegir el otro método "Servidor SMTP" e ingresar el servidor SMTP y las credenciales proporcionadas por su proveedor de correo electrónico (solicite a su proveedor de correo electrónico que obtenga las credenciales SMTP para su cuenta).
 WarningPHPMail2=Si su proveedor SMTP por correo electrónico necesita restringir el cliente de correo electrónico a algunas direcciones IP (muy raras), esta es la dirección IP de su aplicación ERP CRM: <strong> %s </ strong>.
 ClickToShowDescription=Haga clic para mostrar la descripción
 DependsOn=Este módulo necesita el módulo (s)
@@ -361,10 +363,13 @@ ProductDocumentTemplates=Plantillas de documentos para generar documentos de pro
 FreeLegalTextOnExpenseReports=Texto legal gratuito en informes de gastos
 WatermarkOnDraftExpenseReports=Marca de agua en los borradores de informes de gastos
 AttachMainDocByDefault=Establezca esto en 1 si desea adjuntar el documento principal al correo electrónico de forma predeterminada (si corresponde)
+DAVSetup=Configuración del módulo DAV
+DAV_ALLOW_PUBLIC_DIR=Habilite el directorio público (directorio WebDav sin necesidad de iniciar sesión)
+DAV_ALLOW_PUBLIC_DIRTooltip=El directorio público de WebDav es un directorio WebDAV al que todos pueden acceder (en modo lectura y escritura), sin necesidad de tener / usar una cuenta de inicio de sesión / contraseña existente.
 Module0Desc=Gestión de usuarios / empleados y grupos
 Module1Desc=Empresas y gestión de contactos (clientes, prospectos ...)
 Module2Desc=Administración comercial
-Module10Desc=Informes contables simples (diarios, rotación) basados ​​en el contenido de la base de datos. Sin envío.
+Module10Desc=Informes contables simples (diarios, rotación) basados ​​en el contenido de la base de datos. No usa ninguna tabla de contabilidad.
 Module20Name=Cotizaciones
 Module20Desc=Gestión de cotizaciones/propuestas comerciales
 Module22Name=E-mailings masivos
@@ -408,7 +413,7 @@ Module320Desc=Agregar fuente RSS dentro de las páginas de pantalla de Dolibarr
 Module400Name=Proyectos / Oportunidades / Leads
 Module400Desc=Gestión de proyectos, oportunidades / clientes potenciales y / o tareas. También puede asignar cualquier elemento (factura, orden, propuesta, intervención, ...) a un proyecto y obtener una vista transversal desde la vista del proyecto.
 Module410Desc=Integración de Webcalendar
-Module500Desc=Gestión de pagos especiales (impuestos, impuestos sociales o fiscales, dividendos)
+Module500Name=Impuestos y gastos especiales
 Module510Name=Pago de los salarios de los empleados
 Module510Desc=Registre y siga el pago de los salarios de sus empleados
 Module520Name=Préstamo
@@ -418,7 +423,7 @@ Module600Desc=Enviar notificaciones de correo electrónico (activadas por alguno
 Module600Long=Tenga en cuenta que este módulo está dedicado a enviar correos electrónicos en tiempo real cuando ocurre un evento comercial dedicado. Si está buscando una función para enviar recordatorios por correo electrónico de los eventos de su agenda, vaya a la configuración del módulo Agenda.
 Module770Name=Reporte de gastos
 Module770Desc=Informes de gestión y reclamación de gastos (transporte, comida, ...)
-Module1120Desc=Solicitar presupuesto de proveedor y precios
+Module1120Name=Propuesta comercial del vendedor
 Module1200Desc=Integración Mantis
 Module1520Name=Generación de documentos
 Module1520Desc=Generación masiva de documentos de correo
@@ -429,7 +434,7 @@ Module2200Desc=Permitir el uso de expresiones matemáticas para los precios
 Module2300Name=Trabajos programados
 Module2300Desc=Gestión programada de trabajos (alias cron o crono tabla)
 Module2400Name=Eventos / Agenda
-Module2400Desc=Siga los eventos hechos y venideros. Deje que la aplicación registre los eventos automáticos con fines de seguimiento o registre eventos manuales o rendez-vous.
+Module2400Desc=Siga los eventos hechos y venideros. Deje que la aplicación registre los eventos automáticos con fines de seguimiento o registre eventos manuales o rendez-vous. Este es el principal módulo importante para una buena gestión de relaciones con clientes o proveedores.
 Module2500Desc=Sistema de gestión de documentos / gestión electrónica de contenidos. Organización automática de sus documentos generados o almacenados. Compártelos cuando lo necesites.
 Module2600Name=API / servicios web (servidor SOAP)
 Module2600Desc=Habilite el servidor Dolibarr SOAP que proporciona servicios de API
@@ -453,12 +458,13 @@ Module50000Desc=Módulo para ofrecer una página de pago en línea que acepta pa
 Module50100Name=Puntos de venta
 Module50100Desc=Módulo de punto de venta (POS).
 Module50200Desc=Módulo para ofrecer una página de pago en línea que acepta pagos con PayPal (tarjeta de crédito o crédito de PayPal). Esto se puede usar para permitir que sus clientes realicen pagos gratuitos o para un pago en un objeto Dolibarr en particular (factura, orden, ...)
-Module50400Desc=Gestión contable (entradas dobles, libros auxiliares generales y auxiliares)
+Module50400Desc=Gestión contable (entradas dobles, libros auxiliares generales y auxiliares). Exporte el libro de contabilidad en varios otros formatos de software de contabilidad.
 Module54000Desc=Impresión directa (sin abrir los documentos) utilizando la interfaz Cups IPP (la impresora debe estar visible desde el servidor, y las CUPS deben estar instaladas en el servidor).
 Module55000Name=Encuesta, encuesta o voto
 Module55000Desc=Módulo para hacer sondeos, encuestas o votaciones en línea (como Doodle, Studs, Rdvz, ...)
 Module59000Desc=Módulo para administrar márgenes
 Module60000Desc=Módulo para gestionar comisiones
+Module62000Desc=Agregue funciones para administrar Incoterm
 Module63000Desc=Administre los recursos (impresoras, automóviles, habitaciones, ...) que luego puede compartir en eventos
 Permission11=Lea las facturas de los clientes
 Permission12=Crear/modificar facturas de clientes
@@ -625,7 +631,11 @@ Permission1251=Ejecutar las importaciones masivas de datos externos en la base d
 Permission1321=Exportar facturas, atributos y pagos de clientes
 Permission1322=Reabrir una factura paga
 Permission1421=Exportar pedidos y atributos de los clientes
+Permission20001=Lea las solicitudes de ausencia (sus hojas y la de sus subordinados)
+Permission20002=Crea / modifica tus solicitudes de ausencia (las tuyas se van y la de tus subordinados)
 Permission20003=Eliminar solicitudes de permiso
+Permission20004=Lea todas las solicitudes de licencia (incluso del usuario no subordinado)
+Permission20005=Crear / modificar solicitudes de abandono para todos (incluso para usuarios no subordinados)
 Permission20006=Solicitudes de permiso de administrador (configuración y saldo de actualización)
 Permission23001=Leer trabajo programado
 Permission23002=Crear / actualizar trabajo programado
@@ -754,9 +764,9 @@ Delays_MAIN_DELAY_MEMBERS=Retraso en la tolerancia (en días) antes de la alerta
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Retraso de tolerancia (en días) antes de la alerta para depósitos de cheques para hacer
 Delays_MAIN_DELAY_EXPENSEREPORTS=Retraso de tolerancia (en días) antes de la alerta para que los informes de gastos aprueben
 SetupDescription1=El área de configuración es para los parámetros iniciales de configuración antes de comenzar a usar Dolibarr.
-SetupDescription2=Los dos pasos de configuración obligatorios son los dos primeros en el menú de configuración a la izquierda: página de configuración %s y página de configuración %s:
-SetupDescription3=Los parámetros del menú <a href="%s"> %s -> %s </a> son necesarios porque los datos definidos se utilizan en las pantallas de Dolibarr y para personalizar el comportamiento predeterminado del software (por ejemplo, para las características relacionadas con el país).
-SetupDescription4=Los parámetros en el menú <a href="%s"> %s -> %s </a> son necesarios porque Dolibarr ERP / CRM es una colección de varios módulos / aplicaciones, todos más o menos independientes. Se agregarán nuevas características a los menús para cada módulo que active.
+SetupDescription2=Los dos pasos de configuración obligatorios son los siguientes (las dos primeras entradas en el menú de configuración izquierdo):
+SetupDescription3=Configuración en el menú <a href="%s"> %s -> %s </a>. Este paso es necesario porque define los datos utilizados en las pantallas de Dolibarr para personalizar el comportamiento predeterminado del software (por ejemplo, para las características relacionadas con el país).
+SetupDescription4=Configuración en el menú <a href="%s"> %s -> %s </a>. Este paso es necesario porque Dolibarr ERP / CRM es una colección de varios módulos / aplicaciones, todos más o menos independientes. Las nuevas funciones se agregan a los menús para cada módulo que active.
 SetupDescription5=Otras entradas de menú administran parámetros opcionales.
 LogEvents=Eventos de auditoría de seguridad
 InfoDolibarr=Sobre Dolibarr
@@ -771,7 +781,8 @@ LogEventDesc=Puede habilitar aquí el registro de eventos de seguridad de Doliba
 AreaForAdminOnly=Los <b> usuarios administradores </ b> solo pueden configurar los parámetros de configuración.
 SystemInfoDesc=La información del sistema es información técnica miscelánea que obtienes en modo solo lectura y visible solo para los administradores.
 SystemAreaForAdminOnly=Esta área está disponible solo para usuarios administradores. Ninguno de los permisos de Dolibarr puede reducir este límite.
-CompanyFundationDesc=Edite en esta página toda la información conocida de la compañía o fundación que necesita administrar (para esto, haga clic en el botón "Modificar" o "Guardar" en la parte inferior de la página)
+AccountantDesc=Edite en esta página toda la información conocida sobre su contador / tenedor de libros
+AccountantFileNumber=Número de expediente
 DisplayDesc=Puede elegir cada parámetro relacionado con el aspecto y la sensación de Dolibarr aquí
 AvailableModules=Aplicación / módulos disponibles
 ToActivateModule=Para activar los módulos, vaya al Área de configuración (Inicio-> Configuración-> Módulos).
@@ -888,8 +899,9 @@ UserMailRequired=Se requiere correo electrónico para crear un nuevo usuario
 HRMSetup=Configuración del módulo RRHH
 CompanySetup=Configuración del módulo de empresas
 CompanyCodeChecker=Módulo para la generación y verificación de código de terceros (cliente o proveedor)
-AccountCodeManager=Módulo para la generación de códigos contables (cliente o proveedor)
+AccountCodeManager=Módulo para la generación de códigos de contabilidad (cliente o proveedor)
 NotificationsDesc=La función de notificaciones de Correo Electrónico le permite enviar correos automáticos en silencio para algunos eventos de Dolibarr. Los objetivos de las notificaciones se pueden definir:
+NotificationsDescContact=* por contactos de terceros (clientes o proveedores), un contacto a la vez.
 NotificationsDescGlobal=* o estableciendo correos electrónicos de objetivos globales en la página de configuración del módulo.
 ModelModules=Plantillas de documentos
 DocumentModelOdt=Genere documentos a partir de plantillas de OpenDocuments (archivos .ODT o .ODS para OpenOffice, KOffice, TextEdit, ...)
@@ -899,6 +911,8 @@ CompanyIdProfChecker=Reglas sobre Ids profesionales
 MustBeMandatory=Obligatorio para crear terceros?
 MustBeInvoiceMandatory=Obligatorio para validar facturas?
 TechnicalServicesProvided=Servicios técnicos proporcionados
+WebDAVSetupDesc=Estos son los enlaces para acceder al directorio WebDAV. Contiene un directorio "público" abierto para cualquier usuario que conozca la URL (si se permite el acceso público al directorio) y un directorio "privado" que necesita una cuenta de inicio de sesión / contraseña para acceder.
+WebDavServer=URL raíz del servidor %s: %s
 WebCalUrlForVCalExport=Un enlace de exportación al formato <b>%s</b> está disponible en el siguiente enlace: %s
 BillsSetup=Configuración del módulo de facturas
 BillsNumberingModule=Modelo de numeración de facturas y notas de crédito
@@ -918,14 +932,14 @@ ProposalsPDFModules=Modelos de documentos de cotizaciones
 FreeLegalTextOnProposal=Texto libre en cotizaciones
 WatermarkOnDraftProposal=Marca de agua en cotizaciones borrador (en caso de estar vacío)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Preguntar por el destino de la cuenta bancaria
-SupplierProposalSetup=Solicitud de precio para la configuración del módulo de proveedores
-SupplierProposalNumberingModules=Los precios solicitan a los proveedores modelos de numeración
-SupplierProposalPDFModules=Los precios solicitan documentos de proveedores modelos
-FreeLegalTextOnSupplierProposal=Texto libre sobre proveedores de solicitudes de precios
-WatermarkOnDraftSupplierProposal=Marca de agua en los proveedores de solicitudes de precios en borrador (ninguna si está vacía)
+SupplierProposalSetup=Solicitud de precio configuración del módulo de proveedores
+SupplierProposalNumberingModules=Peticiones de precios modelos de numeración de proveedores
+SupplierProposalPDFModules=Solicitudes de precios modelos de documentos de proveedores
+FreeLegalTextOnSupplierProposal=Texto libre sobre vendedores de solicitudes de precio
+WatermarkOnDraftSupplierProposal=Marca de agua en los proveedores de solicitudes de precios preliminares (ninguno si está vacío)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Preguntar por el destino de la cuenta bancaria de la solicitud de precio
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Pida la fuente de Warehouse para ordenar
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Preguntar por el destino de la cuenta bancaria de la orden del proveedor
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Preguntar por el destino de la cuenta bancaria de la orden de compra
 OrdersSetup=Configuración de administración de pedidos
 OrdersNumberingModules=Modelos de numeración de pedidos
 OrdersModelModule=Modelos de documentos de pedido
@@ -1082,6 +1096,9 @@ SyslogFilename=Nombre de archivo y ruta
 YouCanUseDOL_DATA_ROOT=Puede usar DOL_DATA_ROOT / dolibarr.log para un archivo de registro en el directorio "documentos" de Dolibarr. Puede establecer una ruta diferente para almacenar este archivo.
 ErrorUnknownSyslogConstant=Constante %s no es una constante de Syslog conocida
 OnlyWindowsLOG_USER=Windows solo es compatible con LOG_USER
+CompressSyslogs=Syslog compresión y copia de seguridad de archivos
+SyslogFileNumberOfSaves=Copias de seguridad de registro
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configurar el trabajo programado de limpieza para establecer la frecuencia de copia de seguridad de registro
 DonationsSetup=Configuración del módulo de donación
 DonationsReceiptModel=Plantilla de recibo de donación
 BarcodeSetup=Configuración de código de barras
@@ -1129,7 +1146,7 @@ OSCommerceErrorConnectOkButWrongDatabase=La conexión se realizó correctamente
 OSCommerceTestOk=Conexión al servidor '%s' en la base de datos '%s' con el usuario '%s' exitoso.
 OSCommerceTestKo1=La conexión al servidor '%s' tuvo éxito pero no se pudo alcanzar la base de datos '%s'.
 OSCommerceTestKo2=La conexión al servidor '%s' con el usuario '%s' falló.
-StockSetup=Configuración del módulo de almacén
+StockSetup=Configuración del módulo de stock
 IfYouUsePointOfSaleCheckModule=Si usa un módulo de punto de venta (el módulo POS se proporciona por defecto u otro módulo externo), su configuración puede ser ignorada por su módulo de punto de venta. La mayoría de los módulos de puntos de venta están diseñados para crear inmediatamente una factura y disminuir el stock por defecto, sean cuales sean las opciones aquí. Por lo tanto, si necesita o no tiene una disminución de stock al registrar una venta desde su Punto de venta, verifique también la configuración de su módulo POS.
 MenuDeleted=Menú borrado
 NotTopTreeMenuPersonalized=Menús personalizados no vinculados a una entrada del menú superior
@@ -1158,6 +1175,7 @@ OptionVatMode=IVA debido
 OptionVATDebitOption=Devengo
 OptionVatDefaultDesc=El IVA es pagadero: <br> - a la entrega de los bienes (utilizamos la fecha de la factura) <br> - en los pagos por los servicios
 OptionVatDebitOptionDesc=El IVA es pagadero: <br> - a la entrega de los bienes (utilizamos la fecha de la factura) <br> - en la factura (débito) de los servicios
+OptionPaymentForProductAndServicesDesc=El IVA es pagadero: <br> - en el pago de bienes<br> - en los pagos por servicios
 SummaryOfVatExigibilityUsedByDefault=Tiempo de exigibilidad del IVA por defecto según la opción elegida:
 OnPayment=En pago
 SupposedToBePaymentDate=Fecha de pago utilizada
@@ -1215,7 +1233,7 @@ BankOrderESDesc=Orden de exhibición en español
 ChequeReceiptsNumberingModule=Compruebe el módulo de numeración de recibos
 MultiCompanySetup=Configuración de módulo multi-compañía
 SuppliersSetup=Configuración del módulo de proveedor
-SuppliersCommandModel=Plantilla completa del pedido del proveedor (logotipo ...)
+SuppliersCommandModel=Plantilla completa de orden de compra (logo ...)
 SuppliersInvoiceModel=Plantilla completa de la factura del proveedor (logotipo ...)
 SuppliersInvoiceNumberingModel=Modelos de numeración de facturas de proveedores
 IfSetToYesDontForgetPermission=Si se establece en sí, no se olvide de proporcionar permisos a los grupos o usuarios permitidos para la segunda aprobación
@@ -1244,7 +1262,6 @@ NoAmbiCaracAutoGeneration=No utilice caracteres ambiguos ("1", "l", "i", "|", "0
 SalariesSetup=Configuración de los salarios del módulo
 SortOrder=Orden de clasificación
 Format=Formato
-TypePaymentDesc=0: tipo de pago del cliente, 1: tipo de pago del proveedor, 2: tipo de pago de clientes y proveedores
 IncludePath=Incluir ruta (definida en la variable %s)
 ExpenseReportsSetup=Configuración del módulo Informes de gastos
 TemplatePDFExpenseReports=Plantillas de documentos para generar el documento de informe de gastos
@@ -1264,7 +1281,7 @@ InstallModuleFromWebHasBeenDisabledByFile=La instalación del módulo externo de
 ConfFileMustContainCustom=La instalación o creación de un módulo externo desde la aplicación necesita guardar los archivos del módulo en el directorio <strong>%s</strong>. Para que Dolibarr procese este directorio, debe configurar su <strong>conf/conf.php</strong> para agregar las 2 líneas de directiva: <br><strong>$dolibarr_main_url_root_alt ='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Resalta las líneas de la mesa cuando el movimiento del mouse pasa por encima
 HighlightLinesColor=Resalta el color de la línea cuando pasa el mouse (mantente vacío para que no resalte)
-TextTitleColor=Color del título de la página
+TextTitleColor=Color del texto del título de la página
 LinkColor=Color de enlaces
 PressF5AfterChangingThis=Presione CTRL + F5 en el teclado o borre la caché de su navegador después de cambiar este valor para que sea efectivo
 NotSupportedByAllThemes=Will trabaja con temas centrales, puede no ser compatible con temas externos
@@ -1272,6 +1289,7 @@ TopMenuBackgroundColor=Color de fondo para el menú superior
 TopMenuDisableImages=Ocultar imágenes en el menú superior
 LeftMenuBackgroundColor=Color de fondo para el menú izquierdo
 BackgroundTableTitleColor=Color de fondo para la línea de título de la tabla
+BackgroundTableTitleTextColor=Color del texto para la línea de título de la tabla
 BackgroundTableLineOddColor=Color de fondo para las líneas de mesa impares
 BackgroundTableLineEvenColor=Color de fondo para líneas de mesas uniformes
 MinimumNoticePeriod=Periodo de preaviso mínimo (Su solicitud de ausencia debe hacerse antes de este retraso)
@@ -1291,17 +1309,12 @@ FillFixTZOnlyIfRequired=Ejemplo: +2 (llenar solo si se experimentó un problema)
 ExpectedChecksum=Suma de comprobación esperada
 CurrentChecksum=Cheque actual
 ForcedConstants=Valores constantes requeridos
-MailToSendProposal=Para enviar la propuesta del cliente
-MailToSendOrder=Para enviar la orden del cliente
-MailToSendInvoice=Para enviar la factura del cliente
-MailToSendShipment=Para enviar el envío
-MailToSendIntervention=Enviar intervención
-MailToSendSupplierRequestForQuotation=Para enviar solicitud de presupuesto al proveedor
-MailToSendSupplierOrder=Para enviar una orden de proveedor
-MailToSendSupplierInvoice=Para enviar la factura del proveedor
-MailToThirdparty=Para enviar correos electrónicos desde una página de terceros
-MailToMember=Para enviar un correo electrónico desde la página de miembro
-MailToUser=Para enviar un correo electrónico desde la página de usuario
+MailToSendProposal=Propuestas de clientes
+MailToSendInvoice=Facturas de cliente
+MailToSendSupplierRequestForQuotation=Solicitud de presupuesto
+MailToSendSupplierOrder=Ordenes de compra
+MailToSendSupplierInvoice=Facturas del vendedor
+MailToProject=Página de proyectos
 ByDefaultInList=Mostrar de forma predeterminada en la vista de lista
 YouUseLastStableVersion=Usas la última versión estable
 TitleExampleForMajorRelease=Ejemplo de mensaje que puede usar para anunciar esta versión principal (no dude en utilizarla en sus sitios web)
@@ -1342,6 +1355,11 @@ BaseCurrency=Moneda de referencia de la empresa (entre en la configuración de l
 WarningNoteModulePOSForFrenchLaw=Este módulo %s cumple con las leyes francesas (Loi Finance 2016) porque el módulo Registros no reversibles se activa automáticamente.
 WarningInstallationMayBecomeNotCompliantWithLaw=Intenta instalar el módulo %s que es un módulo externo. Activar un módulo externo significa que confía en el editor del módulo y está seguro de que este módulo no altera negativamente el comportamiento de su aplicación y cumple con las leyes de su país (%s). Si el módulo trae una característica no legal, usted se convierte en responsable del uso de un software no legal.
 SetToYesIfGroupIsComputationOfOtherGroups=Establezca esto en sí si este grupo es un cálculo de otros grupos
+SeveralLangugeVariatFound=Varias variantes de lenguaje encontradas
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Eliminar caracteres especiales
+COMPANY_AQUARIUM_CLEAN_REGEX=Filtro Regex para limpiar el valor (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=Contacto GDPR
+GDPRContactDesc=Si almacena datos sobre empresas / ciudadanos europeos, puede almacenar aquí el contacto responsable del Reglamento general de protección de datos
 ResourceSetup=Recurso de configuración del módulo
 UseSearchToSelectResource=Use un formulario de búsqueda para elegir un recurso (en lugar de una lista desplegable).
 DisabledResourceLinkUser=Deshabilitar característica para vincular un recurso a los usuarios
diff --git a/htdocs/langs/es_CL/agenda.lang b/htdocs/langs/es_CL/agenda.lang
index 0a2f4b880db..e77382bd868 100644
--- a/htdocs/langs/es_CL/agenda.lang
+++ b/htdocs/langs/es_CL/agenda.lang
@@ -29,6 +29,9 @@ PropalClassifiedBilledInDolibarr=Propuesta %s clasificado facturado
 InvoiceValidatedInDolibarrFromPos=Factura %s validada de POS
 InvoiceBackToDraftInDolibarr=La factura %s vuelve al estado del giro
 InvoicePaidInDolibarr=Factura %s cambiado a pagado
+MemberSubscriptionAddedInDolibarr=Se agregó la suscripción %s para el miembro %s
+MemberSubscriptionModifiedInDolibarr=Suscripción %s para el miembro %s modificado
+MemberSubscriptionDeletedInDolibarr=Suscripción %s para el miembro %s eliminado
 ShipmentValidatedInDolibarr=Envío %s validado
 ShipmentClassifyClosedInDolibarr=Envío %s clasificado facturado
 ShipmentUnClassifyCloseddInDolibarr=Envío %s clasificado reabierto
@@ -67,6 +70,7 @@ DefaultWorkingDays=Rango predeterminado de días laborables en la semana (Ejempl
 DefaultWorkingHours=Horas de trabajo predeterminadas en el día (Ejemplo: 9-18)
 ExtSites=Importar calendarios externos
 ExtSitesEnableThisTool=Mostrar los calendarios externos (definidos en la configuración global) en la agenda. No afecta los calendarios externos definidos por los usuarios.
+AgendaExtNb=Calendario no. %s
 ExtSiteUrlAgenda=URL para acceder al archivo .ical
 DateActionBegin=Fecha del evento de inicio
 ConfirmCloneEvent=¿Seguro que quieres clonar el evento <b>%s</b>?
diff --git a/htdocs/langs/es_CL/banks.lang b/htdocs/langs/es_CL/banks.lang
index 3134b917ba1..2229656f69f 100644
--- a/htdocs/langs/es_CL/banks.lang
+++ b/htdocs/langs/es_CL/banks.lang
@@ -4,6 +4,7 @@ MenuVariousPayment=Pagos diversos
 MenuNewVariousPayment=Nuevo pago misceláneo
 BankAccount=cuenta bancaria
 BankAccounts=Cuentas bancarias
+BankAccountsAndGateways=Cuentas bancarias | Puertas de enlace
 AccountRef=Ref de cuenta financiera
 AccountLabel=Etiqueta de cuenta financiera
 CashAccount=Cuenta de efectivo
diff --git a/htdocs/langs/es_CL/bills.lang b/htdocs/langs/es_CL/bills.lang
index 11d752cb07b..bea8d0c8baf 100644
--- a/htdocs/langs/es_CL/bills.lang
+++ b/htdocs/langs/es_CL/bills.lang
@@ -50,6 +50,7 @@ paymentInInvoiceCurrency=en la moneda de las facturas
 DeletePayment=Eliminar pago
 ConfirmDeletePayment=¿Seguro que quieres eliminar este pago?
 ConfirmConvertToReduc=¿Desea convertir este %s en un descuento absoluto? <br> El importe se guardará entre todos los descuentos y podría utilizarse como descuento para una factura actual o futura para este cliente.
+ConfirmConvertToReducSupplier=¿Desea convertir este %s en un descuento absoluto? <br> El importe se guardará entre todos los descuentos y podría utilizarse como un descuento para una factura actual o futura para este proveedor.
 SupplierPayments=Pagos de proveedores
 ReceivedCustomersPayments=Pagos recibidos de los clientes
 PayedSuppliersPayments=Pagos pagados a proveedores
@@ -68,6 +69,7 @@ PaymentAmount=Monto del pago
 ValidatePayment=Validar el pago
 PaymentHigherThanReminderToPay=Pago más alto que un recordatorio para pagar
 HelpPaymentHigherThanReminderToPay=Atención, el monto de pago de una o más facturas es más alto que el resto para pagar. <br> Edite su entrada; de lo contrario, confirme y piense en crear una nota de crédito del exceso recibido por cada factura en exceso.
+HelpPaymentHigherThanReminderToPaySupplier=Atención, el monto de pago de una o más facturas es más alto que el resto para pagar. <br> Edite su entrada; de lo contrario, confirme y piense en crear una nota de crédito del exceso pagado por cada factura en exceso.
 ClassifyUnBilled=Clasificar 'Unbilled'
 CreateCreditNote=Crear nota de crédito
 AddBill=Crear factura o nota de crédito
@@ -78,15 +80,16 @@ CancelBill=Cancelar una factura
 SendRemindByMail=Enviar recordatorio por correo electrónico
 DoPayment=Ingrese el pago
 DoPaymentBack=Ingrese el reembolso
-ConvertToReduc=Convertir en futuros descuentos
+ConvertToReduc=Marcar como crédito disponible
 ConvertExcessReceivedToReduc=Convertir el exceso recibido en futuros descuentos
+ConvertExcessPaidToReduc=Convierta el exceso pagado en futuros descuentos
 EnterPaymentReceivedFromCustomer=Ingrese el pago recibido del cliente
 EnterPaymentDueToCustomer=Hacer el pago debido al cliente
 DisabledBecauseRemainderToPayIsZero=Desactivado porque permanecer sin pagar es cero
 PriceBase=Base de precios
 BillStatusDraft=Borrador (debe ser validado)
 BillStatusPaid=Pagado
-BillStatusPaidBackOrConverted=Reembolso de la nota de crédito o convertido en descuento
+BillStatusPaidBackOrConverted=Reembolso de nota de crédito o marcado como crédito disponible
 BillStatusConverted=Pagado (listo para el consumo en la factura final)
 BillStatusCanceled=Abandonado
 BillStatusValidated=Validado (debe pagarse)
@@ -179,6 +182,7 @@ RemainderToTake=La cantidad restante a tomar
 RemainderToPayBack=Cantidad restante para reembolso
 AmountExpected=Cantidad reclamada
 ExcessReceived=Exceso recibido
+ExcessPaid=Exceso de pago
 EscompteOffered=Des. ofrecido: pago anticipado
 SendBillRef=Presentación de la factura %s
 SendReminderBillRef=Presentación de la factura %s (recordatorio)
@@ -234,6 +238,8 @@ Deposit=Pago inicial
 Deposits=Bajo pago
 DiscountFromCreditNote=Descuento de la nota de crédito %s
 DiscountFromDeposit=Anticipos desde la factura %s
+DiscountFromExcessReceived=Pagos en exceso de la factura %s
+DiscountFromExcessPaid=Pagos en exceso de la factura %s
 AbsoluteDiscountUse=Este tipo de crédito se puede utilizar en la factura antes de su validación
 CreditNoteDepositUse=La factura debe ser validada para usar este tipo de créditos
 NewGlobalDiscount=Nuevo descuento absoluto
@@ -241,6 +247,10 @@ NewRelativeDiscount=Nuevo descuento relativo
 NoteReason=Nota / Motivo
 ReasonDiscount=Razón
 DiscountOfferedBy=Concedido por
+DiscountStillRemaining=Descuentos o créditos disponibles
+DiscountAlreadyCounted=Descuentos o créditos ya consumidos
+CustomerDiscounts=Descuentos para clientes
+SupplierDiscounts=Descuentos de proveedores
 BillAddress=Dirección de la cuenta
 HelpEscompte=Este descuento es un descuento otorgado al cliente porque su pago se realizó antes del plazo.
 HelpAbandonBadCustomer=Esta cantidad se ha abandonado (el cliente dice que es un cliente malo) y se considera una pérdida excepcional.
@@ -276,10 +286,20 @@ PaymentOnDifferentThirdBills=Permitir pagos en facturas de terceros diferentes,
 PaymentNote=Nota de pago
 ListOfPreviousSituationInvoices=Lista de facturas de situación previas
 ListOfNextSituationInvoices=Lista de próximas facturas de situación
+ListOfSituationInvoices=Lista de facturas de situación
+CurrentSituationTotal=Situación actual total
+DisabledBecauseNotEnouthCreditNote=Para eliminar una factura de situación del ciclo, el total de la nota de crédito de esta factura debe cubrir el total de esta factura
+RemoveSituationFromCycle=Eliminar esta factura del ciclo
+ConfirmRemoveSituationFromCycle=¿Eliminar esta factura %s del ciclo?
+ConfirmOuting=Confirmar salida
 FrequencyUnit=Unidad de frecuencia
 toolTipFrequency=Ejemplos: <br> <b> Establecer 7, Día </ b>: dar una nueva factura cada 7 días <br> <b> Establecer 3, Mes </ b>: dar una nueva factura cada 3 meses
 NextDateToExecution=Fecha para la próxima generación de facturas
 DateLastGeneration=Fecha de última generación
+MaxPeriodNumber=Número máximo de generación de factura
+NbOfGenerationDone=Número de generación de factura ya realizada
+NbOfGenerationDoneShort=Número de generación realizada
+MaxGenerationReached=Número máximo de generaciones alcanzadas
 GeneratedFromRecurringInvoice=Generado a partir de la factura recurrente de la plantilla %s
 DateIsNotEnough=Fecha no alcanzada todavía
 InvoiceGeneratedFromTemplate=Factura %s generada a partir de la factura recurrente de la plantilla %s
@@ -397,9 +417,14 @@ InvoiceSituationDesc=Crear una nueva situación después de una ya existente
 SituationAmount=Cantidad de factura de situación (neto)
 SituationDeduction=Sustracción de la situación
 CreateNextSituationInvoice=Crear la próxima situación
+ErrorFindNextSituationInvoice=Error al no poder encontrar el siguiente ciclo de situación ref
+ErrorOutingSituationInvoiceOnUpdate=No se puede publicar esta factura de situación.
+ErrorOutingSituationInvoiceCreditNote=No se pudo emitir una nota de crédito vinculada.
 NotLastInCycle=Esta factura no es la última en el ciclo y no debe modificarse.
 DisabledBecauseNotLastInCycle=La siguiente situación ya existe.
 DisabledBecauseFinal=Esta situación es final.
+situationInvoiceShortcode_AS=COMO
+situationInvoiceShortcode_S=D
 CantBeLessThanMinPercent=El progreso no puede ser menor que su valor en la situación anterior.
 PDFCrevetteSituationNumber=Situación N ° %s
 PDFCrevetteSituationInvoiceLineDecompte=Factura de situación - COUNT
@@ -414,3 +439,7 @@ DeleteRepeatableInvoice=Eliminar factura de plantilla
 ConfirmDeleteRepeatableInvoice=¿Estás seguro de que deseas eliminar la factura de la plantilla?
 CreateOneBillByThird=Cree una factura por un tercero (de lo contrario, una factura por pedido)
 BillCreated=%s factura (s) creada (s)
+AutoFillDateFrom=Establecer fecha de inicio para la línea de servicio con fecha de factura
+AutoFillDateFromShort=Establecer fecha de inicio
+AutoFillDateToShort=Establecer fecha de finalización
+MaxNumberOfGenerationReached=Número máximo de gen. alcanzado
diff --git a/htdocs/langs/es_CL/commercial.lang b/htdocs/langs/es_CL/commercial.lang
index 20ee2378ddf..fd74feaecb6 100644
--- a/htdocs/langs/es_CL/commercial.lang
+++ b/htdocs/langs/es_CL/commercial.lang
@@ -44,7 +44,7 @@ ActionAC_CLO=Cerrar
 ActionAC_EMAILING=Enviar correo masivo
 ActionAC_COM=Enviar la orden del cliente por correo
 ActionAC_SHIP=Enviar el envío por correo
-ActionAC_SUP_ORD=Enviar el pedido del proveedor por correo
+ActionAC_SUP_ORD=Enviar pedido de compra por correo
 ActionAC_SUP_INV=Enviar la factura del proveedor por correo
 ActionAC_OTH=Otro
 ActionAC_OTH_AUTO=Eventos insertados automáticamente
diff --git a/htdocs/langs/es_CL/companies.lang b/htdocs/langs/es_CL/companies.lang
index 193bf35f5e4..81b3e831919 100644
--- a/htdocs/langs/es_CL/companies.lang
+++ b/htdocs/langs/es_CL/companies.lang
@@ -6,9 +6,11 @@ ConfirmDeleteCompany=¿Está seguro de que desea eliminar esta empresa y toda la
 DeleteContact=Eliminar un contacto/dirección
 ConfirmDeleteContact=¿Está seguro de que desea eliminar este contacto y toda la información heredada?
 MenuNewProspect=Nuevo prospecto
+MenuNewSupplier=Nuevo vendedor
 MenuNewPrivateIndividual=Nueva privada individual
-NewCompany=Nueva empresa (prospecto, cliente, proveedor)
+NewCompany=Nueva compañía (prospecto, cliente, vendedor)
 NewThirdParty=Nuevo tercero (prospecto, cliente, proveedor)
+CreateDolibarrThirdPartySupplier=Crear un tercero (vendedor)
 CreateThirdPartyOnly=Crear un tercero
 CreateThirdPartyAndContact=Crear un tercero + un contacto infantil
 ProspectionArea=Área de Prospección
@@ -27,6 +29,7 @@ ThirdPartyEmail=Correo electrónico de terceros
 ThirdPartyProspects=Perspectivas
 ThirdPartyProspectsStats=Perspectivas
 ThirdPartyCustomersWithIdProf12=Clientes con %s o %s
+ThirdPartySuppliers=Vendedores
 Individual=Individuo privado
 ToCreateContactWithSameName=Creará automáticamente un contacto / dirección con la misma información que un tercero bajo el tercero. En la mayoría de los casos, incluso si su tercero es una persona física, crear un tercero solo es suficiente.
 ParentCompany=Empresa matriz
@@ -47,7 +50,6 @@ Poste=Posición
 VATIsUsed=Impuesto a las ventas se utiliza
 VATIsNotUsed=Impuesto a las ventas no se utiliza
 CopyAddressFromSoc=Rellenar dirección con dirección de tercero
-ThirdpartyNotCustomerNotSupplierSoNoRef=Tercero, ni cliente ni proveedor, no hay objetos de referencia disponibles
 OverAllProposals=Cotizaciones
 OverAllSupplierProposals=Peticiones de precio
 LocalTax1IsUsed=Use el segundo impuesto
@@ -59,7 +61,7 @@ LocalTax2IsNotUsedES=IRPF no se usa
 TypeLocaltax1ES=Tipo de RE
 TypeLocaltax2ES=Tipo IRPF
 WrongCustomerCode=Código de cliente inválido
-WrongSupplierCode=Código de proveedor inválido
+WrongSupplierCode=Código de proveedor no válido
 CustomerCodeModel=Modelo de código de cliente
 SupplierCodeModel=Modelo de código de proveedor
 ProfId6=ID Profesional 6
@@ -87,16 +89,26 @@ ProfId1US=Id del profesor (FEIN)
 VATIntra=ID de impuesto a las ventas
 VATIntraShort=Identificación del impuesto
 VATIntraSyntaxIsValid=La sintaxis es valida
+VATReturn=Devolución del IVA
 ProspectCustomer=Prospecto/Cliente
 Prospect=Prospectar
 CustomerCard=Tarjeta Cliente
 CustomerRelativeDiscount=Descuento relativo del cliente
+SupplierRelativeDiscount=Descuento relativo del vendedor
 CustomerAbsoluteDiscountShort=Descuento absoluto
 CompanyHasNoRelativeDiscount=Este cliente no tiene descuento relativo por defecto
+HasRelativeDiscountFromSupplier=Tiene un descuento predeterminado de <b> %s%% </ b> de este proveedor
+HasNoRelativeDiscountFromSupplier=No tiene descuento relativo predeterminado de este proveedor
 CompanyHasAbsoluteDiscount=Este cliente tiene descuento disponible (notas de crédito o pagos anticipados) por <b>%s</b>%s
 CompanyHasDownPaymentOrCommercialDiscount=Este cliente tiene descuento disponible (pagos iniciales, comerciales) para <b>%s</b>%s
 CompanyHasCreditNote=Este cliente todavía tiene notas de crédito por <b>%s</b>%s
+HasNoAbsoluteDiscountFromSupplier=No tiene crédito de descuento disponible de este proveedor
+HasAbsoluteDiscountFromSupplier=Tiene descuentos disponibles (notas de créditos o anticipos) para <b> %s </ b> %s de este proveedor
+HasDownPaymentOrCommercialDiscountFromSupplier=Tiene descuentos disponibles (comerciales, anticipos) para <b> %s </ b> %s de este proveedor
+HasCreditNoteFromSupplier=Tiene notas de crédito para <b> %s </ b> %s de este proveedor
 CompanyHasNoAbsoluteDiscount=Este cliente no tiene crédito de descuento disponible
+CustomerAbsoluteDiscountAllUsers=Descuentos absolutos de clientes (concedidos por todos los usuarios)
+CustomerAbsoluteDiscountMy=Descuentos absolutos de clientes (otorgados por usted)
 AddContactAddress=Crear contacto / dirección
 EditContactAddress=Editar contacto / dirección
 ContactId=ID de contacto
@@ -111,7 +123,7 @@ SupplierCodeShort=Código de proveedor
 CustomerCodeDesc=Código de cliente, único para todos los clientes
 SupplierCodeDesc=Código de proveedor, único para todos los proveedores
 RequiredIfCustomer=Obligatorio si un tercero es un cliente o prospecto
-RequiredIfSupplier=Requerido si un tercero es un proveedor
+RequiredIfSupplier=Requerido si un tercero es un vendedor
 ValidityControledByModule=Validez controlada por módulo
 ThisIsModuleRules=Estas son las reglas para este módulo
 ProspectToContact=Perspectiva de contactar
@@ -133,7 +145,7 @@ NoContactForAnyProposal=Este contacto no es contacto de ninguna cotización
 NoContactForAnyContract=Este contacto no es un contacto para ningún contrato
 NoContactForAnyInvoice=Este contacto no es un contacto para ninguna factura
 EditCompany=Editar empresa
-ThisUserIsNot=Este usuario no es un prospecto, cliente ni proveedor
+ThisUserIsNot=Este usuario no es un cliente potencial, ni un proveedor
 VATIntraCheck=Cheque
 VATIntraCheckDesc=El enlace <b>%s</b> permite preguntar al servicio europeo de verificación de IVA. Se requiere un acceso externo a Internet desde el servidor para que este servicio funcione.
 VATIntraCheckableOnEUSite=Consultar el IVA intracomunitario en el sitio de la comisión europea
@@ -168,9 +180,10 @@ NoDolibarrAccess=Sin acceso a Dolibarr
 ExportDataset_company_1=Terceros (Empresas / fundaciones / personas físicas) y propiedades
 ExportDataset_company_2=Contactos y propiedades
 ImportDataset_company_1=Terceros (Empresas / fundaciones / personas físicas) y propiedades
+ImportDataset_company_2=Contactos / Direcciones (de terceros o no) y atributos
 ImportDataset_company_4=Terceros / representantes de ventas (asignar usuarios de representantes de ventas a las empresas)
 DeliveryAddress=Dirección de entrega
-SupplierCategory=Categoría del proveedor
+SupplierCategory=Categoría del vendedor
 DeleteFile=Borrar archivo
 ConfirmDeleteFile=¿Seguro que quieres eliminar este archivo?
 AllocateCommercial=Asignado al representante de ventas
@@ -190,12 +203,14 @@ CurrentOutstandingBill=Factura pendiente actual
 OutstandingBill=Max. por factura pendiente
 OutstandingBillReached=Max. por la factura pendiente alcanzado
 OrderMinAmount=Monto mínimo para la orden
-MonkeyNumRefModelDesc=Devuelva numero con formato %saaam-nnnn para código de cliente y %saaam-nnnn para código de proveedor donde yy es año, mm es mes y nnnn es una secuencia sin interrupción y sin retorno a 0.
+MonkeyNumRefModelDesc=Devuelva el número con el formato %syymm-nnnn para el código del cliente y %syymm-nnnn para el código del proveedor donde yy es año, mm es mes y nnnn es una secuencia sin interrupción y sin retorno a 0.
 LeopardNumRefModelDesc=El código es libre. Este código se puede modificar en cualquier momento.
 ManagingDirectors=Nombre del gerente (CEO, director, presidente ...)
 MergeOriginThirdparty=Tercero duplicado (tercero que desea eliminar)
 ConfirmMergeThirdparties=¿Estás seguro de que deseas fusionar a este tercero en el actual? Todos los objetos vinculados (facturas, pedidos, ...) se moverán al tercero actual, luego se eliminará el tercero.
+ThirdpartiesMergeSuccess=Los terceros se han fusionado
 SaleRepresentativeLogin=Inicio de sesión del representante de ventas
 SaleRepresentativeFirstname=Nombre del representante de ventas
 SaleRepresentativeLastname=Apellido del representante de ventas
+ErrorThirdpartiesMerge=Hubo un error al eliminar los terceros. Por favor revise el registro. Los cambios han sido revertidos.
 NewCustomerSupplierCodeProposed=Nuevo código de cliente o proveedor sugerido en código duplicado
diff --git a/htdocs/langs/es_CL/compta.lang b/htdocs/langs/es_CL/compta.lang
index d69f324cc36..44b785b13a0 100644
--- a/htdocs/langs/es_CL/compta.lang
+++ b/htdocs/langs/es_CL/compta.lang
@@ -26,9 +26,11 @@ Credit=Crédito
 Piece=Contabilidad Doc.
 AmountHTVATRealReceived=Neto recaudado
 AmountHTVATRealPaid=Neto pagado
+VATToPay=Venta de impuestos
 VATReceived=Impuesto recibido
 VATToCollect=IVA Crédito
-VATSummary=Balance de impuestos
+VATSummary=Impuesto mensual
+VATBalance=Balance de impuestos
 VATPaid=Impuesto pagado
 LT1Summary=Resumen de impuestos 2
 LT2Summary=Resumen de impuestos 3
@@ -68,7 +70,7 @@ PaymentSocialContribution=Pago de impuestos sociales/fiscales
 PaymentVat=Pago del IVA
 ListPayment=Lista de pagos
 ListOfCustomerPayments=Lista de pagos de clientes
-ListOfSupplierPayments=Lista de pagos al proveedor
+ListOfSupplierPayments=Lista de pagos de proveedores
 DateStartPeriod=Fecha de inicio
 DateEndPeriod=Fecha final
 newLT1Payment=Nuevo pago de impuestos 2
@@ -83,12 +85,13 @@ LT2PaymentES=Pago de IRPF
 VATPayment=Pago de impuestos a las ventas
 VATPayments=Pagos de impuestos de ventas
 VATRefund=Reembolso del impuesto a las ventas
+NewVATPayment=Nuevo pago del impuesto a las ventas
 Refund=Reembolso
 SocialContributionsPayments=Pagos de impuestos sociales/fiscales
 ShowVatPayment=Mostrar el pago del IVA
 BalanceVisibilityDependsOnSortAndFilters=El saldo es visible en esta lista solo si la tabla se ordena de forma ascendente en %s y se filtra para 1 cuenta bancaria
 CustomerAccountancyCode=Código de contabilidad del cliente
-SupplierAccountancyCode=Código de contabilidad del proveedor
+SupplierAccountancyCode=Código de contabilidad del vendedor
 CustomerAccountancyCodeShort=Cust. cuenta. código
 SupplierAccountancyCodeShort=Cenar. cuenta. código
 SalesTurnover=El volumen de ventas
@@ -132,17 +135,32 @@ RulesResultDue=- Incluye facturas pendientes, gastos, IVA, donaciones ya sean pa
 RulesResultInOut=- Incluye los pagos reales realizados en facturas, gastos, IVA y salarios. <br> - Se basa en las fechas de pago de las facturas, gastos, IVA y salarios. La fecha de donación para la donación.
 RulesCADue=- Incluye las facturas vencidas del cliente ya sean pagadas o no. <br> - Se basa en la fecha de validación de estas facturas. <br>
 RulesCAIn=- Incluye todos los pagos efectivos de las facturas recibidas de los clientes. <br> - Se basa en la fecha de pago de estas facturas <br>
+RulesCATotalSaleJournal=Incluye todas las líneas de crédito del diario Sale.
 RulesAmountOnInOutBookkeepingRecord=Incluye registro en su Libro mayor con cuentas de contabilidad que tiene el grupo "GASTOS" o "INGRESOS"
 RulesResultBookkeepingPredefined=Incluye registro en su Libro mayor con cuentas de contabilidad que tiene el grupo "GASTOS" o "INGRESOS"
 RulesResultBookkeepingPersonalized=Muestra un registro en su Libro mayor con cuentas de contabilidad <b> agrupadas por grupos personalizados </ b>
 SeePageForSetup=Ver el menú <a href="%s"> %s </a> para la configuración
+LT1ReportByCustomers=Informe el impuesto 2 por un tercero
+LT2ReportByCustomers=Informe el impuesto 3 por un tercero
+LT1ReportByCustomersES=Informe de un tercero RE
+LT2ReportByCustomersES=Informe de un tercero IRPF
+VATReport=Informe de impuesto a la venta
+VATReportByPeriods=Informe de impuestos de venta por período
+VATReportByRates=Informe de impuestos a la venta por tarifas
+VATReportByThirdParties=Informe de impuestos a la venta por parte de terceros
+VATReportByCustomers=Informe de impuestos de venta por cliente
 VATReportByCustomersInInputOutputMode=Informe del cliente IVA recaudado y pagado
+VATReportByQuartersInInputOutputMode=Informe por tasa de impuesto a la venta del impuesto recaudado y pagado
+LT1ReportByQuarters=Informe el impuesto 2 por tasa
+LT2ReportByQuarters=Informe el impuesto 3 por tasa
 LT1ReportByQuartersES=Informe por tasa RE
 LT2ReportByQuartersES=Informe por tasa de IRPF
 SeeVATReportInInputOutputMode=Ver informe<b>%sajuste de IVA%s</b>para un cálculo estándar
 SeeVATReportInDueDebtMode=Consulte el informe <b>%s IVA en flujo%s</b> para un cálculo con una opción en el flujo
 RulesVATInServices=- Para los servicios, el informe incluye las regulaciones del IVA realmente recibidas o emitidas sobre la base de la fecha de pago.
+RulesVATInProducts=- Para los activos materiales, el informe incluye el IVA recibido o emitido sobre la base de la fecha de pago.
 RulesVATDueServices=- Para los servicios, el informe incluye las facturas con IVA adeudadas, pagadas o no, en función de la fecha de la factura.
+RulesVATDueProducts=- Para los activos materiales, el informe incluye las facturas del IVA, en función de la fecha de la factura.
 OptionVatInfoModuleComptabilite=Nota: Para los activos materiales, debe usar la fecha de entrega para ser más justo.
 PercentOfInvoice=%% / factura
 NotUsedForGoods=No usado en productos
@@ -161,13 +179,15 @@ DatePaymentTermCantBeLowerThanObjectDate=La fecha del plazo de pago no puede ser
 Pcg_type=Tipo de Pcg
 Pcg_subtype=Subtipo Pcg
 InvoiceLinesToDispatch=Líneas de factura para enviar
+ByProductsAndServices=Por producto y servicio
 RefExt=Ref externo
 ToCreateAPredefinedInvoice=Para crear una plantilla de factura, cree una factura estándar, luego, sin validarla, haga clic en el botón "%s".
 LinkedOrder=Enlace a la orden
 CalculationRuleDesc=Para calcular el IVA total, hay dos métodos: <br>El método 1 es redondear el IVA en cada línea y luego sumarlas.<br> El método 2 es sumar todos los IVA en cada línea, luego redondear el resultado.<br>El resultado final puede diferir de algunos centavos. El modo predeterminado es el modo <b>%s</b>.
 CalculationRuleDescSupplier=De acuerdo con el proveedor, elija el método apropiado para aplicar la misma regla de cálculo y obtenga el mismo resultado esperado por su proveedor.
-TurnoverPerProductInCommitmentAccountingNotRelevant=El informe de facturación por producto, al utilizar el modo <b> contabilidad de efectivo </ b> no es relevante. Este informe solo está disponible cuando se utiliza el modo <b> contabilidad del compromiso </ b> (ver configuración del módulo de contabilidad).
 AccountancyJournal=Revista de códigos contables
+ACCOUNTING_VAT_SOLD_ACCOUNT=Cuenta de contabilidad de forma predeterminada para el IVA sobre las ventas (se usa si no está definido en la configuración del diccionario de IVA)
+ACCOUNTING_VAT_BUY_ACCOUNT=Cuenta de contabilidad de forma predeterminada para el IVA en compras (se usa si no está definido en la configuración del diccionario de IVA)
 ACCOUNTING_VAT_PAY_ACCOUNT=Cuenta de contabilidad por defecto para pagar el IVA
 ACCOUNTING_ACCOUNT_CUSTOMER=Cuenta de contabilidad utilizada para terceros clientes
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=La cuenta de contabilidad dedicada definida en la tarjeta de un tercero se utilizará solo para los contadores de Subledger. Este se usará para el Libro mayor y como valor predeterminado de la contabilidad del Libro mayor auxiliar si no se define una cuenta de cliente dedicada dedicada a terceros.
@@ -186,3 +206,11 @@ ImportDataset_tax_vat=Pagos de IVA
 ErrorBankAccountNotFound=Error: cuenta bancaria no encontrada
 FiscalPeriod=Período contable
 ListSocialContributionAssociatedProject=Lista de contribuciones sociales asociadas con el proyecto
+AccountingAffectation=Asignación de contabilidad
+LastDayTaxIsRelatedTo=Último día del período el impuesto está relacionado con
+VATDue=Impuesto de venta reclamado
+ClaimedForThisPeriod=Reclamado para el período
+PaidDuringThisPeriod=Pagado durante este período
+ByVatRate=Por tasa de impuesto a la venta
+TurnoverbyVatrate=Facturación por tasa de impuesto a la venta
+PurchasebyVatrate=Compra por tasa de impuestos de venta
diff --git a/htdocs/langs/es_CL/ecm.lang b/htdocs/langs/es_CL/ecm.lang
index 455403b320a..6bff606eb69 100644
--- a/htdocs/langs/es_CL/ecm.lang
+++ b/htdocs/langs/es_CL/ecm.lang
@@ -4,8 +4,8 @@ ECMAddSection=Agregar directorio
 ECMCreationDate=Fecha de creación
 ECMNbOfSubDir=Cantidad de subdirectorios
 ECMNbOfFilesInSubDir=Número de archivos en subdirectorios
-ECMArea=Área EDM
-ECMAreaDesc=El área EDM (Gestión electrónica de documentos) le permite guardar, compartir y buscar rápidamente todo tipo de documentos en Dolibarr.
+ECMArea=Área de DMS / ECM
+ECMAreaDesc=El área DMS / ECM (Sistema de gestión de documentos / gestión de contenido electrónico) le permite guardar, compartir y buscar rápidamente todo tipo de documentos en Dolibarr.
 ECMAreaDesc2=* Los directorios automáticos se rellenan automáticamente al agregar documentos desde la tarjeta de un elemento. <br> * Los directorios manuales se pueden usar para guardar documentos no vinculados a un elemento en particular.
 ECMSectionWasRemoved=El directorio <b>%s</b> ha sido borrado.
 ECMSectionWasCreated=El directorio <b>%s</b> ha sido creado.
@@ -23,9 +23,10 @@ ECMDocsByExpenseReports=Documentos vinculados a informes de gastos
 ECMNoDirectoryYet=Sin directorio creado
 DeleteSection=Eliminar directorio
 ConfirmDeleteSection=¿Puedes confirmar que quieres borrar el directorio <b>%s</b>?
-CannotRemoveDirectoryContainsFiles=Eliminado no es posible porque contiene algunos archivos
+CannotRemoveDirectoryContainsFilesOrDirs=La eliminación no es posible porque contiene algunos archivos o subdirectorios
+CannotRemoveDirectoryContainsFiles=La eliminación no es posible porque contiene algunos archivos
 ECMFileManager=Administrador de archivos
-ECMSelectASection=Seleccione un directorio en el árbol de la izquierda ...
+ECMSelectASection=Seleccione un directorio en el árbol ...
 DirNotSynchronizedSyncFirst=Este directorio parece ser creado o modificado fuera del módulo ECM. Primero debe hacer clic en el botón "Resincronizar" para sincronizar el disco y la base de datos para obtener el contenido de este directorio.
 HashOfFileContent=Hash del contenido del archivo
 FileNotYetIndexedInDatabase=Archivo aún no indexado en la base de datos (intente volver a subirlo)
diff --git a/htdocs/langs/es_CL/install.lang b/htdocs/langs/es_CL/install.lang
index e5d97d9ae47..46ddfab26fe 100644
--- a/htdocs/langs/es_CL/install.lang
+++ b/htdocs/langs/es_CL/install.lang
@@ -73,8 +73,8 @@ AdminLoginAlreadyExists=La cuenta de administrador de Dolibarr '<b>%s</b>' ya ex
 FailedToCreateAdminLogin=Error al crear la cuenta de administrador de Dolibarr.
 WarningRemoveInstallDir=Advertencia, por razones de seguridad, una vez completada la instalación o actualización, para evitar el uso de herramientas de instalación nuevamente, debe agregar un archivo llamado <b> install.lock </ b> en el directorio de documentos de Dolibarr, para evitar el uso malicioso de este. .
 ChoosedMigrateScript=Elija script de migración
-DataMigration=Migración de datos
-DatabaseMigration=Estructura de la migración de bases
+DataMigration=Migración de base de datos (datos)
+DatabaseMigration=Migración de la base de datos (estructura + algunos datos)
 ProcessMigrateScript=Procesamiento de script
 ChooseYourSetupMode=Elija su modo de configuración y haga clic en "Comenzar" ...
 FreshInstall=Instalación nueva
@@ -170,4 +170,6 @@ MigrationCategorieAssociation=Migración de categorías
 MigrationEvents=Migración de eventos para agregar el propietario del evento a la tabla de asignación
 MigrationRemiseEntity=Actualizar el valor del campo de entidad de llx_societe_remise
 MigrationRemiseExceptEntity=Actualizar el valor del campo de entidad de llx_societe_remise_except
+MigrationUserRightsEntity=Actualizar el valor del campo de entidad de llx_user_rights
+MigrationUserGroupRightsEntity=Actualizar el valor del campo de entidad de llx_usergroup_rights
 ErrorFoundDuringMigration=Se informó un error durante el proceso de migración, por lo que el siguiente paso no está disponible. Para ignorar los errores, puede <a href="%s"> hacer clic aquí </a>, pero la aplicación o algunas características pueden no funcionar correctamente hasta que se solucionen.
diff --git a/htdocs/langs/es_CL/main.lang b/htdocs/langs/es_CL/main.lang
index 8875f25d01f..4b775adefd1 100644
--- a/htdocs/langs/es_CL/main.lang
+++ b/htdocs/langs/es_CL/main.lang
@@ -49,11 +49,13 @@ ErrorNoVATRateDefinedForSellerCountry=Error, sin tasas de IVA definidas para el
 ErrorNoSocialContributionForSellerCountry=Error, ningún tipo de impuestos sociales/fiscales definidos para el país '%s'.
 ErrorFailedToSaveFile=Error, no se pudo guardar el archivo.
 ErrorCannotAddThisParentWarehouse=Está intentando agregar un almacén principal que ya es hijo de uno actual
+MaxNbOfRecordPerPage=Número máximo de registro por página
 NotAuthorized=Usted no está autorizado a hacer eso.
 SetDate=Establece la fecha
 SeeAlso=Véase también %s
 SeeHere=Mira aquí
 ClickHere=haga clic aquí
+Here=aquí
 BackgroundColorByDefault=Color de fondo predeterminado
 FileRenamed=El archivo fue renombrado con éxito
 FileGenerated=El archivo fue generado con éxito
@@ -121,6 +123,7 @@ Valid=Válido
 ToLink=Enlazar
 Choose=Escoger
 Resize=Cambiar el tamaño
+ResizeOrCrop=Cambiar el tamaño o el cultivo
 NoUserGroupDefined=Ningún grupo de usuarios definido
 PasswordRetype=Reescribe tu contraseña
 NoteSomeFeaturesAreDisabled=Tenga en cuenta que muchas características / módulos están deshabilitados en esta demostración.
@@ -134,6 +137,7 @@ NumberByMonth=Cantidad Mensual
 AmountByMonth=Monto por mes
 Logout=Cerrar sesión
 NoLogoutProcessWithAuthMode=Sin función de desconexión aplicativa con modo de autenticación <b>%s</b>
+Connection=Iniciar sesión
 Setup=Configurar
 Cards=Tarjetas
 DateToday=El día de hoy
@@ -166,6 +170,7 @@ Copy=Dupdo
 Default=Defecto
 DefaultValues=Valores predeterminados
 UnitPriceHT=Precio unitario (neto)
+UnitPriceHTCurrency=Precio unitario (neto) (moneda)
 UnitPriceTTC=Precio unitario
 PriceU=ARRIBA.
 PriceUHT=P.U. (net)
@@ -192,6 +197,7 @@ AmountLT1ES=Cantidad RE
 AmountTotal=Cantidad total
 AmountAverage=Cantidad promedio
 PriceQtyMinHT=Cantidad de precio min. (impuesto neto)
+PriceQtyMinHTCurrency=Cantidad de precio min. (neto de impuestos) (moneda)
 SubTotal=Total parcial
 TotalHTShort=Total (neto)
 TotalHTShortCurrency=Total (neto en moneda)
@@ -220,10 +226,12 @@ VATCode=Código de tasa impositiva
 VATNPR=Tasa de impuesto NPR
 DefaultTaxRate=Tasa de impuesto predeterminada
 Average=Promedio
+RemainToPay=Seguir pagando
 Module=Módulo / Aplicación
 Modules=Módulos / Aplicaciones
 FullList=Lista llena
 ExternalRef=Ref. externo
+RefSupplier=Árbitro. vendedor
 CommercialProposalsShort=Cotizaciones
 ActionsToDo=Eventos para hacer
 ActionsToDoShort=Que hacer
@@ -231,12 +239,14 @@ ActionsDoneShort=Hecho
 ActionNotApplicable=No aplica
 ActionRunningNotStarted=Para comenzar
 CompanyFoundation=Empresa / Organización
+Accountant=Contador
 ContactsForCompany=Contactos para este tercero
 ContactsAddressesForCompany=Contactos/direcciones para este tercero
 AddressesForCompany=Direcciones para este tercero
 ActionsOnCompany=Eventos sobre este tercero
 ActionsOnMember=Eventos sobre este miembro
 NActionsLate=%s tarde
+Completed=Terminado
 RequestAlreadyDone=Solicitud ya grabada
 Filter=Filtrar
 FilterOnInto=Criterio de búsqueda '<strong>%s</strong>' en los campos %s
@@ -257,7 +267,7 @@ Opened=Abierto
 Size=tamaño
 Topic=Tema
 ByCompanies=Por terceros
-ByUsers=Por los usuarios
+ByUsers=Por usuario
 Link=Enlazar
 Rejects=Rechaza
 Preview=Previsualizar
@@ -308,7 +318,7 @@ Entity=Ambiente
 CustomerPreview=Vista previa del cliente
 SupplierPreview=Vista previa del proveedor
 ShowCustomerPreview=Mostrar vista previa del cliente
-ShowSupplierPreview=Mostrar vista previa del proveedor
+ShowSupplierPreview=Mostrar vista previa del vendedor
 Currency=Moneda
 InfoAdmin=Información para administradores
 Undo=Deshacer
@@ -450,6 +460,7 @@ ConfirmSetToDraft=¿Estás seguro de que quieres volver al estado de Borrador?
 ImportId=Importar identificación
 EMailTemplates=Plantillas de correos electrónicos
 FileNotShared=Archivo no compartido para el público externo
+LineNb=Line no
 Monday=lunes
 Tuesday=martes
 Thursday=jueves
@@ -475,12 +486,16 @@ Select2MoreCharactersMore=<strong> Sintaxis de búsqueda: </strong><br><kbd><str
 Select2LoadingMoreResults=Cargando más resultados ...
 Select2SearchInProgress=Búsqueda en progreso ...
 SearchIntoCustomerInvoices=Facturas de cliente
-SearchIntoSupplierOrders=Pedidos a proveedores
+SearchIntoSupplierInvoices=Facturas del vendedor
+SearchIntoSupplierOrders=Ordenes de compra
 SearchIntoCustomerProposals=Propuestas de clientes
-SearchIntoSupplierProposals=Propuestas de proveedores
+SearchIntoSupplierProposals=Propuestas del vendedor
 SearchIntoCustomerShipments=Envíos de clientes
 SearchIntoExpenseReports=Reporte de gastos
 SearchIntoLeaves=Vacaciones
 NbComments=Numero de comentarios
 CommentAdded=Comentario agregado
 Everybody=Todos
+AssignedTo=Asignado a
+Deletedraft=Eliminar borrador
+ConfirmMassDraftDeletion=Borrador de confirmación de eliminación masiva
diff --git a/htdocs/langs/es_CL/members.lang b/htdocs/langs/es_CL/members.lang
index 4e4ad9b61b2..e9de73ff99f 100644
--- a/htdocs/langs/es_CL/members.lang
+++ b/htdocs/langs/es_CL/members.lang
@@ -77,9 +77,25 @@ PublicMemberCard=Tarjeta pública de miembro
 SubscriptionNotRecorded=Suscripción no grabada
 AddSubscription=Crear suscripción
 ShowSubscription=Mostrar suscripción
+SendingAnEMailToMember=Envío de información de correo electrónico al miembro
+SendingEmailOnAutoSubscription=Envío de correo electrónico en el registro automático
+SendingEmailOnMemberValidation=Enviando un correo electrónico sobre la validación de un nuevo miembro
+SendingEmailOnNewSubscription=Envío de correo electrónico con nueva suscripción
+SendingEmailOnCancelation=Enviando un correo electrónico sobre la cancelación
+YourMembershipWasValidated=Su membresía fue validada
+YourSubscriptionWasRecorded=Su nueva suscripción fue grabada
+YourMembershipWasCanceled=Su membresía fue cancelada
 CardContent=Contenido de su tarjeta de miembro
+ThisIsContentOfYourMembershipRequestWasReceived=Queremos informarle que se recibió su solicitud de membresía. <br> <br>
+ThisIsContentOfSubscriptionReminderEmail=Queremos informarle que su suscripción está a punto de caducar. Esperamos que pueda renovarlo. <br> <br>
+ThisIsContentOfYourCard=Esto es un recordatorio de la información que obtenemos sobre usted. No dude en contactarnos si algo parece estar mal. <br> <br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Asunto del correo electrónico recibido en caso de inscripción automática de un invitado
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail recibido en caso de auto inscripción de un invitado
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Plantilla Correo electrónico para usar para enviar correos electrónicos a un miembro sobre la suscripción automática de miembros
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Plantilla de correo electrónico para usar para enviar correos electrónicos a un miembro sobre la validación de miembro
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Plantilla de correo electrónico para usar para enviar correos electrónicos a un miembro en una nueva grabación de suscripción
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Plantilla de correo electrónico para utilizar para enviar un recordatorio por correo electrónico cuando la suscripción está a punto de caducar
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Plantilla Correo electrónico a utilizar para enviar un correo electrónico a un miembro sobre la cancelación del miembro
 DescADHERENT_MAIL_FROM=Remitente Correo electrónico para correos electrónicos automáticos
 DescADHERENT_ETIQUETTE_TYPE=Formato de la página de etiquetas
 DescADHERENT_ETIQUETTE_TEXT=Texto impreso en las hojas de direcciones de los miembros
@@ -130,3 +146,8 @@ VATToUseForSubscriptions=Tipo de IVA para suscripciones
 NoVatOnSubscription=Sin TVA para suscripciones
 MEMBER_PAYONLINE_SENDEMAIL=Correo electrónico a utilizar para recibir una advertencia por correo electrónico cuando Dolibarr reciba una confirmación de un pago validado para una suscripción (Ejemplo: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Producto utilizado para la línea de suscripción en la factura: %s
+SubscriptionRecorded=Suscripción grabada
+NoEmailSentToMember=No se envió ningún correo electrónico al miembro
+EmailSentToMember=Correo electrónico enviado al miembro al %s
+SendReminderForExpiredSubscriptionTitle=Enviar recordatorio por correo electrónico para la suscripción caducada
+SendReminderForExpiredSubscription=Enviar recordatorio por correo electrónico a los miembros cuando la suscripción esté a punto de caducar (parámetro es el número de días antes del final de la suscripción para enviar el recordatorio)
diff --git a/htdocs/langs/es_CL/orders.lang b/htdocs/langs/es_CL/orders.lang
index b224a65c271..a151781cc48 100644
--- a/htdocs/langs/es_CL/orders.lang
+++ b/htdocs/langs/es_CL/orders.lang
@@ -1,9 +1,10 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Área de pedidos de clientes
-SuppliersOrdersArea=Área de pedidos a proveedores
+SuppliersOrdersArea=Área de pedidos de compras
 OrderCard=Tarjeta de pedido
 OrderId=Solicitar ID
 Order=Orden
+PdfOrderTitle=Orden
 OrderLine=Fila para ordenar
 OrderDate=Fecha de orden
 OrderDateShort=Fecha de orden
@@ -11,15 +12,15 @@ OrderToProcess=Orden para procesar
 NewOrder=Nueva orden
 ToOrder=Hacer orden
 MakeOrder=Hacer orden
-SupplierOrder=Orden al proveedor
-SuppliersOrders=Pedidos a proveedores
-SuppliersOrdersRunning=Pedidos a proveedores actuales
+SupplierOrder=Orden de compra
+SuppliersOrders=Ordenes de compra
+SuppliersOrdersRunning=Pedidos de compra actuales
 CustomerOrder=Pedido del cliente
 CustomersOrdersRunning=Pedidos de clientes actuales
 OrdersDeliveredToBill=Pedidos de clientes entregados a la cuenta
 OrdersToBill=Pedidos de clientes entregados
 OrdersToProcess=Pedidos de clientes para procesar
-SuppliersOrdersToProcess=Pedidos a proveedores para procesar
+SuppliersOrdersToProcess=Órdenes de compra para procesar
 StatusOrderCanceledShort=Cancelado
 StatusOrderSentShort=En proceso
 StatusOrderSent=Envío en proceso
@@ -55,15 +56,15 @@ AddToDraftOrders=Añadir a orden de borrador
 OrdersOpened=Órdenes para procesar
 NoDraftOrders=No hay borradores de pedidos
 NoOrder=Sin orden
-NoSupplierOrder=Sin orden de proveedor
+NoSupplierOrder=Sin orden de compra
 LastOrders=Últimas %s pedidos de clientes
 LastCustomerOrders=Últimas %s pedidos de clientes
-LastSupplierOrders=%s últimos pedidos a proveedores
+LastSupplierOrders=Últimas %s órdenes de compra
 LastModifiedOrders=Últimas %s órdenes modificadas
 AllOrders=Todas las órdenes
 NbOfOrders=Numero de ordenes
 OrdersStatistics=Estadísticas de la orden
-OrdersStatisticsSuppliers=Estadísticas de la orden del proveedor
+OrdersStatisticsSuppliers=Estadísticas de orden de compra
 AmountOfOrdersByMonthHT=Cantidad de pedidos por mes (neto de impuestos)
 ListOfOrders=Lista de ordenes
 CloseOrder=Cerrar orden
@@ -76,12 +77,12 @@ ConfirmMakeOrder=¿Estas seguro que deseas confirmar esta orden realizada <b>%s<
 GenerateBill=Generar factura
 ClassifyShipped=Clasificar entregado
 DraftOrders=Borradores de pedidos
-DraftSuppliersOrders=Borrador de pedidos a proveedores
+DraftSuppliersOrders=Borrador de órdenes de compra
 OnProcessOrders=En órdenes de proceso
 RefOrder=Ref. orden
 RefCustomerOrder=Ref. orden para el cliente
-RefOrderSupplier=Ref. orden para el proveedor
-RefOrderSupplierShort=Ref. proveedor de la orden
+RefOrderSupplier=Árbitro. orden para el vendedor
+RefOrderSupplierShort=Árbitro. ordene vendedor
 SendOrderByMail=Enviar pedido por correo
 ActionsOnOrder=Eventos por encargo
 NoArticleOfTypeProduct=Ningún artículo del tipo 'producto' por lo que no se puede enviar un artículo para este pedido
@@ -93,18 +94,18 @@ ConfirmCloneOrder=¿Estas seguro que deseas clonar esta orden <b>%s</b>?
 DispatchSupplierOrder=Recibiendo el pedido del proveedor %s
 FirstApprovalAlreadyDone=Primera aprobación ya hecha
 SecondApprovalAlreadyDone=Segunda aprobación ya hecha
-SupplierOrderReceivedInDolibarr=Pedido del proveedor %s recibido %s
-SupplierOrderSubmitedInDolibarr=Pedido del proveedor %s enviado
-SupplierOrderClassifiedBilled=Pedido del proveedor %s conjunto facturado
+SupplierOrderReceivedInDolibarr=La orden de compra %s recibió %s
+SupplierOrderSubmitedInDolibarr=Orden de compra %s enviada
+SupplierOrderClassifiedBilled=Pedido de compra %s establecido facturado
 OtherOrders=Otras órdenes
 TypeContact_commande_internal_SALESREPFOLL=Orden representativa del cliente de seguimiento
 TypeContact_commande_internal_SHIPPING=Representante de seguimiento de envío
 TypeContact_commande_external_BILLING=Contacto cliente de facturación cotización
 TypeContact_commande_external_SHIPPING=Contacto de envío del cliente
 TypeContact_commande_external_CUSTOMER=Orden de seguimiento de contacto con el cliente
-TypeContact_order_supplier_internal_SALESREPFOLL=Orden de proveedor de seguimiento representativo
+TypeContact_order_supplier_internal_SALESREPFOLL=Orden de compra de seguimiento representativa
 TypeContact_order_supplier_internal_SHIPPING=Representante de seguimiento de envío
-TypeContact_order_supplier_external_BILLING=Contacto de factura del proveedor
+TypeContact_order_supplier_external_BILLING=Contacto factura del vendedor
 TypeContact_order_supplier_external_SHIPPING=Contacto de envío del proveedor
 TypeContact_order_supplier_external_CUSTOMER=Orden de seguimiento de contacto del proveedor
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constante COMMANDE_SUPPLIER_ADDON no definido
diff --git a/htdocs/langs/es_CL/other.lang b/htdocs/langs/es_CL/other.lang
index e4aed8f8337..037ee306980 100644
--- a/htdocs/langs/es_CL/other.lang
+++ b/htdocs/langs/es_CL/other.lang
@@ -66,7 +66,6 @@ PredefinedMailTest=__(Hola)__\nEste es un correo de prueba enviado a __EMAIL__.\
 PredefinedMailTestHtml=__(Hola)__\nEste es un correo de <b> prueba </b> (la palabra prueba debe estar en negrita). <br> Las dos líneas están separadas por un retorno de carro. <br> <br> __USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hola)__\n\nAquí encontrará la factura __REF__\n\nEste es el enlace para realizar su pago en línea si esta factura no se ha pagado aún:\n__ONLINE_PAYMENT_URL__\n\n__(Sinceramente)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hola)__\n\nNos gustaría advertirle que la factura __REF__ parece no ser pagada. Así que esta es la factura en el archivo adjunto de nuevo, como un recordatorio.\n\nEste es el enlace para realizar su pago en línea:\n__ONLINE_PAYMENT_URL__\n\n__(Sinceramente)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hola)__\n\nAquí encontrará la propuesta comercial __PREF__\n\n\n__(Sinceramente)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hola)__\n\nAquí encontrará la solicitud de precio __REF__\n\n\n__(Sinceramente)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hola)__\n\nAquí encontrará el orden __REF__\n\n\n__(Sinceramente)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hola)__\n\nAquí encontrará nuestro pedido __REF__\n\n\n__(Sinceramente)__\n\n__USER_SIGNATURE__
@@ -148,7 +147,7 @@ CancelUpload=Cancelar carga
 FileIsTooBig=Los archivos son demasiado grandes
 PleaseBePatient=Por favor sea paciente...
 ResetPassword=Restablecer la contraseña
-RequestToResetPasswordReceived=Se ha recibido una solicitud para cambiar su contraseña de Dolibarr
+RequestToResetPasswordReceived=Se ha recibido una solicitud para cambiar su contraseña
 NewKeyIs=Estas son sus nuevas claves para iniciar sesión
 NewKeyWillBe=Su nueva clave para iniciar sesión en el software será
 ClickHereToGoTo=Haga clic aquí para ir a %s
@@ -159,8 +158,10 @@ SourcesRepository=Repositorio de fuentes
 PassEncoding=Codificación de contraseña
 PermissionsAdd=Permisos agregados
 YourPasswordMustHaveAtLeastXChars=Su contraseña debe tener al menos <strong>%s</strong> caracteres
+SMSSentTo=SMS enviado a %s
 LibraryUsed=Biblioteca utilizada
 LibraryVersion=Versión de biblioteca
 NoExportableData=No se pueden exportar datos (no hay módulos con datos exportables cargados o sin permisos)
 WebsiteSetup=Configuración del sitio web del módulo
 WEBSITE_KEYWORDS=Palabras clave
+LinesToImport=Líneas para importar
diff --git a/htdocs/langs/es_CL/products.lang b/htdocs/langs/es_CL/products.lang
index a81f376141c..70b843f033c 100644
--- a/htdocs/langs/es_CL/products.lang
+++ b/htdocs/langs/es_CL/products.lang
@@ -43,6 +43,7 @@ CostPriceUsage=Este valor podría usarse para calcular el margen.
 SoldAmount=Cantidad vendida
 PurchasedAmount=Cantidad comprada
 MinPrice=Precio de venta mínimo
+EditSellingPriceLabel=Editar etiqueta de precio de venta
 CantBeLessThanMinPrice=El precio de venta no puede ser inferior al mínimo permitido para este producto (%s sin IVA). Este mensaje también puede aparecer si escribe un descuento demasiado importante.
 ErrorProductAlreadyExists=Un producto con referencia %s ya existe.
 ErrorProductBadRefOrLabel=Valor incorrecto para referencia o etiqueta.
@@ -79,6 +80,7 @@ ProductDeleted=Producto / Servicio "%s" borrado de la base de datos.
 ExportDataset_produit_1=Productos
 ConfirmDeleteProductLine=¿Estás seguro de que deseas eliminar esta línea de productos?
 PriceQtyMin=Precio para este min. cantidad (sin descuento)
+PriceQtyMinCurrency=Precio para este min. cantidad (sin descuento) (moneda)
 VATRateForSupplierProduct=Tasa de IVA (para este proveedor / producto)
 DiscountQtyMin=Descuento predeterminado para esta cantidad
 NoPriceDefinedForThisSupplier=Sin precio/cantidad definida para este proveedor/producto
diff --git a/htdocs/langs/es_CL/projects.lang b/htdocs/langs/es_CL/projects.lang
index da175642b74..8210d3ff1e0 100644
--- a/htdocs/langs/es_CL/projects.lang
+++ b/htdocs/langs/es_CL/projects.lang
@@ -50,6 +50,7 @@ Time=Hora
 ListOfTasks=Lista de tareas
 GoToListOfTimeConsumed=Ir a la lista de tiempo consumido
 GoToListOfTasks=Ir a la lista de tareas
+GoToGanttView=Ve a la vista de Gantt
 ListProposalsAssociatedProject=Listado de cotizaciones asociadas al proyecto
 ListOrdersAssociatedProject=Lista de pedidos de clientes asociados con el proyecto
 ListInvoicesAssociatedProject=Lista de facturas de clientes asociadas con el proyecto
@@ -157,3 +158,5 @@ LatestProjects=Últimos %s proyectos
 LatestModifiedProjects=Últimos proyectos modificados %s
 NoAssignedTasks=Sin tareas asignadas (asigne proyectos / tareas al usuario actual desde el cuadro de selección superior para ingresar la hora en él)
 AllowCommentOnProject=Permitir comentarios de los usuarios sobre los proyectos
+RecordsClosed=%s proyecto (s) cerrado
+SendProjectRef=Proyecto de información %s
diff --git a/htdocs/langs/es_CL/stocks.lang b/htdocs/langs/es_CL/stocks.lang
index 06fd99b7411..788475ace5b 100644
--- a/htdocs/langs/es_CL/stocks.lang
+++ b/htdocs/langs/es_CL/stocks.lang
@@ -6,6 +6,7 @@ WarehouseEdit=Modificar el almacén
 WarehouseSource=Almacén de origen
 WarehouseSourceNotDefined=Sin almacén definido
 AddOne=Agrega uno
+DefaultWarehouse=Almacén predeterminado
 WarehouseTarget=Almacén de destino
 ValidateSending=Eliminar envío
 CancelSending=Cancelar el envío
@@ -13,6 +14,7 @@ StocksByLotSerial=Stock por lote/serie
 ErrorWarehouseRefRequired=Se requiere el nombre de referencia del almacén
 ListOfWarehouses=Lista de almacenes
 ListOfStockMovements=Lista de movimientos de stock
+ListOfInventories=Lista de inventarios
 MovementId=Identificación del movimiento
 StockMovementForId=ID de movimiento %d
 ListMouvementStockProject=Lista de movimientos de stock asociados al proyecto
@@ -148,3 +150,4 @@ inventoryDeleteLine=Eliminar línea
 RegulateStock=Regular el stock
 StockSupportServices=Servicios de soporte de gestión de stock
 StockSupportServicesDesc=Por defecto, puede almacenar solo productos con el tipo "producto". Si está activado, y si el servicio de módulo está activado, también puede almacenar un producto con el tipo "servicio"
+ReceiveProducts=Recibir productos
diff --git a/htdocs/langs/es_CL/supplier_proposal.lang b/htdocs/langs/es_CL/supplier_proposal.lang
index 874498b1b18..0565ecac402 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 de proveedores
+SupplierProposal=Propuestas comerciales del vendedor
 supplier_proposalDESC=Administrar las solicitudes de precios a los proveedores
 SupplierProposalNew=Nueva solicitud de precio
 CommRequest=Precio requerido
@@ -9,23 +9,21 @@ DraftRequests=Borrador de solicitudes
 SupplierProposalsDraft=Borrador de propuestas de proveedores
 LastModifiedRequests=Últimas %s solicitudes de precios modificados
 RequestsOpened=Solicitudes de precio abierto
-SupplierProposalArea=Área de propuestas del proveedor
-SupplierProposalShort=Propuesta del proveedor
-SupplierProposals=Propuestas de proveedores
-SupplierProposalsShort=Propuestas de proveedores
+SupplierProposalArea=Área de propuestas de proveedores
+SupplierProposalShort=Propuesta del vendedor
+SupplierProposals=Propuestas del vendedor
+SupplierProposalsShort=Propuestas del vendedor
 NewAskPrice=Nueva solicitud de precio
 ShowSupplierProposal=Mostrar solicitud de precio
-AddSupplierProposal=Crear una solicitud de precio
-SupplierProposalRefFourn=Ref. Del proveedor
+AddSupplierProposal=Crear cotización
+SupplierProposalRefFourn=Vendedor de referencia
 SupplierProposalRefFournNotice=Antes de cerrar a "Aceptado", piense en captar las referencias de los proveedores.
 ConfirmValidateAsk=¿Está seguro de que desea validar esta solicitud de precio con el nombre <b>%s</b>?
 DeleteAsk=Borrar petición
 ValidateAsk=Validar solicitud
 SupplierProposalStatusDraft=Borrador (debe ser validado)
 SupplierProposalStatusValidated=Validado (la solicitud está abierta)
-SupplierProposalStatusNotSigned=Rehusó
-SupplierProposalStatusNotSignedShort=Rehusó
-CopyAskFrom=Crear solicitud de precio copiando una solicitud existente
+CopyAskFrom=Crear cotización copiando una existente
 CreateEmptyAsk=Crear solicitud en blanco
 CloneAsk=Solicitud de precio de clonación
 ConfirmCloneAsk=¿Seguro que quieres clonar la solicitud de precio <b>%s</b>?
@@ -42,7 +40,7 @@ DefaultModelSupplierProposalToBill=Plantilla predeterminada al cerrar una solici
 DefaultModelSupplierProposalClosed=Plantilla predeterminada al cerrar una solicitud de precio (rechazada)
 ListOfSupplierProposals=Lista de solicitudes de propuestas de proveedores
 ListSupplierProposalsAssociatedProject=Lista de propuestas de proveedores asociadas con el proyecto
-SupplierProposalsToClose=Propuestas de proveedores para cerrar
-SupplierProposalsToProcess=Propuestas de proveedores para procesar
+SupplierProposalsToClose=Propuestas del proveedor para cerrar
+SupplierProposalsToProcess=Propuestas del proveedor para procesar
 LastSupplierProposals=Últimas %s solicitudes de precios
 AllPriceRequests=Todas las solicitudes
diff --git a/htdocs/langs/es_CL/workflow.lang b/htdocs/langs/es_CL/workflow.lang
index cd9e6580ee7..9946bbcb13d 100644
--- a/htdocs/langs/es_CL/workflow.lang
+++ b/htdocs/langs/es_CL/workflow.lang
@@ -11,5 +11,5 @@ descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Clasifique la (s) propuesta (s) fuen
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Clasifique los pedidos de origen del cliente vinculados para facturar cuando se valida la factura del cliente (y si el importe de la factura es igual al importe total de los pedidos vinculados)
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Clasifique los pedidos de origen del cliente vinculados para facturar cuando la factura del cliente se establece como pagada (y si el importe de la factura es igual al importe total de los pedidos vinculados)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Clasifique la orden del cliente de origen vinculado para enviar cuando se valida un envío (y si la cantidad enviada por todos los envíos es la misma que en el orden de actualización)
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Clasifique la (s) propuesta (s) de proveedor de origen vinculadas para facturar cuando se valida la factura del proveedor (y si el importe de la factura es igual al importe total de las propuestas vinculadas)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Clasifique las órdenes de proveedor de origen vinculadas para facturar cuando se valida la factura del proveedor (y si el importe de la factura es igual al importe total de las órdenes vinculadas)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Clasifique la (s) propuesta (s) de proveedores de origen vinculados para facturar cuando se valida la factura del proveedor (y si el importe de la factura es igual al importe total de las propuestas vinculadas)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Clasifique las órdenes de compra de origen vinculadas para facturar cuando se valida la factura del proveedor (y si el importe de la factura es igual al importe total de las órdenes vinculadas)
diff --git a/htdocs/langs/es_CO/bills.lang b/htdocs/langs/es_CO/bills.lang
index 8179841b2e8..ee9279c7743 100644
--- a/htdocs/langs/es_CO/bills.lang
+++ b/htdocs/langs/es_CO/bills.lang
@@ -13,3 +13,4 @@ PaymentTypeShortCB=Tarjeta de crédito
 PaymentTypeCHQ=Verificar
 PaymentTypeShortCHQ=Verificar
 BankDetails=Cuentas bancarias
+situationInvoiceShortcode_S=D
diff --git a/htdocs/langs/es_CO/main.lang b/htdocs/langs/es_CO/main.lang
index bca2d98ca04..900a3db52b8 100644
--- a/htdocs/langs/es_CO/main.lang
+++ b/htdocs/langs/es_CO/main.lang
@@ -32,6 +32,10 @@ UseLocalTax=Incluir impuestos
 CommercialProposalsShort=Cotizaciones
 RequestAlreadyDone=La solicitud ya ha sido procesada
 December=diciembre
+MonthVeryShort02=V
+MonthVeryShort03=L
+MonthVeryShort05=L
+MonthVeryShort09=D
 FindBug=Señalar un bug
 Currency=Moneda
 NewAttribute=Nuevo atributo
diff --git a/htdocs/langs/es_DO/admin.lang b/htdocs/langs/es_DO/admin.lang
index 426699b117a..65aa90b2f97 100644
--- a/htdocs/langs/es_DO/admin.lang
+++ b/htdocs/langs/es_DO/admin.lang
@@ -2,7 +2,6 @@
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
-HideAnyVATInformationOnPDF=Ocultar toda la información relacionada con el ITBIS en la generación de los PDF
 OldVATRates=Tasa de ITBIS antigua
 NewVATRates=Tasa de ITBIS nueva
 Permission91=Consultar impuestos e ITBIS
diff --git a/htdocs/langs/es_EC/admin.lang b/htdocs/langs/es_EC/admin.lang
index 2c38b535a36..8fee1881ee9 100644
--- a/htdocs/langs/es_EC/admin.lang
+++ b/htdocs/langs/es_EC/admin.lang
@@ -199,7 +199,7 @@ MAIN_MAIL_SMTP_SERVER=SMTP/Host SMTPS (Por defecto en php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS puerto (No está definido en PHP en sistemas Unix)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (No está definido en PHP en sistemas Unix)
 MAIN_MAIL_EMAIL_FROM=Dirección electróica del remitente para correos electrónicos automáticos (por defecto en php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Correo electrónico utilizado como campo 'Errores a' en los correos electrónicos enviados
+MAIN_MAIL_ERRORS_TO=Correo electrónico utilizado para los correos electrónicos devueltos con errores (campos 'Errores-Para' en los correos electrónicos enviados)
 MAIN_MAIL_AUTOCOPY_TO=Enviar sistemáticamente una copia carbon oculta (CCO) de todos los correos enviados a
 MAIN_DISABLE_ALL_MAILS=Desactivar todos los envíos de correo electrónico (con fines de prueba o demos)
 MAIN_MAIL_FORCE_SENDTO=Enviar todos los correos electrónicos a (en lugar de destinatarios reales, para fines de prueba)
@@ -291,7 +291,8 @@ SecurityToken=Clave para proteger las URL
 NoSmsEngine=No hay gestor de envío de SMS disponible. El gestor de envío de SMS no está instalado con la distribución predeterminada (porque depende de un proveedor externo), pero puede encontrar algunos en %s
 PDFDesc=Puede configurar cada opción globales relacionados con la generación de PDF
 PDFAddressForging=Reglas para forjar cuadros de direcciones
-HideAnyVATInformationOnPDF=Ocultar toda la información relacionada con el IVA en el PDF generado
+HideAnyVATInformationOnPDF=Ocultar toda la información relacionada con Impuesto a las ventas / IVA en PDF generado
+PDFRulesForSalesTax=Reglas para el impuesto a las ventas / IVA
 HideLocalTaxOnPDF=Ocultar tarifa de %s en la columna de impuestos de la columna de PDF
 HideDescOnPDF=Ocultar la descripción de los productos en el PDF generado
 HideRefOnPDF=Ocultar referencia de productos en PDF generado
@@ -347,11 +348,13 @@ DisplayCompanyInfo=Mostrar la dirección de la empresa
 DisplayCompanyManagers=Mostrar nombres de administradores
 DisplayCompanyInfoAndManagers=Mostrar la dirección de la empresa y los nombres de los administradores
 EnableAndSetupModuleCron=Si desea que esta factura recurrente se genere automáticamente, el módulo *%s* Debe estar habilitado y configurado correctamente. De lo contrario, la generación de facturas se debe hacer manualmente desde esta plantilla con el botón *Crear*. Tenga en cuenta que, aunque haya habilitado la generación automática, puede iniciar la generación manual de forma segura. No es posible la generación de duplicados para el mismo período.
-ModuleCompanyCodeAquarium=Devolver un código de contabilidad construido por:<br>1%s seguido por código de proveedor de cliente/proveedor para un código de contabilidad de proveedor,<br>1%s seguido por código de cliente de cliente/proveedor para un código de contabilidad de cliente.
+ModuleCompanyCodeCustomerAquarium=%s seguido de un código de cliente externo para un código de contabilidad del cliente
+ModuleCompanyCodeSupplierAquarium=%s seguido de un código de proveedor externo para un código de contabilidad de proveedor
 ModuleCompanyCodePanicum=Devolver un código de contabilidad vacío.
 ModuleCompanyCodeDigitaria=El código de contabilidad depende del código de un cliente/proveedor. El código está compuesto por el carácter "C" en la primera posición seguido por los primeros 5 caracteres del código de cliente/proveedor.
 Use3StepsApproval=De forma predeterminada, las órdenes de compra deben ser creadas y aprobadas por dos usuarios diferentes (un paso/usuario para crear y un paso/usuario para aprobar.) Nota: si el usuario tiene permiso para crear y aprobar, un paso/usuario será suficiente). Puede pedir con esta opción introducir una tercera aprobación de paso/usuario, si la cantidad es mayor que un valor dedicado (por lo que serán necesarios 3 pasos: 1= validación, 2= primera aprobación y 3= segunda aprobación si la cantidad es suficiente).<br> Establezca esto en blanco para una aprobación (2 pasos) es suficiente, establezca un valor muy bajo (0.1) si se requiere una segunda aprobación (3 pasos).
 UseDoubleApproval=Utilice una aprobación de 3 pasos cuando la cantidad (sin impuestos) es mayor que ...
+WarningPHPMail=ADVERTENCIA: Es mejor configurar los correos electrónicos salientes para usar el servidor de correo electrónico de su proveedor en lugar de la configuración predeterminada. Algunos proveedores de correo electrónico (como Yahoo) no le permiten enviar un correo electrónico desde otro servidor que no sea su propio servidor. Su configuración actual utiliza el servidor de la aplicación para enviar correos electrónicos y no el servidor de su proveedor de correo electrónico, por lo que algunos destinatarios (el compatible con el restrictivo protocolo DMARC) le preguntarán a su proveedor de correo electrónico si pueden aceptar su correo electrónico y algunos proveedores de correo electrónico. (como Yahoo) puede responder "no" porque el servidor no es un servidor de ellos, por lo que es posible que no se acepten algunos de sus correos electrónicos enviados (tenga cuidado también con la cuota de envío de su proveedor de correo electrónico). <br> Si su proveedor de correo electrónico (como Yahoo) tiene esta restricción, debe cambiar la Configuración de correo electrónico para elegir el otro método "Servidor SMTP" e ingresar el servidor SMTP y las credenciales provistas por su proveedor de correo electrónico (solicite a su proveedor de correo electrónico que le envíen las credenciales SMTP para su cuenta).
 WarningPHPMail2=Si su proveedor SMTP de correo electrónico necesita restringir el cliente de correo electrónico a algunas direcciones IP (muy raras), esta es la dirección IP de su aplicación ERP CRM:<strong>%s</strong>.
 ClickToShowDescription=Haga clic para mostrar la descripción
 DependsOn=Este módulo necesita el módulo(s)
@@ -366,12 +369,15 @@ ProductDocumentTemplates=Plantillas para generar documento de producto
 FreeLegalTextOnExpenseReports=Texto legal gratuita en los informes de gastos
 WatermarkOnDraftExpenseReports=Marca de agua en informes de gastos preliminares
 AttachMainDocByDefault=Configúrelo en 1 si desea adjuntar el documento principal al correo electrónico de forma predeterminada (si corresponde)
+DAVSetup=Configuración del módulo DAV
+DAV_ALLOW_PUBLIC_DIR=Habilite el directorio público (directorio WebDav sin necesidad de iniciar sesión)
+DAV_ALLOW_PUBLIC_DIRTooltip=El directorio público de WebDav es un directorio WebDAV al que todos pueden acceder (en modo lectura y escritura), sin necesidad de tener/usar una cuenta de inicio de sesión/contraseña existente.
 Module0Name=Usuarios & Grupos
 Module0Desc=Gestión de Usuarios / Empleados y Grupos
 Module1Name=Clientes / Proveedores
 Module1Desc=Empresas y gestión de contactos (clientes, prospectos ...)
 Module2Desc=Administración comercial
-Module10Desc=Informes contables sencillos (revistas, facturación) basados en el contenido de la base de datos. Ningún despacho.
+Module10Desc=Informes contables simples (diarios, rotación) basados en el contenido de la base de datos. No usa ninguna tabla de contabilidad.
 Module20Name=Propuestas
 Module20Desc=Gestión de propuestas comerciales
 Module22Name=E-mailings masivos
@@ -423,8 +429,7 @@ Module400Name=Proyectos / Oportunidades / Prospectos
 Module400Desc=198/5000\nGestión de proyectos, oportunidades/clientes potenciales y/o tareas. También puede asignar cualquier elemento (factura, orden, propuesta, intervención, ...) a un proyecto y obtener una vista transversal desde la vista del proyecto.
 Module410Name=Calendario web
 Module410Desc=Integración calendario web
-Module500Name=Gastos especiales
-Module500Desc=Administración de gastos especiales (impuestos, tasas sociales o fiscales, dividendos)
+Module500Name=Impuestos y gastos especiales
 Module510Name=Pago de salarios de empleados
 Module510Desc=Registre y siga el pago de los salarios de empleado
 Module520Name=Préstamo
@@ -435,18 +440,17 @@ Module600Long=Tenga en cuenta que este módulo está dedicado a enviar mensajes
 Module700Desc=Administración de donaciones
 Module770Name=Reporte de gastos
 Module770Desc=Administración y reposición de informes de gastos (transporte, comida, ...)
-Module1120Name=Propuesta comercial del proveedor
-Module1120Desc=Solicitar al proveedor oferta comercial y precios
+Module1120Name=Propuesta comercial del vendedor
 Module1200Desc=Integración Mantis
 Module1520Name=Generación de documentos
 Module1780Name=Etiquetas / Categorías
-Module1780Desc=Crear etiquetas / categorías (productos, clientes, proveedores, contactos o miembros)
+Module1780Desc=Crear etiquetas/categoría (productos, clientes, proveedores, contactos o miembros)
 Module2000Desc=Permitir editar algún área de texto usando un editor avanzado (Basado en CKEditor)
 Module2200Desc=Habilitar el uso de expresiones matemáticas para los precios
 Module2300Name=Trabajos programados
 Module2300Desc=Gestión de trabajos programados (alias cron o chrono table)
 Module2400Name=Eventos / Agenda
-Module2400Desc=Seguir los eventos realizados y próximos. Permita que la aplicación registre eventos automáticos para propósitos de seguimiento o registre eventos manuales o cita.
+Module2400Desc=Siga los eventos realizados y próximos. Deje que la aplicación registre los eventos automáticos con fines de seguimiento o registre eventos manuales o citas. Este es el módulo principal para una buena gestión de relaciones con clientes o proveedores.
 Module2500Desc=Sistema de gestión de documentos / gestión electrónica de contenidos. Organización automática de sus documentos generados o almacenados. Compártelos cuando lo necesites.
 Module2600Name=API / Servicios Web (servidor SOAP)
 Module2600Desc=Habilitar el servidor SOAP de Dolibarr que proporciona servicios API
@@ -473,7 +477,7 @@ Module50100Name=Puntos de venta
 Module50100Desc=Módulo punto de venta (POS).
 Module50200Desc=Módulo para ofrecer una página de pago en línea que acepta pagos con PayPal (tarjeta de crédito o crédito de PayPal). Esto se puede usar para permitir que sus clientes realicen pagos gratuitos o para un pago en un objeto Dolibarr en particular (factura, orden, ...)
 Module50400Name=Contabilidad (avanzado)
-Module50400Desc=Administración contable (entradas dobles)
+Module50400Desc=Gestión contable (entradas dobles, libros auxiliares generales y auxiliares). Exporte el libro de contabilidad en otros formatos de software de contabilidad.
 Module54000Desc=Impresión directa (sin abrir los documentos) utilizando la interfaz Cups IPP (La impresora debe estar visible desde el servidor y CUPS debe instalarse en el servidor).
 Module55000Name=Sondeo, encuesta o votación
 Module55000Desc=Módulo para hacer sondeos en línea, encuestas o votaciones (como Doodle, Pasadores, Rdvz, ...)
@@ -791,9 +795,9 @@ Delays_MAIN_DELAY_MEMBERS=Retardo de tolerancia (en días) antes de la alerta de
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Demora de la tolerancia (en días) antes de la alerta para cheques de depósito para hacer
 Delays_MAIN_DELAY_EXPENSEREPORTS=Retardo de tolerancia (en días) antes de la alerta para que los informes de gastos aprueben
 SetupDescription1=El área de configuración es para los parámetros de configuración inicial antes de comenzar a utilizar Dolibarr.
-SetupDescription2=Los dos pasos de configuración obligatorios son los dos primeros en el menú de configuración a la izquierda: %s página de configuración de y %s página de configuración de:
-SetupDescription3=Los parámetros del menú <a href="%s">%s -> %s</a> son necesarios porque los datos definidos se utilizan en las pantallas de Dolibarr y para personalizar el comportamiento predeterminado del software (por ejemplo, para las funciones relacionadas con el país)
-SetupDescription4=Los parámetros en el menú <a href="%s">%s -> %s</a> son necesarios porque Dolibarr ERP/CRM es una colección de varios módulos/aplicaciones, todos más o menos independientes. Se añadirán nuevas funciones a los menús para cada módulo que se active.
+SetupDescription2=Los dos pasos de configuración obligatorios son los siguientes (las dos primeras entradas en el menú de configuración izquierdo):
+SetupDescription3=Configuraciones en el menú <a href="%s">%s -> %s</a>. Este paso es necesario porque define los datos utilizados en las pantallas de Dolibarr para personalizar el comportamiento predeterminado del software (por ejemplo, para las características relacionadas con el país).
+SetupDescription4=Configuraciones en el menú <a href="%s">%s -> %s</a>. Este paso es necesario porque Dolibarr ERP/CRM es una colección de varios módulos/aplicaciones, todos más o menos independientes. Las nuevas funciones se agregan a los menús para cada módulo que active.
 SetupDescription5=Otras entradas de menú controlan los parámetros opcionales.
 LogEvents=Eventos de auditoría de seguridad
 InfoBrowser=Acerca del navegador
@@ -805,7 +809,8 @@ LogEventDesc=Puede activar aquí el registro de eventos de seguridad de Dolibarr
 AreaForAdminOnly=Los parámetros de configuración sólo pueden ser establecidos por <b>usuarios de administrador</b>.
 SystemInfoDesc=La información del sistema es información técnica diversa que se obtiene en modo de sólo lectura y visible sólo para los administradores.
 SystemAreaForAdminOnly=Esta área está disponible sólo para usuarios de administrador. Ninguno de los permisos de Dolibarr puede reducir este límite.
-CompanyFundationDesc=Edite en esta página toda la información conocida de la empresa o fundación que necesita administrar (para ello, haga clic en "Modificar" o "Guardar" en la parte inferior de la página)
+AccountantDesc=Edite en esta página toda la información conocida sobre su contador
+AccountantFileNumber=Número de expediente
 DisplayDesc=Puede elegir cada parámetro relacionado con el aspecto de Dolibarr aquí
 AvailableModules=Aplicaciones/módulos disponibles
 ToActivateModule=Para activar los módulos, vaya al área de configuración (Inicio-> Configuración-> Módulos).
@@ -924,11 +929,11 @@ UsersSetup=Configuración de módulos de usuario
 UserMailRequired=Se requiere correo electrónico para crear un nuevo usuario
 HRMSetup=Configuración del módulo de RRHH (Recursos Humanos)
 CompanySetup=Configuración del módulo de empresas
-CompanyCodeChecker=Módulo de generación y comprobación de códigos de cliente / proveedor (cliente o proveedor)
-AccountCodeManager=Módulo de generación de código de contabilidad (cliente o proveedor)
+CompanyCodeChecker=Módulo para la generación y verificación de código de terceros (cliente o proveedor)
+AccountCodeManager=Módulo para la generación de códigos de contabilidad (cliente o proveedor)
 NotificationsDesc=La función de notificaciones de EMails le permite enviar en forma silenciosa el correo automático, para algunos eventos de Dolibarr. Los destinos de las notificaciones se pueden definir:
 NotificationsDescUser=* Por usuarios, un usuario a la vez.
-NotificationsDescContact=* Por contactos de cliente / proveedor, un contacto a la vez.
+NotificationsDescContact=* por contactos de terceros (clientes o proveedores), un contacto a la vez.
 NotificationsDescGlobal=* O estableciendo mensajes de destino globales en la página de configuración del módulo.
 ModelModules=Plantillas de documentos
 DocumentModelOdt=Generar documentos desde plantillas OpenDocuments (archivos .ODT o .ODS para OpenOffice, KOffice, TextEdit, ...)
@@ -937,6 +942,8 @@ JSOnPaimentBill=Activar función para llenar automáticamente las líneas de pag
 CompanyIdProfChecker=Reglas de identificación profesional
 MustBeMandatory=¿Obligatorio crear cliente/proveedor?
 MustBeInvoiceMandatory=¿Es obligatorio validar facturas?
+WebDAVSetupDesc=Estos son los enlaces para acceder al directorio WebDAV. Contiene un directorio "público" abierto para cualquier usuario que conozca la URL (si se permite el acceso público al directorio) y un directorio "privado" que necesita una cuenta de inicio de sesión / contraseña para acceder.
+WebDavServer=URL raíz del %s servidor: %s
 WebCalUrlForVCalExport=Un enlace de exportación al formato <b>%s</b> está disponible en el siguiente enlace: %s
 BillsSetup=Configuración del módulo facturas
 BillsNumberingModule=Modelo de numeración de facturas y notas de crédito
@@ -958,14 +965,14 @@ ProposalsPDFModules=Modelos de documentos de propuestas comerciales
 FreeLegalTextOnProposal=Texto libre sobre propuestas comerciales
 WatermarkOnDraftProposal=Marca de agua en proyectos de propuestas comerciales (ninguno si está vacío)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Solicitar la cuenta bancaria en la propuesta
-SupplierProposalSetup=Solicitud de precios configuración de módulos proveedores
+SupplierProposalSetup=Solicitud de precio configuración del módulo de proveedores
 SupplierProposalNumberingModules=Solicitud de precios modelos de numeración de proveedores
-SupplierProposalPDFModules=Solicitud de precios proveedores modelos de documentos
-FreeLegalTextOnSupplierProposal=Texto libre sobre proveedores de precios
-WatermarkOnDraftSupplierProposal=Marca de agua en los proveedores de ofertas de precios de borrador (ninguno si está vacío)
+SupplierProposalPDFModules=Solicitudes de precios modelos de documentos de proveedores
+FreeLegalTextOnSupplierProposal=Texto libre en solicitudes de precios de vendedores/proveedores
+WatermarkOnDraftSupplierProposal=Marca de agua en las solicitudes de precios preliminares de proveedores (ninguno si está vacío)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Solicitar la cuenta bancaria en la solicitud de precio
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Pregunte por la fuente del almacén para el pedido
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Solicitar la cuenta bancaria en la orden del proveedor
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Preguntar por el destinatario de la cuenta bancaria en la orden de compra
 OrdersSetup=Configuración de la gestión de pedidos
 OrdersNumberingModules=Modelos de numeración de pedidos
 WatermarkOnDraftOrders=Marca de agua en los proyectos de pedidos (ninguno si está vacío)
@@ -1181,7 +1188,7 @@ OSCommerceErrorConnectOkButWrongDatabase=La conexión tuvo éxito pero la base d
 OSCommerceTestOk=Conexión al servidor '%s' en la base de datos '%s' con el usuario '%s' exitoso.
 OSCommerceTestKo1=Conexión al servidor '%s' tuvo éxito, pero no se pudo acceder a la base de datos '%s'.
 OSCommerceTestKo2=Conexión al servidor '%s' con el usuario '%s' falló.
-StockSetup=Configuración módulo de almacén
+StockSetup=Configuración del módulo de stock/inventario
 IfYouUsePointOfSaleCheckModule=Si utiliza un módulo de punto de venta (módulo POS proporcionado por defecto u otro módulo externo), esta configuración puede ser ignorada por su módulo de punto de venta. La mayoría de los módulos de punto de venta están diseñados para crear inmediatamente una factura y disminuir el stock por defecto, cualesquiera sean las opciones aquí. Por lo tanto, si necesita o no tener una disminución de existencias al registrar una venta desde su punto de venta, compruebe también que el módulo de POS este configurado.
 NotTopTreeMenuPersonalized=Menús personalizados no vinculados a una entrada de menú superior
 Menu=Selección del menú
@@ -1269,7 +1276,7 @@ BankOrderESDesc=Orden de exhibición en español
 ChequeReceiptsNumberingModule=Módulo de numeración de recibos de cheques
 MultiCompanySetup=Configuración del módulo de varias empresas
 SuppliersSetup=Configuración del módulo de proveedores
-SuppliersCommandModel=Plantilla completa de pedido de proveedor (logo ...)
+SuppliersCommandModel=Plantilla completa de orden de compra (logo ...)
 SuppliersInvoiceModel=Plantilla completa de la factura del proveedor (logo ...)
 SuppliersInvoiceNumberingModel=Modelos de numeración de facturas de proveedores
 IfSetToYesDontForgetPermission=Si se establece en sí, no olvide proporcionar permisos a grupos o usuarios permitidos para la segunda aprobación
@@ -1300,7 +1307,6 @@ NoAmbiCaracAutoGeneration=No utilice caracteres ambiguos ("1", "l", "i", "|", "0
 SalariesSetup=Configuración del módulo de los salarios
 SortOrder=Orden de clasificación
 Format=Formato
-TypePaymentDesc=0:Tipo de pago del cliente, 1:Tipo de pago del proveedor, 2:Tipo de pago de clientes y proveedores
 IncludePath=Incluir ruta (definida en la variable %s)
 ExpenseReportsSetup=Configuración del módulo Informes de gastos
 TemplatePDFExpenseReports=Plantillas para generar el documento de informe de gastos
@@ -1319,7 +1325,7 @@ InstallModuleFromWebHasBeenDisabledByFile=La instalación del módulo externo de
 ConfFileMustContainCustom=Instalar o construir un módulo externo desde la aplicación necesita guardar los archivos del módulo en el directorio <strong>%s</strong>. Para que este directorio sea procesado por Dolibarr, debes configurar tu <strong>conf/conf.php</strong> para añadir las 2 líneas de directiva:<strong>$dolibarr_main_url_root_alt='/custom';</strong><Br><strong>$dolibarr_main_document_root_alt ='%s/custom';</strong>
 HighlightLinesOnMouseHover=Resalte las líneas de la tabla cuando pase el mouse
 HighlightLinesColor=Resalte el color de la línea cuando el ratón pasa (mantenga vacío para no destacar)
-TextTitleColor=Color del título de la página
+TextTitleColor=Color del texto del título de la página
 LinkColor=Color de los enlaces
 PressF5AfterChangingThis=Presione CTRL+F5 en el teclado o borre la caché del navegador después de cambiar este valor para tenerlo efectivo
 NotSupportedByAllThemes=Trabajará con temas centrales, no puede ser apoyado por temas externos
@@ -1327,6 +1333,7 @@ TopMenuBackgroundColor=Color de fondo para el menú superior
 TopMenuDisableImages=Ocultar imágenes en el menú principal
 LeftMenuBackgroundColor=Color de fondo para el menú de la izquierda
 BackgroundTableTitleColor=Color de fondo para la línea de título de la tabla
+BackgroundTableTitleTextColor=Color del texto para la línea de título de la tabla
 BackgroundTableLineOddColor=Color de fondo para líneas de tabla impares
 BackgroundTableLineEvenColor=Color de fondo para líneas de tabla pares
 MinimumNoticePeriod=Período mínimo de notificación (Su solicitud de permiso debe ser hecha antes de este retraso)
@@ -1344,18 +1351,13 @@ FillFixTZOnlyIfRequired=Ejemplo: +2 (relleno sólo si el problema ha sido experi
 ExpectedChecksum=Suma de control prevista
 CurrentChecksum=Suma de control actual
 ForcedConstants=Valores constantes requeridos
-MailToSendProposal=Enviar propuesta de cliente
-MailToSendOrder=Enviar la orden del cliente
-MailToSendInvoice=Enviar la factura del cliente
-MailToSendShipment=Enviar el pedido
-MailToSendIntervention=Enviar intervención
-MailToSendSupplierRequestForQuotation=Enviar solicitud de cotización al proveedor
-MailToSendSupplierOrder=Enviar pedido de proveedor
-MailToSendSupplierInvoice=Enviar la factura del proveedor
-MailToSendContract=Enviar un contrato
-MailToThirdparty=Enviar correo electrónico desde una página de terceros
-MailToMember=Para enviar correo electrónico desde la página de miembro
-MailToUser=Para enviar correos electrónicos desde la página del usuario
+MailToSendProposal=Propuestas de clientes
+MailToSendInvoice=Facturas de clientes
+MailToSendSupplierRequestForQuotation=Solicitud de presupuesto/cotización
+MailToSendSupplierOrder=Ordenes de compra
+MailToSendSupplierInvoice=Facturas del vendedor/proveedor
+MailToThirdparty=Clientes/Proveedores
+MailToProject=Página de proyectos
 ByDefaultInList=Mostrar de forma predeterminada en la vista de lista
 YouUseLastStableVersion=Utiliza la última versión estable
 TitleExampleForMajorRelease=Ejemplo de mensaje que puede usar para anunciar esta versión principal (siéntase libre de usarla en sus sitios web)
@@ -1398,6 +1400,10 @@ WarningInstallationMayBecomeNotCompliantWithLaw=Intenta instalar el módulo %s q
 SetToYesIfGroupIsComputationOfOtherGroups=Establezca esto en "sí" si este grupo es un cálculo de otros grupos
 EnterCalculationRuleIfPreviousFieldIsYes=Ingrese regla de cálculo si el campo anterior se estableció en Sí (por ejemplo, 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Algunas variantes de lenguaje encontradas
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Eliminar caracteres especiales
+COMPANY_AQUARIUM_CLEAN_REGEX=Filtro Regex para limpiar el valor (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=Contacto GDPR
+GDPRContactDesc=Si almacena datos sobre empresas/ciudadanos Europeos, puede almacenar aquí el contacto responsable del Reglamento General de Protección de Datos
 ResourceSetup=Configuración del módulo Recurso
 DisabledResourceLinkUser=Deshabilitar característica para vincular un recurso a los usuarios
 DisabledResourceLinkContact=Deshabilitar característica para vincular un recurso a contactos
diff --git a/htdocs/langs/es_EC/main.lang b/htdocs/langs/es_EC/main.lang
index 1238cf7b830..ed4a7671dd6 100644
--- a/htdocs/langs/es_EC/main.lang
+++ b/htdocs/langs/es_EC/main.lang
@@ -49,6 +49,7 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no hay tipos de IVA definidos para
 ErrorNoSocialContributionForSellerCountry=Error, no hay ningun tipo de impuesto fiscal definido para el país '%s'.
 ErrorFailedToSaveFile=Error, Error al guardar el archivo.
 ErrorCannotAddThisParentWarehouse=Está intentando agregar un almacén padre que ya es un hijo de uno actual
+MaxNbOfRecordPerPage=Número máximo de registro por página
 NotAuthorized=No está autorizado para hacer eso.
 SetDate=Establecer fecha
 SeeHere=Mire aquí
@@ -138,7 +139,7 @@ AmountByMonth=Monto por mes
 Limits=límites
 Logout=Cerrar sesión
 NoLogoutProcessWithAuthMode=No hay función de desconexión aplicable con el modo de autenticación <b>%s</b>
-Connection=Iniciar Sesión
+Connection=Iniciar sesión
 Setup=Configurar
 Cards=Tarjetas
 Card=Tarjeta
@@ -222,6 +223,7 @@ VATCode=Código de tasa impositiva
 VATNPR=Tasa de impuesto NPR
 DefaultTaxRate=Tasa de impuesto predeterminada
 Average=Promedio
+RemainToPay=Seguir pagando
 Module=Módulo/Aplicación
 Modules=Módulos/Aplicaciones
 List=Lista
@@ -229,7 +231,7 @@ FullList=Lista completa
 Statistics=Estadística
 Ref=Referencia
 ExternalRef=Referencia externa
-RefSupplier=Referencia proveedor
+RefSupplier=Referencia del proveedor
 RefPayment=Referencia pago
 CommercialProposalsShort=Propuestas comerciales
 ActionsToDo=Eventos que se pueden hacer
@@ -268,7 +270,7 @@ Validated=validado
 Opened=Abierto
 Topic=Tema
 ByCompanies=Por cliente
-ByUsers=Por Usuario
+ByUsers=Por usuario
 Rejects=Rechazos
 Preview=Vista Previa
 NextStep=Próximo paso
@@ -312,6 +314,10 @@ MonthShort04=Abr
 MonthShort05=Mayo
 MonthShort08=Ago
 MonthShort12=Dic
+MonthVeryShort02=V
+MonthVeryShort03=L
+MonthVeryShort05=L
+MonthVeryShort09=D
 DateFormatYYYYMM=MM-AAAA
 DateFormatYYYYMMDD=DD-MM-AAAA
 DateFormatYYYYMMDDHHMM=DD-MM-AAAA HH:SS
@@ -339,9 +345,9 @@ Warnings=Advertencias
 BuildDoc=Generar Documento
 Entity=Ambiente
 CustomerPreview=Vista previa del cliente
-SupplierPreview=Vista Previa del proveedor
+SupplierPreview=Vista previa del proveedor
 ShowCustomerPreview=Mostrar vista previa al cliente
-ShowSupplierPreview=Mostrar la previsualización de un proveedor
+ShowSupplierPreview=Mostrar vista previa del vendedor
 RefCustomer=Referencia de cliente
 Currency=Moneda
 Undo=Deshacer
@@ -399,7 +405,6 @@ PrintContentArea=Mostrar la página para imprimir el área de contenido principa
 MenuManager=Administrador de menús
 WarningYouAreInMaintenanceMode=Advertencia, está en un modo de mantenimiento, por lo que sólo se permite el acceso <b>%s</b> a la aplicación en este momento.
 CoreErrorMessage=Disculpe, ocurrió un error. Póngase en contacto con el administrador del sistema para comprobar los registros o desactivar $dolibarr_main_prod=1 para obtener más información.
-ValidatePayment=Validar pago
 FieldsWithAreMandatory=Los campos con <b>%s</b> son obligatorios
 FieldsWithIsForPublic=Los campos con <b>%s</b> se muestran en la lista pública de miembros. Si no lo desea, marque la casilla "público".
 AccordingToGeoIPDatabase=(Según la conversión GeoIP)
@@ -480,6 +485,7 @@ TitleSetToDraft=Volver al borrador
 ConfirmSetToDraft=¿Seguro que desea volver al estado de borrador?
 EMailTemplates=Plantillas de correo electrónico
 FileNotShared=Archivo no compartido con público externo
+LineNb=Número de línea
 MondayMin=Lun
 TuesdayMin=Mar
 WednesdayMin=Mier
@@ -499,11 +505,15 @@ Select2LoadingMoreResults=Cargando más resultados ...
 Select2SearchInProgress=Búsqueda en proceso...
 SearchIntoThirdparties=Clientes/Proveedores
 SearchIntoCustomerInvoices=Facturas de clientes
+SearchIntoSupplierInvoices=Facturas del vendedor/proveedor
+SearchIntoSupplierOrders=Ordenes de compra
 SearchIntoCustomerProposals=Propuestas de clientes
-SearchIntoSupplierProposals=Propuestas de proveedor
+SearchIntoSupplierProposals=Propuestas del vendedor
 SearchIntoCustomerShipments=Envíos de clientes
 SearchIntoExpenseReports=Reporte de gastos
 SearchIntoLeaves=Hojas
 CommentPage=Espacio para comentarios
 Everybody=Todos
 AssignedTo=Asignado a
+Deletedraft=Eliminar borrador
+ConfirmMassDraftDeletion=Confirmación de eliminación masiva
diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang
index 38f3ce8399c..37cb6aa13f2 100644
--- a/htdocs/langs/es_ES/accountancy.lang
+++ b/htdocs/langs/es_ES/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Contabilidad
 ACCOUNTING_EXPORT_SEPARATORCSV=Separador de columnas en el archivo de exportación
 ACCOUNTING_EXPORT_DATE=Formato de fecha en el archivo de exportación
 ACCOUNTING_EXPORT_PIECE=Exportar el número de asiento
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Cuentas con valores no cero
 ListOfAccounts=Lista de cuentas
 
 MainAccountForCustomersNotDefined=Cuenta contable para clientes no definida en la configuración
-MainAccountForSuppliersNotDefined=Cuenta contable para proveedores no definida en la configuración
+MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
 MainAccountForUsersNotDefined=Cuenta contable para usuarios no definida en la configuración
 MainAccountForVatPaymentNotDefined=Cuenta contable para IVA no definida en la configuración
 
-AccountancyArea=Área contabilidad
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=El uso del módulo de contabilidad se realiza en varios pasos:
 AccountancyAreaDescActionOnce=Las siguientes acciones se ejecutan normalmente una sola vez, o una vez al año...
 AccountancyAreaDescActionOnceBis=Los pasos siguientes deben hacerse para ahorrar tiempo en el futuro, sugiriendo la cuenta contable predeterminada correcta para realizar los diarios (escritura de los registros en los diarios y el Libro Mayor)
@@ -89,7 +90,7 @@ MenuProductsAccounts=Cuentas contables de productos
 ProductsBinding=Cuentas de productos
 Ventilation=Contabilizar
 CustomersVentilation=Contabilizar facturas a clientes
-SuppliersVentilation=Contabilizar facturas de proveedores
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Contabilizar informes de gastos
 CreateMvts=Crear nuevo movimiento
 UpdateMvts=Modificar transacción
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=Diario de compras
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Diario de operaciones diversas
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Informe de gastos diario
 ACCOUNTING_SOCIAL_JOURNAL=Diario social
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Cuenta de caja
 ACCOUNTING_ACCOUNT_SUSPENSE=Cuenta operaciones pendientes de asignar
@@ -185,11 +187,12 @@ ListeMvts=Listado de movimientos
 ErrorDebitCredit=Debe y Haber no pueden contener un valor al mismo tiempo
 AddCompteFromBK=Añadir cuentas contables al grupo
 ReportThirdParty=Listado de cuentas de terceros
-DescThirdPartyReport=Consulte aquí el listado de clientes y proveedores y sus códigos contables
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=Listado de cuentas contables
 UnknownAccountForThirdparty=Cuenta contable de tercero desconocida, usaremos %s
 UnknownAccountForThirdpartyBlocking=Cuenta contable de tercero desconocida. Error de bloqueo
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Cuenta del terceros desconocida y cuenta de espera no definida. Error de bloqueo
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Grupo de cuenta
 Pcgsubtype=Subgrupo de cuenta
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Consulte aquí las líneas de facturas a clientes y las c
 DescVentilTodoCustomer=Contabilizar líneas de factura aún no contabilizadas con una cuenta contable de producto
 ChangeAccount=Cambie la cuenta del producto/servicio para las líneas seleccionadas a la cuenta:
 Vide=-
-DescVentilSupplier=Consulte aquí la lista de líneas de facturas de proveedores enlazadas (o no) a una cuenta contable de producto
-DescVentilDoneSupplier=Consulte aquí la lista de facturas de proveedores y sus cuentas contables
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Contabilizar líneas de informes de gastos aún no contabilizadas con una cuenta contable de gastos
 DescVentilExpenseReport=Consulte aquí la lista de líneas de informes de gastos (o no) a una cuenta contable de gastos
 DescVentilExpenseReportMore=Si configura la cuentas contables de los tipos de informes de gastos, la aplicación será capaz de hacer el enlace entre sus líneas de informes de gastos y las cuentas contables, simplemente con un clic en el botón <strong>"%s"</strong> , Si no se ha establecido la cuenta contable en el diccionario o si todavía tiene algunas líneas no contabilizadas a alguna cuenta, tendrá que hacer una contabilización manual desde el menú "<strong>%s</strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Vincular automáticamente
 AutomaticBindingDone=Vinculación automática finalizada
 
 ErrorAccountancyCodeIsAlreadyUse=Error, no puede eliminar esta cuenta ya que está siendo usada
-MvtNotCorrectlyBalanced=Asiento contabilizado incorrectamente. Debe=%s. Haber=%s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Ficha contable
 GeneralLedgerIsWritten=Transacciones escritas en el Libro Mayor
 GeneralLedgerSomeRecordWasNotRecorded=Algunas de las operaciones no pueden contabilizarse. Si no hay otro mensaje de error, es probable que ya estén contabilizadas.
@@ -234,7 +237,7 @@ AccountingJournal=Diario contable
 NewAccountingJournal=Nuevo diario contable
 ShowAccoutingJournal=Mostrar diario contable
 Nature=Naturaleza
-AccountingJournalType1=Miscellaneous operations
+AccountingJournalType1=Operaciones varias
 AccountingJournalType2=Ventas
 AccountingJournalType3=Compras
 AccountingJournalType4=Banco
@@ -293,4 +296,9 @@ Binded=Líneas contabilizadas
 ToBind=Líneas a contabilizar
 UseMenuToSetBindindManualy=No es posible autodetectar, utilice el menú <a href="%s"> %s </a> para realizar el apunte manualmente
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Advertencia, este informe no se basa en el Libro mayor, por lo que no contiene modificaciones manualmente modificadas en el Libro mayor.. Si su diario está actualizado, la vista contable es más precisa.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 9d7b393b547..22f6c0cbbcf 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=Nombre host o ip del servidor SMTP (Por defecto en php.ini
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Puerto del servidor SMTP (No definido en PHP en sistemas de tipo Unix)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Nombre servidor o ip del servidor SMTP (No definido en PHP en sistemas de tipo Unix)
 MAIN_MAIL_EMAIL_FROM=E-mail del remitente para e-mails automáticos (por defecto en php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=E-mail a usar para los e-mails de error enviados
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= Enviar automáticamente copia oculta de los e-mails enviados a
 MAIN_DISABLE_ALL_MAILS=Deshabilitar todos los envíos de e-mail (para propósitos de prueba o demostraciones)
 MAIN_MAIL_FORCE_SENDTO=Enviar todos los e-mails a (en lugar de destinatarios reales, para pruebas)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=Método de envío de e-mails
 MAIN_MAIL_SMTPS_ID=ID de autentificación SMTP  si se requiere autenticación SMTP
 MAIN_MAIL_SMTPS_PW=Contraseña autentificación SMTP si se requiere autentificación SMTP
@@ -291,7 +292,7 @@ ModuleSetup=Configuración del módulo
 ModulesSetup=Configuración de los módulos
 ModuleFamilyBase=Sistema
 ModuleFamilyCrm=Gestión de Relaciones con Clientes (CRM)
-ModuleFamilySrm=Gestión de Relaciones con Proveedores (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Gestión de productos (PM)
 ModuleFamilyHr=Gestión de recursos humanos (HR)
 ModuleFamilyProjects=Proyectos/Trabajo cooperativo
@@ -373,7 +374,8 @@ NoSmsEngine=No hay disponible ningún gestor de envío de SMS. Los gestores de e
 PDF=PDF
 PDFDesc=Puede definir aquí las opciones globales para la generación de los PDF
 PDFAddressForging=Reglas de visualización de direcciones
-HideAnyVATInformationOnPDF=Ocultar toda la información relacionada con el IVA en la generación de los PDF
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Reglas para %s
 HideLocalTaxOnPDF=Ocultar %s tasa en la columna de impuestos del pdf
 HideDescOnPDF=Ocultar descripción de los productos en la generación de los PDF
@@ -445,12 +447,13 @@ DisplayCompanyInfo=Mostrar dirección de la empresa
 DisplayCompanyManagers=Mostrar nombres de los gestores
 DisplayCompanyInfoAndManagers=Mostrar dirección de la empresa y nombres de los gestores
 EnableAndSetupModuleCron=Si desea tener esta factura recurrente para generarla automáticamente, el módulo *%s* debe estar activado y configurado correctamente. De lo contrario, la generación de facturas debe hacerse manualmente desde esta plantilla con el botón  *Crear*. Tenga en cuenta que incluso si se habilita la generación automática, todavía puede lanzarla generación manual. No es posible la generación de duplicados para el mismo período.
-ModuleCompanyCodeAquarium=Devuelve un código contable compuesto de<br>%s seguido del código tercero de proveedor para el código contable de proveedor,<br>%s seguido del código tercero de cliente para el código contable de cliente.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Devuelve un código contable vacío.
 ModuleCompanyCodeDigitaria=El código contable depende del código de tercero. El código está formado por carácter ' C ' en primera posición seguido de los 5 primeros caracteres del código tercero.
 Use3StepsApproval=De forma predeterminada, los pedidos a proveedor deben ser creados y aprobados por 2 usuarios diferentes (un paso/usuario para crear y un paso/usuario para aprobar. Tenga en cuenta que si el usuario tiene tanto el permiso para crear y aprobar, un paso usuario será suficiente) . Puede pedir con esta opción introducir una tercera etapa de aprobación/usuario, si la cantidad es superior a un valor específico (por lo que serán necesarios 3 pasos: 1 validación, 2=primera aprobación y 3=segunda aprobación si la cantidad es suficiente).<br>Deje vacío si una aprobación (2 pasos) es suficiente, si se establece en un valor muy bajo (0,1) se requiere siempre una segunda aprobación (3 pasos).
 UseDoubleApproval=Usar 3 pasos de aprobación si el importe (sin IVA) es mayor que...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
+WarningPHPMail=ADVERTENCIA: A menudo es mejor configurar el email para usar el servidor de tu proveedor en lugar de la configuración por defecto. Algunos proveedores de correo electrónico (como Yahoo) no le permiten enviar un e-mail desde otro servidor que no sea el servidor de Yahoo. Tu configuración actual usa el servidor de la aplicación para enviar emails y no el servidor de tu proveedor de correo, así que algunos destinatarios (aquellos compatibles con el protocolo restrictivo DMARC), preguntarán a tu proveedor de correo si pueden aceptar el correo y otros proveedores (como Yahoo) pueden responder "no" porque el servidor no es uno de sus servidores, así que tus correos enviados pueden no ser aceptados (vigila también la cuota de envío de tu servidor de correo). <br>Si su proveedor de correo electrónico (como Yahoo) tiene esta restricción, debe cambiar la configuración de e-mail para elegir el método "servidor SMTP" y introducir el servidor SMTP y credenciales proporcionadas por su proveedor de correo electrónico (pregunte a su proveedor de correo electrónico las credenciales SMTP para su cuenta).
 WarningPHPMail2=Si su proveedor SMTP de correo electrónico necesita restringir el cliente de correo electrónico a algunas direcciones IP (muy raro), esta es la dirección IP de su aplicación ERP CRM: <strong>%s</strong>.
 ClickToShowDescription=Clic para ver la descripción
 DependsOn=Este módulo necesita los módulos
@@ -470,7 +473,10 @@ WatermarkOnDraftExpenseReports=Marca de agua en los informes de gastos
 AttachMainDocByDefault=Establezca esto en 1 si desea adjuntar el documento principal al e-mail de forma predeterminada (si corresponde)
 FilesAttachedToEmail=Adjuntar archivo
 SendEmailsReminders=Enviar recordatorios de la agenda por correo electrónico
-davDescription=Add a component to be a DAV server
+davDescription=Agregue un componente para ser un servidor DAV
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=Usuarios y grupos
 Module0Desc=Gestión de Usuarios / Empleados y grupos
@@ -479,7 +485,7 @@ Module1Desc=Gestión de terceros (empresas, particulares) y contactos
 Module2Name=Comercial
 Module2Desc=Gestión comercial
 Module10Name=Contabilidad
-Module10Desc=Activación de informes simples de contabilidad (diarios, ventas) basados en el contenido de la base de datos. Sin desgloses.
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=Presupuestos
 Module20Desc=Gestión de presupuestos/propuestas comerciales
 Module22Name=E-Mailings
@@ -546,8 +552,8 @@ Module400Name=Proyectos/Oportunidades/Leads
 Module400Desc=Gestión de proyectos, oportunidades/leads o tareas, Puede asignar cualquier elemento (factura, pedido, presupuesto, intervención...) a un proyecto y obtener una vista transversal del proyecto
 Module410Name=Webcalendar
 Module410Desc=Interfaz con el calendario Webcalendar
-Module500Name=Pagos especiales
-Module500Desc=Gestión de gastos especiales (impuestos, gastos sociales, dividendos)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Pago de salarios
 Module510Desc=Registro y seguimiento del pago de los salarios de su empleado
 Module520Name=Crédito
@@ -561,14 +567,14 @@ Module700Name=Donaciones
 Module700Desc=Gestión de donaciones
 Module770Name=Informes de gastos
 Module770Desc=Gestión de informes de gastos (transporte, dietas, etc.)
-Module1120Name=Presupuesto de proveedor
-Module1120Desc=Solicitud presupuesto y precios a proveedor
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Interfaz con el sistema de seguimiento de incidencias Mantis
 Module1520Name=Generación Documento
 Module1520Desc=Generación de documentos de correo masivo
 Module1780Name=Etiquetas/Categorías
-Module1780Desc=Crear etiquetas/Categoría(Productos, clientes,proveedores,contactos y miembros)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=Editor WYSIWYG
 Module2000Desc=Permite la edición de un área de texto con un editor avanzado (Basado en CKEditor)
 Module2200Name=Precios dinámicos
@@ -576,7 +582,7 @@ Module2200Desc=Activar el uso de expresiones matemáticas para precios
 Module2300Name=Tareas programadas
 Module2300Desc=Gestión del Trabajo programado (alias cron)
 Module2400Name=Eventos/Agenda
-Module2400Desc=Siga los eventos o citas. Registre eventos manuales en las agendas o deje a la aplicación registrar eventos automáticos para fines de seguimiento.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=GED / SGD
 Module2500Desc=Sistema de Gestión de Documentos / Gestión Electrónica de Contenidos. Organización automática de sus documentos generados o almacenados. Compártalos cuando lo necesite.
 Module2600Name=API/Servicios web (servidor SOAP)
@@ -613,7 +619,7 @@ Module50100Desc=Módulo punto de venta (TPV)
 Module50200Name=Paypal
 Module50200Desc=Módulo para ofrecer pagos online aceptando pagos utilizando PayPal (tarjeta de crédito o crédito PayPal). Esto puede ser usado para permitir a tus clientes realizar pagos libres o pagos en un objeto de Dolibarr en particular (factura, pedido...)
 Module50400Name=Contabilidad (avanzada)
-Module50400Desc=Gestión contable (doble partida, libros generales y auxiliares)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=PrintIPP
 Module54000Desc=La impresión directa (sin abrir los documentos) usa el interfaz Cups IPP (La impresora debe ser visible por el servidor y CUPS debe estar instalado en el servidor)
 Module55000Name=Encuesta o Voto
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerancia de retraso entes de la alerta  (en días) s
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerancia de retraso entes de la alerta  (en días) sobre cheques a ingresar
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerancia de retraso entes de la alerta  (en días) sobre gastos a aprobar
 SetupDescription1=El área de configuración sirve para configurar los parámetros antes de empezar a usar Dolibarr
-SetupDescription2=Los dos pasos más importantes de configuración son los dos primeros en el menú de configuración de la izquierda: la página de configuración %s y la página de configuración %s:
-SetupDescription3=Los parámetros del menú <a href="%s">%s->%s</a> son necesarios porque los datos definidos se utilizan en las pantallas de Dolibarr y para personalizar el comportamiento predeterminado del software (por ejemplo, para las características relacionadas con el país).
-SetupDescription4=Los parámetros de configuración del menú <a href="%s">%s -> %s</a> son necesarios porque Dolibarr es un ERP/CRM una colección de varios módulos, todos más o menos independientes. Se añadirán nuevas funcionalidades a los menús por cada módulo que se active.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=Las otras entradas de configuración gestionan parámetros opcionales.
 LogEvents=Auditoría de la seguridad de eventos
 Audit=Auditoría
@@ -1054,8 +1060,9 @@ LogEventDesc=Puede habilitar el registro de eventos de seguridad Dolibarr aquí.
 AreaForAdminOnly=Los parámetros de configuración solamente pueden ser tratados por <b>usuarios administrador</b>
 SystemInfoDesc=La información del sistema es información técnica accesible solamente en solo lectura a los administradores.
 SystemAreaForAdminOnly=Esta área solo es accesible a los usuarios de tipo administradores. Ningún permiso Dolibarr permite extender el círculo de usuarios autorizados a esta área.
-CompanyFundationDesc=Edite en esta página toda la información conocida de la empresa o institución que necesita gestionar (Para ello haga click en el botón "Modificar" o "Grabar" a pie de página)
-AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
+AccountantDesc=Edite en esta página toda la información conocida de su contable/auditor
+AccountantFileNumber=File number
 DisplayDesc=Puede encontrar aquí todos los parámetros relacionados con la apariencia de Dolibarr
 AvailableModules=Módulos disponibles
 ToActivateModule=Para activar los módulos, vaya al área de Configuración (Inicio->Configuración->Módulos).
@@ -1188,11 +1195,11 @@ UserMailRequired=E-Mail necesario para crear un usuario nuevo
 HRMSetup=Setup del módulo RRHH
 ##### Company setup #####
 CompanySetup=Configuración del módulo terceros
-CompanyCodeChecker=Módulo de generación y control de los códigos de terceros (clientes/proveedores)
-AccountCodeManager=Módulo de generación de los códigos contables (clientes/proveedores)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=Las notificaciones por e-mail le permite enviar silenciosamente e-mails  automáticos, para algunos eventos Dolibarr. Se pueden definir los destinatarios:
 NotificationsDescUser=* por usuarios, un usuario a la vez.
-NotificationsDescContact=* por contactos de terceros (clientes o proveedores), un contacto a la vez.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* o configurando destinatarios globlalmente en la configuración del módulo.
 ModelModules=Modelos de documentos
 DocumentModelOdt=Generación desde los documentos OpenDocument (Archivo .ODT OpenOffice, KOffice, TextEdit,...)
@@ -1203,6 +1210,9 @@ MustBeUnique=¿Debe ser único?
 MustBeMandatory=¿Obligatorio para crear terceros?
 MustBeInvoiceMandatory=¿Obligatorio para validar facturas?
 TechnicalServicesProvided=Servicios técnicos prestados
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Un vínculo de exportación del calendario en formato <b>%s</b> estará disponible en la url: %s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=Texto libre en presupuestos
 WatermarkOnDraftProposal=Marca de agua en presupuestos borrador (en caso de estar vacío)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Preguntar por cuenta bancaria a usar en el presupuesto
 ##### SupplierProposal #####
-SupplierProposalSetup=Configuración del módulo presupuestos de proveedor
-SupplierProposalNumberingModules=Modelos de numeración de presupuestos de proveedor
-SupplierProposalPDFModules=Modelos de documentos de presupuestos de proveedores
-FreeLegalTextOnSupplierProposal=Texto libre en presupuestos de proveedores
-WatermarkOnDraftSupplierProposal=Marca de agua en presupuestos de proveedor (en caso de estar vacío)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Preguntar por cuenta bancaria a usar en el presupuesto
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Almacén a utilizar para el pedido
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Preguntar por cuenta bancaria a usar en el pedido a proveedor
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=Configuración del módulo pedidos
 OrdersNumberingModules=Módulos de numeración de los pedidos
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=La conexión al servidor '%s' sobre la base '%s' por el usuario
 OSCommerceTestKo1=La conexión al servidor '%s' sobre la base '%s' por el usuario '%s' no se pudo efectuar.
 OSCommerceTestKo2=La conexión al servidor '%s' por el usuario '%s' ha fallado.
 ##### Stock #####
-StockSetup=Configuración del módulo Almacenes
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=Si utiliza un módulo de Punto de Venta (módulo TPV por defecto u otro módulo externo), esta configuración puede ser ignorada por su módulo de Punto de Venta. La mayor parte de módulos TPV están diseñados para crear inmediatamente una factura y decrementar stocks cualquiera que sean estas opciones. Por lo tanto, si usted necesita o no decrementar stocks  en el registro de una venta de su punto de venta, controle también la configuración de su módulo TPV.
 ##### Menu #####
 MenuDeleted=Menú eliminado
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Módulo de numeración de las remesas de cheques
 MultiCompanySetup=Configuración del módulo Multi-empresa
 ##### Suppliers #####
 SuppliersSetup=Configuración del módulo Proveedores
-SuppliersCommandModel=Modelo de pedidos a proveedores completo (logo...)
-SuppliersInvoiceModel=Modelo de facturas de proveedores completo (logo...)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Modelos de numeración de facturas de proveedor
 IfSetToYesDontForgetPermission=Si está seleccionado, no olvides de modificar los permisos en los grupos o usuarios para permitir la segunda aprobación
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=No usar caracteres ambiguos ("1","l","i","|","0","O")
 SalariesSetup=Configuración del módulo salarios
 SortOrder=Ordenación
 Format=Formatear 
-TypePaymentDesc=0:Pago cliente,1:Pago proveedor,2:Tanto pago de cliente como de proveedor
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Include path (definida en la variable %s)
 ExpenseReportsSetup=Configuración del módulo Informe de Gastos
 TemplatePDFExpenseReports=Modelos de documento para generar informes de gastos
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=La instalación de módulos externos d
 ConfFileMustContainCustom=La instalación o construcción de un módulo externo desde la aplicación necesita guardar los archivos del módulo en el directorio <strong>%s</strong>. Para que este directorio sea procesado por Dolibarr, debe configurar su <strong>conf/conf.php</strong> para agregar las 2 líneas de directiva: <br><strong>$dolibarr_main_url_root_alt = '/custom';</strong><br><strong> $dolibarr_main_document_root_alt = '%s/custom';</strong>
 HighlightLinesOnMouseHover=Resaltar líneas de los listados cuando el ratón pasa por encima de ellas
 HighlightLinesColor=Resalta el color de la línea cuando el ratón pasa por encima (mantener vacío para no resaltar)
-TextTitleColor=Color para la página de título
+TextTitleColor=Text color of Page title
 LinkColor=Color para los enlaces
 PressF5AfterChangingThis=Para que sea eficaz el cambio, presione CTRL+F5 en el teclado o borre la memoria caché del navegador después de cambiar este valor
 NotSupportedByAllThemes=Funciona con temas del core, puede no funcionar con temas externos
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=Color de fondo para el Menú superior
 TopMenuDisableImages=Ocultar imágenes en el Menú superior
 LeftMenuBackgroundColor=Color de fondo para el Menú izquierdo
 BackgroundTableTitleColor=Color de fondo para Tabla título línea
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Color de fondo para líneas de tabla odd
 BackgroundTableLineEvenColor=Color de fondo para todas las líneas de tabl
 MinimumNoticePeriod=Período mínimo de notificación (Su solicitud de licencia debe hacerse antes de este período)
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=Ejemplo: +2 (complete sólo si tiene problemas)
 ExpectedChecksum=Esperando la suma de comprobación
 CurrentChecksum=Suma de comprobación actual
 ForcedConstants=Valores requeridos de constantes
-MailToSendProposal=Para enviar presupuesto a cliente
-MailToSendOrder=Para enviar pedido de cliente
-MailToSendInvoice=Para enviar factura a cliente
-MailToSendShipment=Para enviar envío
-MailToSendIntervention=Para enviar intervención
-MailToSendSupplierRequestForQuotation=Para enviar solicitud de presupuesto de proveedor
-MailToSendSupplierOrder=Para enviar pedido a proveedor
-MailToSendSupplierInvoice=Para enviar factura de proveedor
-MailToSendContract=Para enviar un contrato
-MailToThirdparty=Para enviar e-mail desde la página del tercero
-MailToMember=Para enviar un e-mail desde la página de miembro
-MailToUser=Para enviar un e-mail desde la página de usuario
-MailToProject= To send email from project page
+MailToSendProposal=Presupuestos a clientes
+MailToSendOrder=Pedidos de clientes
+MailToSendInvoice=Facturas a clientes
+MailToSendShipment=Envíos
+MailToSendIntervention=Intervenciones
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Contratos
+MailToThirdparty=Terceros
+MailToMember=Miembros
+MailToUser=Usuarios
+MailToProject=Projects page
 ByDefaultInList=Mostrar por defecto en modo lista
 YouUseLastStableVersion=Usa la última versión estable
 TitleExampleForMajorRelease=Ejemplo de mensaje que puede usar para anunciar esta release mayor (no dude en usarlo en sus sitios web)
@@ -1780,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=Margen inferior en PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Establezca esto a sí si este grupo es un cálculo de otros grupos
 EnterCalculationRuleIfPreviousFieldIsYes=Ingrese regla de cálculo si el campo anterior se estableció en Sí (por ejemplo, 'CODEGRP1 + CODEGRP2')
 SeveralLangugeVariatFound=Varias variantes de idioma encontradas
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Configuración del módulo Recursos
 UseSearchToSelectResource=Utilice un formulario de búsqueda para elegir un recurso (en lugar de una lista desplegable).
diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang
index 3db190fe425..ef6708d2b16 100644
--- a/htdocs/langs/es_ES/bills.lang
+++ b/htdocs/langs/es_ES/bills.lang
@@ -109,7 +109,7 @@ CancelBill=Anular una factura
 SendRemindByMail=Enviar recordatorio
 DoPayment=Ingresar pago
 DoPaymentBack=Ingresar reembolso
-ConvertToReduc=Convertir en reducción futura
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convertir lo recibido en exceso en descuento futuro
 ConvertExcessPaidToReduc=Convertir lo recibido en exceso en descuento futuro
 EnterPaymentReceivedFromCustomer=Añadir pago recibido de cliente
@@ -120,7 +120,7 @@ BillStatus=Estado de la factura
 StatusOfGeneratedInvoices=Estado de las facturas generadas
 BillStatusDraft=Borrador (a validar)
 BillStatusPaid=Pagada
-BillStatusPaidBackOrConverted=Reembolsada o convertida en descuento
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Pagada (lista para usarse en factura final)
 BillStatusCanceled=Abandonada
 BillStatusValidated=Validada (a pagar)
@@ -286,8 +286,8 @@ Deposit=Anticipo
 Deposits=Anticipos
 DiscountFromCreditNote=Descuento resultante del abono %s
 DiscountFromDeposit=Pagos de la factura de anticipo %s
-DiscountFromExcessReceived=Payments in excess of invoice %s
-DiscountFromExcessPaid=Payments in excess of invoice %s
+DiscountFromExcessReceived=Pagos recibidos en exceso de la factura %s
+DiscountFromExcessPaid=Pagos recibidos en exceso de la factura %s
 AbsoluteDiscountUse=Este tipo de descuento no puede ser utilizado en una factura antes de su validación
 CreditNoteDepositUse=La factura debe ser validada para usar este tipo de crédito.
 NewGlobalDiscount=Nuevo descuento fijo
@@ -296,10 +296,10 @@ DiscountType=Tipo de descuento
 NoteReason=Nota/Motivo
 ReasonDiscount=Motivo
 DiscountOfferedBy=Acordado por
-DiscountStillRemaining=Descuentos disponibles
-DiscountAlreadyCounted=Descuentos ya consumidos
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Descuentos a clientes
-SupplierDiscounts=Descuentos de proveedores
+SupplierDiscounts=Vendors discounts
 BillAddress=Dirección de facturación
 HelpEscompte=Un <b>descuento</b> es un descuento acordado sobre una factura dada, a un cliente que realizó su pago mucho antes del vencimiento.
 HelpAbandonBadCustomer=Este importe se abandonó (cliente juzgado como moroso) y se considera como una pérdida excepcional.
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Permitir  pagos de diferentes terceros de la empres
 PaymentNote=Nota del pago
 ListOfPreviousSituationInvoices=Listado de facturas de situación previas
 ListOfNextSituationInvoices=Listado de las próximas facturas de situación
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Cada %s días
 FrequencyPer_m=Cada %s meses
 FrequencyPer_y=Cada %s años
@@ -348,10 +354,10 @@ NextDateToExecution=Fecha para la generación de la próxima factura
 NextDateToExecutionShort=Fecha próxima generación
 DateLastGeneration=Fecha de la última generación
 DateLastGenerationShort=Fecha última generación
-MaxPeriodNumber=Max number of invoice generation
-NbOfGenerationDone=Number of invoice generation already done
-NbOfGenerationDoneShort=Number of generation done
-MaxGenerationReached=Maximum number of generations reached
+MaxPeriodNumber=Nº máximo de facturas a generar
+NbOfGenerationDone=Nº de facturas ya generadas
+NbOfGenerationDoneShort=Generados
+MaxGenerationReached=Máximo número de generaciones alcanzado
 InvoiceAutoValidate=Validar facturas automáticamente
 GeneratedFromRecurringInvoice=Generado desde la plantilla de facturas recurrentes %s
 DateIsNotEnough=Aún no se ha alcanzado la fecha
@@ -505,9 +511,14 @@ SituationAmount=Importe Factura situación (Sin IVA)
 SituationDeduction=Deducción situación
 ModifyAllLines=Modificar todas las líneas
 CreateNextSituationInvoice=Crear próxima situación
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=Esta factura no es del último de ciclo y no debe ser modificada.
 DisabledBecauseNotLastInCycle=La próxima situación ya existe.
 DisabledBecauseFinal=Esta situación es la última.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=S
 CantBeLessThanMinPercent=El progreso de una línea no puede ser inferior a su valor a la situación anterior.
 NoSituations=Sin situaciones abiertas
 InvoiceSituationLast=Factura final y general
@@ -532,3 +543,4 @@ AutoFillDateFrom=Definir fecha de inicio para la línea de servicio con fecha de
 AutoFillDateFromShort=Definir fecha de inicio
 AutoFillDateTo=Establecer fecha de finalización para la línea de servicio con la próxima fecha de facturación
 AutoFillDateToShort=Definir fecha de finalización
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/es_ES/categories.lang b/htdocs/langs/es_ES/categories.lang
index 6a834e36fea..9a1a71d28c7 100644
--- a/htdocs/langs/es_ES/categories.lang
+++ b/htdocs/langs/es_ES/categories.lang
@@ -85,3 +85,4 @@ CategorieRecursivHelp=Si está activado, el producto se enlazará a la categorí
 AddProductServiceIntoCategory=Añadir el siguiente producto/servicio
 ShowCategory=Mostrar etiqueta/categoría
 ByDefaultInList=Por defecto en lista
+ChooseCategory=Choose category
diff --git a/htdocs/langs/es_ES/commercial.lang b/htdocs/langs/es_ES/commercial.lang
index 9e33106a404..7682a8572be 100644
--- a/htdocs/langs/es_ES/commercial.lang
+++ b/htdocs/langs/es_ES/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=Cierre
 ActionAC_EMAILING=Envío mailing masivo
 ActionAC_COM=Envío pedido de cliente por correo
 ActionAC_SHIP=Envío expedición por correo
-ActionAC_SUP_ORD=Envío pedido a proveedor por correo
-ActionAC_SUP_INV=Envío factura de proveedor por correo
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=Otra
 ActionAC_OTH_AUTO=Eventos creados automáticamente
 ActionAC_MANUAL=Eventos creados manualmente
diff --git a/htdocs/langs/es_ES/companies.lang b/htdocs/langs/es_ES/companies.lang
index 381bc370547..1736c591f63 100644
--- a/htdocs/langs/es_ES/companies.lang
+++ b/htdocs/langs/es_ES/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=¿Está seguro de querer eliminar este contacto y toda la i
 MenuNewThirdParty=Nuevo tercero
 MenuNewCustomer=Nuevo cliente
 MenuNewProspect=Nuevo cliente potencial
-MenuNewSupplier=Nuevo proveedor
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=Nuevo particular
-NewCompany=Nueva empresa (cliente potencial, cliente, proveedor)
-NewThirdParty=Nuevo tercero (cliente potencial, cliente, proveedor)
-CreateDolibarrThirdPartySupplier=Crear un tercero (proveedor)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=Crear tercero
 CreateThirdPartyAndContact=Crear un tercero + un contacto
 ProspectionArea=Área de prospección
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=Clientes potenciales
 ThirdPartyCustomers=Clientes
 ThirdPartyCustomersStats=Clientes
 ThirdPartyCustomersWithIdProf12=Clientes con %s ó %s
-ThirdPartySuppliers=Proveedores
+ThirdPartySuppliers=Vendors
 ThirdPartyType=Tipo de tercero
 Individual=Particular
 ToCreateContactWithSameName=Creará automáticamente un contacto físico con la misma información. en la mayoría de casos. En la mayoría de los casos, incluso si el tercero es una persona física, la creación de un tercero por sí solo es suficiente.
@@ -77,11 +77,11 @@ Web=Web
 Poste= Puesto
 DefaultLang=Idioma por defecto
 VATIsUsed=IVA está siendo usado
-VATIsUsedWhenSelling=Esto define si este tercero incluye un impuesto a la venta o no cuando realiza una factura a sus propios clientes
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=IVA no está siendo usado
 CopyAddressFromSoc=Copiar dirección de la empresa
-ThirdpartyNotCustomerNotSupplierSoNoRef=Tercero que no es cliente ni proveedor, sin objetos referenciados
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Tercero que no es cliente ni proveedor, descuentos no disponibles
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Cuenta bancaria de pago
 OverAllProposals=Presupuestos
 OverAllOrders=Pedidos
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=Tasa RE
 TypeLocaltax2ES=Tasa IRPF
 WrongCustomerCode=Código cliente incorrecto
-WrongSupplierCode=Código proveedor incorrecto
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Modelo de código cliente
-SupplierCodeModel=Modelo de código proveedor
+SupplierCodeModel=Vendor code model
 Gencod=Código de barras
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
@@ -267,7 +267,7 @@ Prospect=Cliente potencial
 CustomerCard=Ficha cliente
 Customer=Cliente
 CustomerRelativeDiscount=Descuento cliente relativo
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=Descuento relativo
 CustomerAbsoluteDiscountShort=Descuento fijo
 CompanyHasRelativeDiscount=Este cliente tiene un descuento por defecto de <b>%s%%</b>
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=Tiene abonos para <b> %s </b> %s en este proveedor
 CompanyHasNoAbsoluteDiscount=Este cliente no tiene más descuentos fijos disponibles
 CustomerAbsoluteDiscountAllUsers=Descuentos fijos a clientes (acordado por todos los usuarios)
 CustomerAbsoluteDiscountMy=Descuentos fijos a clientes (acordados personalmente)
-SupplierAbsoluteDiscountAllUsers=Descuentos fijos de proveedores (acordado por todos los usuarios)
-SupplierAbsoluteDiscountMy=Descuentos fijos de proveedores (acordados personalmente)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=Ninguna
 Supplier=Proveedor
 AddContact=Crear contacto
@@ -304,13 +304,13 @@ DeleteACompany=Eliminar una empresa
 PersonalInformations=Información personal
 AccountancyCode=Cuenta contable
 CustomerCode=Código cliente
-SupplierCode=Código proveedor
+SupplierCode=Vendor code
 CustomerCodeShort=Código cliente
-SupplierCodeShort=Código proveedor
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=Código único cliente para cada cliente
-SupplierCodeDesc=Código único proveedor para cada proveedor
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=Requerida si el tercero es un cliente o cliente potencial
-RequiredIfSupplier=Requerida si el tercero es un proveedor
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=Validación controlada por el módulo
 ThisIsModuleRules=Esta es la regla para este módulo
 ProspectToContact=Cliente potencial a contactar
@@ -338,7 +338,7 @@ MyContacts=Mis contactos
 Capital=Capital
 CapitalOf=Capital de %s
 EditCompany=Modificar empresa
-ThisUserIsNot=Este usuario no es ni un cliente potencial, ni un cliente, ni un proveedor
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=Verificar
 VATIntraCheckDesc=El link <b>%s</b> permite consultar al servicio europeo de control de números de IVA intracomunitario. Se requiere acceso a internet para que el servicio funcione
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -396,7 +396,7 @@ ImportDataset_company_4=Terceros/Comerciales (Asigna usuarios comerciales a terc
 PriceLevel=Nivel de precios
 DeliveryAddress=Dirección de envío
 AddAddress=Añadir dirección
-SupplierCategory=Categoría de proveedor
+SupplierCategory=Vendor category
 JuridicalStatus200=Independiente
 DeleteFile=Eliminación de un archivo
 ConfirmDeleteFile=¿Está seguro de querer eliminar este archivo?
@@ -406,7 +406,7 @@ FiscalYearInformation=Información del año fiscal
 FiscalMonthStart=Mes de inicio de ejercicio
 YouMustAssignUserMailFirst=Primero debe indicar un e-mail para este usuario para poder añadirlo en e-mails de notificaciones.
 YouMustCreateContactFirst=Para poder añadir notificaciones por e-mail, primero debe definir contactos con e-mails válidos en el tercero
-ListSuppliersShort=Listado de proveedores
+ListSuppliersShort=List of vendors
 ListProspectsShort=Listado de clientes potenciales
 ListCustomersShort=Listado de clientes
 ThirdPartiesArea=Área terceros y contactos
@@ -420,7 +420,7 @@ CurrentOutstandingBill=Riesgo alcanzado
 OutstandingBill=Importe máximo para facturas pendientes
 OutstandingBillReached=Importe máximo para facturas pendientes
 OrderMinAmount=Importe mínimo para pedido
-MonkeyNumRefModelDesc=Devuelve un número bajo el formato %syymm-nnnn para los códigos de clientes y %syymm-nnnn para los códigos de los proveedores, donde yy es el año, mm el mes y nnnn un contador secuencial sin ruptura y sin volver a 0.
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=Código de cliente/proveedor libre sin verificación. Puede ser modificado en cualquier momento.
 ManagingDirectors=Administrador(es) (CEO, director, presidente, etc.)
 MergeOriginThirdparty=Tercero duplicado (tercero que debe eliminar)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Inicio de sesión del comercial
 SaleRepresentativeFirstname=Nombre del comercial
 SaleRepresentativeLastname=Apellidos del comercial
 ErrorThirdpartiesMerge=Se produjo un error al eliminar los terceros. Por favor, compruebe el log. Los cambios han sido anulados.
-NewCustomerSupplierCodeProposed=El código de cliente o proveedor sugerido se encuentra duplicado
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang
index 6a8b4710e30..5218a96064c 100644
--- a/htdocs/langs/es_ES/compta.lang
+++ b/htdocs/langs/es_ES/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=Total pagado
 VATToPay=Ventas IVA
 VATReceived=IVA repercutido
 VATToCollect=IVA compras
-VATSummary=Balance de IVA
+VATSummary=Tax monthly
+VATBalance=Balance de IVA
 VATPaid=IVA Pagado
 LT1Summary=Saldo IRPF
 LT2Summary=Resumen de IRPF
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=Área contabilidad/tesorería
 NewPayment=Nuevo pago
 Payments=Pagos
 PaymentCustomerInvoice=Cobro factura a cliente
-PaymentSupplierInvoice=Pago factura de proveedor
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Pagos tasas sociales/fiscales
 PaymentVat=Pago IVA
 ListPayment=Listado de pagos
 ListOfCustomerPayments=Listado de pagos de clientes
-ListOfSupplierPayments=Listado de pagos a proveedores
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Fecha inicio periodo
 DateEndPeriod=Fecha final periodo
 newLT1Payment=Nuevo pago de RE
@@ -103,14 +104,14 @@ LT2PaymentsES=Pagos IRPF
 VATPayment=Pago IVA
 VATPayments=Pagos IVA
 VATRefund=Devolución IVA
-NewVATPayment=New sales tax payment
+NewVATPayment=Nuevo pago IVA
 Refund=Devolución
 SocialContributionsPayments=Pagos tasas sociales/fiscales
 ShowVatPayment=Ver pagos IVA
 TotalToPay=Total a pagar
 BalanceVisibilityDependsOnSortAndFilters=El balance es visible en esta lista sólo si la tabla está ordenada ascendente en %s y se filtra para 1 cuenta bancaria
 CustomerAccountancyCode=Código contable cliente
-SupplierAccountancyCode=Código contable proveedor
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cód. cuenta cliente
 SupplierAccountancyCodeShort=Cód. cuenta proveedor
 AccountNumber=Número de cuenta
@@ -165,17 +166,19 @@ RulesResultBookkeepingPersonalized=Muestra un registro en su libro mayor con cue
 SeePageForSetup=Vea el menú <a href="%s">%s</a> para configurarlo
 DepositsAreNotIncluded=- Las facturas de anticipo no están incluidas
 DepositsAreIncluded=- Las facturas de anticipo están incluidas
-LT1ReportByCustomers=Report tax 2 by third party
-LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomers=Informe por terceros del RE
+LT2ReportByCustomers=Informe por tercero del IRPF
 LT1ReportByCustomersES=Informe de RE por terceros
 LT2ReportByCustomersES=Informe por tercero del IRPF
 VATReport=Informe IVA
 VATReportByPeriods=Informe de IVA por período
-VATReportByCustomers=Sale tax report by customer
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
+VATReportByCustomers=Informe IVA por cliente
 VATReportByCustomersInInputOutputMode=Informe por cliente del IVA repercutido y soportado
 VATReportByQuartersInInputOutputMode=Informe por tasa del IVA repercutido y soportado
-LT1ReportByQuarters=Report tax 2 by rate
-LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuarters=Informe de IRPF por tasa
+LT2ReportByQuarters=Informe de IRPF por tasa
 LT1ReportByQuartersES=Informe de RE por tasa
 LT2ReportByQuartersES=Informe de IRPF por tasa
 SeeVATReportInInputOutputMode=Ver el informe <b>%sIVA pagado%s</b> para un modo de cálculo estandard
@@ -207,7 +210,7 @@ Pcg_version=Modelos de planes contables
 Pcg_type=Tipo de cuenta
 Pcg_subtype=Subtipo de cuenta
 InvoiceLinesToDispatch=Líneas de facturas a contabilizar
-ByProductsAndServices=Por productos y servicios
+ByProductsAndServices=By product and service
 RefExt=Ref. externa
 ToCreateAPredefinedInvoice=Para crear una plantilla de factura, cree una factura estándar, seguidamente, sin validarla, haga clic en el botón "%s".
 LinkedOrder=Enlazar a un pedido
@@ -215,7 +218,8 @@ Mode1=Método 1
 Mode2=Método 2
 CalculationRuleDesc=Para calcular el IVA total hay 2 métodos:<br>El método 1 consiste en redondear el IVA en cada línea y luego sumarlo .<br>El método 2 consiste en sumar el IVA de cada línea y luego redondear el resultado.<br>El resultado final puede variar unos céntimos. El modo por defecto es el método <b>%s</b>.
 CalculationRuleDescSupplier=Según el proveedor, elija el método adecuado para aplicar misma regla de cálculo y obtener el resultado esperado por su proveedor.
-TurnoverPerProductInCommitmentAccountingNotRelevant=El informe de ventas por producto, cuando se utiliza en modo <b>contabilidad de caja</b> no es relevante. Este informe sólo está disponible cuando se utiliza en modo <b>contabilidad de compromiso</b> (consulte la configuración del módulo de contabilidad).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Modo de cálculo
 AccountancyJournal=Código contable diario
 ACCOUNTING_VAT_SOLD_ACCOUNT=Cuenta contable por defecto para el IVA de ventas (usado si no se define en el diccionario de IVA)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Cuenta contable por defecto para el IVA de compras (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Código contable por defecto para el pago de IVA
 ACCOUNTING_ACCOUNT_CUSTOMER=Cuenta contable a usar para clientes
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Se utilizará una cuenta contable dedicada definida en la ficha de terceros para el relleno del Libro Mayor,  o como valor predeterminado de la contabilidad del Libro Mayor si no se define una cuenta contable en la ficha del tercero
-ACCOUNTING_ACCOUNT_SUPPLIER=Cuenta contable a usar para proveedores
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Se utilizará una cuenta contable dedicada definida en la ficha de terceros para el relleno del Libro Mayor, o como valor predeterminado de la contabilidad del Libro Mayor si no se define una cuenta contable en la ficha del tercero
 CloneTax=Clonar una tasa social/fiscal
 ConfirmCloneTax=Confirmar la clonación de una tasa social/fiscal
@@ -242,3 +246,10 @@ FiscalPeriod=Periodo contable
 ListSocialContributionAssociatedProject=Listado de contribuciones sociales asociadas al proyecto
 DeleteFromCat=Eliminar del grupo de contabilidad
 AccountingAffectation=Asignación de cuenta contable
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/es_ES/dict.lang b/htdocs/langs/es_ES/dict.lang
index d3215ca4b93..c034f2f530b 100644
--- a/htdocs/langs/es_ES/dict.lang
+++ b/htdocs/langs/es_ES/dict.lang
@@ -5,6 +5,7 @@ CountryIT=Italia
 CountryES=España
 CountryDE=Alemania
 CountryCH=Suiza
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
 CountryGB=Reino Unido
 CountryUK=Reino Unido
 CountryIE=Irlanda
diff --git a/htdocs/langs/es_ES/ecm.lang b/htdocs/langs/es_ES/ecm.lang
index d0dd4ed578a..9c8bacea31b 100644
--- a/htdocs/langs/es_ES/ecm.lang
+++ b/htdocs/langs/es_ES/ecm.lang
@@ -14,8 +14,8 @@ ECMNbOfFilesInDir=Número de archivos en el directorio
 ECMNbOfSubDir=Número de subdirectorios
 ECMNbOfFilesInSubDir=Número de archivos en los subdirectorios
 ECMCreationUser=Creador
-ECMArea=Área GED
-ECMAreaDesc=El área GED (Gestión Electrónica de Documentos) le permite guardar, compartir y buscar rápidamente todo tipo de documentos en Dolibarr.
+ECMArea=Área SGD/GED
+ECMAreaDesc=El área SGD/GED (Sistema Gestión Documental / Gestión Electrónica de Documentos) le permite guardar, compartir y buscar rápidamente todo tipo de documentos en Dolibarr.
 ECMAreaDesc2=Puede crear directorios manuales y adjuntar los documentos<br>Los directorios automáticos son rellenados automáticamente en la adición de un documento en una ficha.
 ECMSectionWasRemoved=El directorio <b>%s</b> ha sido eliminado
 ECMSectionWasCreated=El directorio <b> %s </b> ha sido creado.
@@ -39,7 +39,8 @@ ShowECMSection=Mostrar directorio
 DeleteSection=Eliminación directorio
 ConfirmDeleteSection=¿Está seguro de querer eliminar el directorio <b>%s</b>?
 ECMDirectoryForFiles=Directorio relativo para archivos
-CannotRemoveDirectoryContainsFiles=No se puede eliminar porque contiene archivos
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=Explorador de archivos
 ECMSelectASection=Seleccione un directorio en el árbol de la izquierda
 DirNotSynchronizedSyncFirst=Este directorio fue creado o modificado fuera del módulo GED. Haga clic en el botón "Actualizar" para resincronizar la información del disco y la base  de datos para ver el contenido de ese directorio.
diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang
index a5fd83f9e9b..26902fa0858 100644
--- a/htdocs/langs/es_ES/errors.lang
+++ b/htdocs/langs/es_ES/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Código de barras requerido
 ErrorCustomerCodeAlreadyUsed=Código de cliente ya utilizado
 ErrorBarCodeAlreadyUsed=El código de barras ya está siendo utilizado
 ErrorPrefixRequired=Prefijo obligatorio
-ErrorBadSupplierCodeSyntax=LA sintaxis del código proveedor es incorrecta
-ErrorSupplierCodeRequired=Código proveedor obligatorio
-ErrorSupplierCodeAlreadyUsed=Código de proveedor ya utilizado
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Parámetros incorrectos
 ErrorBadValueForParameter=valor '%s' incorrecto para el parámetro '%s'
 ErrorBadImageFormat=El archivo de imagen es de un formato no soportado (Su PHP no soporta las funciones de conversión de este formato de imagen)
@@ -87,7 +87,7 @@ ErrorsOnXLines=Errores en <b>%s</b> líneas fuente
 ErrorFileIsInfectedWithAVirus=¡El antivirus no ha podido validar este archivo (es probable que esté infectado por un virus)!
 ErrorSpecialCharNotAllowedForField=Los caracteres especiales no son admitidos por el campo "%s"
 ErrorNumRefModel=Hay una referencia en la base de datos (%s) y es incompatible con esta numeración. Elimine la línea o renombre la referencia para activar este módulo.
-ErrorQtyTooLowForThisSupplier=Cantidad insuficiente para este proveedor
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=La configuración del módulo parece incompleta. Vaya a Inicio - Configuración - Módulos para completarla.
 ErrorBadMask=Error en la máscara
 ErrorBadMaskFailedToLocatePosOfSequence=Error, sin número de secuencia en la máscara
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Definición incorrecta de la mat
 ErrorSavingChanges=Ha ocurrido un error al guardar los cambios
 ErrorWarehouseRequiredIntoShipmentLine=El almacén es obligatorio en la línea a enviar
 ErrorFileMustHaveFormat=El archivo debe tener el formato %s
-ErrorSupplierCountryIsNotDefined=El país de este proveedor no está definido, corríjalo en su ficha
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=No se han podido fusionar los dos registros. Petición cancelada. 
 ErrorStockIsNotEnoughToAddProductOnOrder=No hay stock suficiente del producto %s para añadirlo a un nuevo pedido.
 ErrorStockIsNotEnoughToAddProductOnInvoice=No hay stock suficiente del producto %s para añadirlo a una nueva factura.
diff --git a/htdocs/langs/es_ES/install.lang b/htdocs/langs/es_ES/install.lang
index d35c414f40c..1fa0b696989 100644
--- a/htdocs/langs/es_ES/install.lang
+++ b/htdocs/langs/es_ES/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=¡El archivo de configuración <b>%s</
 ConfFileCouldBeCreated=El archivo de configuración <b>%s</b> se ha creado.
 ConfFileIsNotWritable=El archivo <b>%s</b> no es modificable. Para una primera instalación, modifique sus permisos. El servidor Web debe tener el derecho a escribir en este archivo durante la configuración ("chmod 666" por ejemplo sobre un SO compatible UNIX).
 ConfFileIsWritable=El archivo <b>%s</b> es modificable.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Recargar toda la información del archivo de configuración.
 PHPSupportSessions=Este PHP soporta sesiones
 PHPSupportPOSTGETOk=Este PHP soporta bien las variables POST y GET.
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=No se pudo crear la cuenta de administrador Dolibarr.
 WarningRemoveInstallDir=Atención, por razones de seguridad, con el fin de bloquear un nuevo uso de las herramientas de instalación/actualización, es aconsejable crear en el directorio raíz de Dolibarr un archivo llamado <b>install.lock</b> en solo lectura.
 FunctionNotAvailableInThisPHP=No disponible en este PHP
 ChoosedMigrateScript=Elección del script de migración
-DataMigration=Migración de los datos
-DatabaseMigration=Migración del formato de la base de datos
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Ejecución del script
 ChooseYourSetupMode=Elija su método de instalación y haga clic en "Empezar"...
 FreshInstall=Primera instalación
@@ -146,7 +147,7 @@ NothingToDo=Nada que hacer
 # upgrade
 MigrationFixData=Corrección de datos desnormalizados
 MigrationOrder=Migración de datos de los pedidos clientes
-MigrationSupplierOrder=Migración de datos de los pedidos a proveedores
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Migración de datos de presupuestos
 MigrationInvoice=Migración de datos de las facturas a clientes
 MigrationContract=Migración de datos de los contratos
@@ -196,6 +197,8 @@ MigrationEvents=Migración de eventos para agregar propietario de evento en la t
 MigrationEventsContact=Migración de eventos para agregar contacto de evento en la tabla de asignación
 MigrationRemiseEntity=Actualizando el campo entity de llx_societe_remise
 MigrationRemiseExceptEntity=Actualizando el campo entity de llx_societe_remise_except
+MigrationUserRightsEntity=Actualizando el campo entity de llx_user_rights
+MigrationUserGroupRightsEntity=Actualizando el campo entity de llx_usergroup_rights
 MigrationReloadModule=Recargar módulo %s
 MigrationResetBlockedLog=Restablecer el módulo BlockedLog para el algoritmo v7
 ShowNotAvailableOptions=Mostrar opciones no disponibles
diff --git a/htdocs/langs/es_ES/ldap.lang b/htdocs/langs/es_ES/ldap.lang
index 67d0b793297..f3d55669eb9 100644
--- a/htdocs/langs/es_ES/ldap.lang
+++ b/htdocs/langs/es_ES/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Contraseña del dominio
 YouMustChangePassNextLogon=La contraseña de <b>%s</b> en el dominio <b>%s</b> debe de ser modificada.
 UserMustChangePassNextLogon=El usuario debe cambiar de contraseña en la próxima conexión
 LDAPInformationsForThisContact=Información de la base de datos LDAP de este contacto
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Tipo de miembro sincronizado
 ContactSynchronized=Contacto sincronizado
 ForceSynchronize=Forzar sincronización Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Error de la lectura del directorio LDAP. Comprobar la configuración del módulo LDAP y la accesibilidad del anuario.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/es_ES/loan.lang b/htdocs/langs/es_ES/loan.lang
index f0badf583c7..c560af41726 100644
--- a/htdocs/langs/es_ES/loan.lang
+++ b/htdocs/langs/es_ES/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=Capital
 Insurance=Seguro
 Interest=Interés
 Nbterms=Plazos
+Term=Term
 LoanAccountancyCapitalCode=Cuenta contable capital
 LoanAccountancyInsuranceCode=Cuenta contable seguro
 LoanAccountancyInterestCode=Cuenta contable interés
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=¿Está seguro de querer eliminar este préstamo?
 LoanDeleted=Préstamo eliminado correctamente
 ConfirmPayLoan=¿Esa seguro de querer clasificar como pagado este préstamo?
 LoanPaid=Préstamo pagado
-# Calc
-LoanCalc=Calculadora de préstamos bancarios
-PurchaseFinanceInfo=Información de Compras y Financiamiento
-SalePriceOfAsset=Precio de venta del Capital
-PercentageDown=Porcentaje
-LengthOfMortgage=Duración del préstamo
-AnnualInterestRate=Interés anual
-ExplainCalculations=Explicación de los cálculos
-ShowMeCalculationsAndAmortization=Mostrar los cálculos y amortización
-MortgagePaymentInformation=Información sobre hipoteca
-DownPayment=Depósito
-DownPaymentDesc=El <b>pago inicial</b> = Precio inicial multiplicado por el porcentaje inicial dividido por 100 (para un inicial de 5% se convierte en 5/100 o 0.05)
-InterestRateDesc=La <b>tasa de interés</b> = El porcentaje de interés anual dividido por 100
-MonthlyFactorDesc=El <b>factor mensual</b> = El resultado de la siguiente fórmula
-MonthlyInterestRateDesc=La <b>tasa de interés mensual</b> = La tasa de interés anual dividido por 12 (para los 12 meses en un año)
-MonthTermDesc=El <b>plazo en meses</b> del préstamo = El número de años del préstamo multiplicado por 12
-MonthlyPaymentDesc=El pago mensual se calcula utilizando la siguiente fórmula
-AmortizationPaymentDesc=La <a href="#amortization">amortización</a> desglosa la cantidad de su pago mensual, tanto del interés como del capital.
-AmountFinanced=Importe financiado
-AmortizationMonthlyPaymentOverYears=Amortización para pago mensual <b>%s</b> sobre %s años
-Totalsforyear=Totales por año
-MonthlyPayment=Pago mensual
-LoanCalcDesc=Esta <b> calculadora de hipotecas </b> puede utilizarse para calcular el pago mensual de un préstamo, en base a la cantidad prestada, el plazo del préstamo deseado y el tipo de interés.<br> Esta calculadora incluye también SHP (Seguro Hipotecario Privado) para préstamos con pago inicial de menos del 20 %%. También se tienen en consideración los impuestos sobre la propiedad, y su efecto sobre el total del pago mensual de la hipoteca. <br>
-GoToInterest=%s se destinará al INTERÉS
-GoToPrincipal=%s se destinará al PRINCIPAL
-YouWillSpend=Pagará %s en el año %s
 ListLoanAssociatedProject=Listado de préstamos asociados al proyecto
 AddLoan=Crear crédito
+FinancialCommitment=Prestamo
+InterestAmount=Interés
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=Configuración del módulo préstamos
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Cuenta contable por defecto para el capital
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Cuenta contable por defecto para el interés
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Cuenta contable por defecto para el seguro
-FinancialCommitment=Prestamo
 CreateCalcSchedule=Editar el prestamo
-InterestAmount=Cantidad de interés
diff --git a/htdocs/langs/es_ES/mails.lang b/htdocs/langs/es_ES/mails.lang
index 401b7589dd2..ad93ddbb2d8 100644
--- a/htdocs/langs/es_ES/mails.lang
+++ b/htdocs/langs/es_ES/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Remitente
 MailErrorsTo=Errores a
 MailReply=Responder a
 MailTo=Destinatario(s)
+MailToUsers=To user(s)
 MailCC=Copia a
+MailToCCUsers=Copy to users(s)
 MailCCC=Adjuntar copia a
 MailTopic=Asunto del e-mail
 MailText=Mensaje
@@ -78,7 +80,7 @@ ResultOfMailSending=Resultado del envío masivo de e-mails
 NbSelected=Nº seleccionados
 NbIgnored=Nº ignorados
 NbSent=Nº enviados
-SentXXXmessages=%s message(s) sent.
+SentXXXmessages=%s mensaje(s) enviado(s)
 ConfirmUnvalidateEmailing=¿Está seguro de querer cambiar el estado del e-mailing <b>%s</b> a borrador?
 MailingModuleDescContactsWithThirdpartyFilter=Filtro de contactos con tercero
 MailingModuleDescContactsByCompanyCategory=Contactos de terceros por categoría
@@ -164,4 +166,4 @@ InGoingEmailSetup=Configuración del correo entrante
 OutGoingEmailSetupForEmailing=Configuración de correo saliente (para correo masivo)
 DefaultOutgoingEmailSetup=Configuración de correo saliente predeterminada
 Information=Información
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index a7000b66e24..d29f78b8c8d 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -64,14 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=Error, ningún tipo de IVA definido para e
 ErrorNoSocialContributionForSellerCountry=Error, ningún tipo de tasa social/fiscal definida para el país '%s'.
 ErrorFailedToSaveFile=Error, el registro del archivo falló.
 ErrorCannotAddThisParentWarehouse=Intenta añadir un almacén padre que ya es hijo del actual
-MaxNbOfRecordPerPage=Max number of record per page
+MaxNbOfRecordPerPage=Nº máximo de registros por página
 NotAuthorized=No está autorizado para hacer esto.
 SetDate=Fijar fecha
 SelectDate=Seleccione una fecha
 SeeAlso=Ver también %s
 SeeHere=Vea aquí
 ClickHere=Haga clic aquí
-Here=Here
+Here=Aquí
 Apply=Aplicar
 BackgroundColorByDefault=Color de fondo
 FileRenamed=El archivo ha sido renombrado correctamente
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr está configurado en modo
 Administrator=Administrador
 Undefined=No definido
 PasswordForgotten=¿Olvidó su contraseña?
+NoAccount=No account?
 SeeAbove=Mencionado anteriormente
 HomeArea=Área inicio
 LastConnexion=Última conexión
@@ -231,7 +232,7 @@ Limit=Límite
 Limits=Límites
 Logout=Desconexión
 NoLogoutProcessWithAuthMode=Sin funcionalidades de desconexión con el modo de autenticación <b>%s</b>
-Connection=Conexión
+Connection=Usuario
 Setup=Configuración
 Alert=Alerta
 MenuWarnings=Alertas
@@ -331,7 +332,7 @@ Price=Precio
 PriceCurrency=Precio (moneda)
 UnitPrice=Precio unitario
 UnitPriceHT=Precio base
-UnitPriceHTCurrency=Precio unitario (moneda)
+UnitPriceHTCurrency=Precio unitario (sin impuestos) (moneda)
 UnitPriceTTC=Precio unitario total
 PriceU=P.U.
 PriceUHT=P.U.
@@ -359,7 +360,7 @@ AmountLT2ES=Importe IRPF
 AmountTotal=Importe total
 AmountAverage=Importe medio
 PriceQtyMinHT=Precio cantidad min. total
-PriceQtyMinHTCurrency=Precio cantidad min. total (moneda)
+PriceQtyMinHTCurrency=Precio cantidad min. (sin impuestos) (moneda)
 Percentage=Porcentaje
 Total=Total
 SubTotal=Subtotal
@@ -402,6 +403,7 @@ DefaultTaxRate=Tasa de impuesto por defecto
 Average=Media
 Sum=Suma
 Delta=Diferencia
+RemainToPay=Remain to pay
 Module=Módulo
 Modules=Módulos
 Option=Opción
@@ -414,7 +416,7 @@ Favorite=Favorito
 ShortInfo=Info.
 Ref=Ref.
 ExternalRef=Ref. externa
-RefSupplier=Ref. proveedor
+RefSupplier=Ref. vendor
 RefPayment=Ref. pago
 CommercialProposalsShort=Presupuestos
 Comment=Comentario
@@ -493,7 +495,7 @@ Received=Recibido
 Paid=Pagado
 Topic=Asunto
 ByCompanies=Por empresa
-ByUsers=Por usuario
+ByUsers=By user
 Links=Enlaces
 Link=Enlace
 Rejects=Devoluciones
@@ -563,15 +565,15 @@ MonthShort09=sep.
 MonthShort10=oct.
 MonthShort11=nov.
 MonthShort12=dic.
-MonthVeryShort01=J
-MonthVeryShort02=V
-MonthVeryShort03=L
+MonthVeryShort01=E
+MonthVeryShort02=F
+MonthVeryShort03=M
 MonthVeryShort04=A
-MonthVeryShort05=L
+MonthVeryShort05=M
 MonthVeryShort06=J
 MonthVeryShort07=J
 MonthVeryShort08=A
-MonthVeryShort09=D
+MonthVeryShort09=S
 MonthVeryShort10=O
 MonthVeryShort11=N
 MonthVeryShort12=D
@@ -619,9 +621,9 @@ BuildDoc=Generar el documento
 Entity=Entidad
 Entities=Entidades
 CustomerPreview=Historial cliente
-SupplierPreview=Historial proveedor
+SupplierPreview=Vendor preview
 ShowCustomerPreview=Ver historial cliente
-ShowSupplierPreview=Ver historial proveedor
+ShowSupplierPreview=Show vendor preview
 RefCustomer=Ref. cliente
 Currency=Divisa
 InfoAdmin=Información para los administradores
@@ -717,7 +719,7 @@ WarningYouAreInMaintenanceMode=Atención, está en modo mantenimiento, así que
 CoreErrorTitle=Error del sistema
 CoreErrorMessage=Lo sentimos, pero ha ocurrido un error. Póngase en contacto con el administrador del sistema para comprobar los registros o desactive $dolibarr_main_prod=1 para obtener más información.
 CreditCard=Tarjeta de crédito
-ValidatePayment=Validar este pago
+ValidatePayment=Validar pago
 CreditOrDebitCard=Tarjeta de crédito o débito
 FieldsWithAreMandatory=Los campos marcados por un <b>%s</b> son obligatorios
 FieldsWithIsForPublic=Los campos marcados por <b>%s</b> se mostrarán en la lista pública de miembros. Si no desea verlos, desactive la casilla "público".
@@ -866,7 +868,7 @@ FileNotShared=Archivo no compartido a público externo
 Project=Proyecto
 Projects=Proyectos
 Rights=Permisos
-LineNb=Line no.
+LineNb=Línea
 IncotermLabel=Incoterms
 # Week day
 Monday=Lunes
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=Productos o servicios
 SearchIntoProjects=Proyectos
 SearchIntoTasks=Tareas
 SearchIntoCustomerInvoices=Facturas a clientes
-SearchIntoSupplierInvoices=Facturas de proveedores
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Pedidos de clientes
-SearchIntoSupplierOrders=Pedidos a proveedor
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=Presupuestos a clientes
-SearchIntoSupplierProposals=Presupuestos de proveedor
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Intervenciones
 SearchIntoContracts=Contratos
 SearchIntoCustomerShipments=Envíos a clientes
@@ -941,3 +943,5 @@ Remote=Remoto
 LocalAndRemote=Local y remoto
 KeyboardShortcut=Atajo de teclado
 AssignedTo=Asignada a
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/es_ES/margins.lang b/htdocs/langs/es_ES/margins.lang
index 8a54dc8d18f..702b8a1aacc 100644
--- a/htdocs/langs/es_ES/margins.lang
+++ b/htdocs/langs/es_ES/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=Como un servicio
 UseDiscountOnTotal=Sobre el total
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Indica si un descuento global se toma en cuenta como un producto, servicio o sólo en el total a la hora de calcular los márgenes.
 MARGIN_TYPE=Precio compra/coste sugerido por defecto por el cálculo de márgenes
-MargeType1=Margen en Mejor precio de proveedor
+MargeType1=Margin on Best vendor price
 MargeType2=Margen en Precio Medio Ponderado (PMP)
 MargeType3=Margen en Precio de coste
-MarginTypeDesc=* Margen sobre mejor precio de compra = Precio de venta - Mejor precio proveedor definido en la ficha del producto <br> * Margen sobre Precio Medio Ponderado (PMP) = Precio de venta - Precio Promedio Ponderado (PMP) o mejor precio proveedor si aún no hay PMP<br> * Margen sobre el precio de coste = Precio venta - Precio de coste definido en la ficha del producto o PMP si el precio de coste no se ha definido, o mejor precio proveedor si aún no hay PMP
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Precio de compra
 UnitCharges=Carga unitaria
 Charges=Cargas
@@ -41,4 +41,4 @@ rateMustBeNumeric=El margen  debe ser un valor numérico
 markRateShouldBeLesserThan100=El margen tiene que ser menor que 100
 ShowMarginInfos=Mostrar info de márgenes
 CheckMargins=Detalles de márgenes
-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 ddiated sale representative and some thirdparties 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=El informe de margen por usuario usa el enlace entre terceros y comerciales para calcular el margen de cada usuario. Debido a que algunos terceros pueden no estar vinculados a un comercial y algunos terceros pueden estar relacionados con varios usuarios, algunos márgenes pueden no aparecer en este informe o podrá aparecer en varias líneas diferentes.
diff --git a/htdocs/langs/es_ES/members.lang b/htdocs/langs/es_ES/members.lang
index c0811465322..0ba42342885 100644
--- a/htdocs/langs/es_ES/members.lang
+++ b/htdocs/langs/es_ES/members.lang
@@ -111,14 +111,14 @@ SendingAnEMailToMember=Enviar e-mail de información al miembro
 SendingEmailOnAutoSubscription=Enviar E-Mail en una auto-inscripción
 SendingEmailOnMemberValidation=Enviar E-Mail en la validación de un nuevo miembro
 SendingEmailOnNewSubscription=Enviar E-Mail en una nueva suscripción
-SendingReminderForExpiredSubscription=Enviar un recordatorio para suscripción expirada
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Enviar E-Mail en una cancelación
 # Topic of email templates
 YourMembershipRequestWasReceived=Su membresía fue recibida.
 YourMembershipWasValidated=Su membresía ha sido validada.
 YourSubscriptionWasRecorded=Su suscripción ha sido guardada
 SubscriptionReminderEmail=Recordatorio de suscripción
-YourMembershipWasCanceled=Your membership was canceled
+YourMembershipWasCanceled=Su membresía fue cancelada.
 CardContent=Contenido de su ficha de miembro
 # Text of email templates
 ThisIsContentOfYourMembershipRequestWasReceived=Queremos informarle que se ha solicitado una nueva membresía. <br> <br>
diff --git a/htdocs/langs/es_ES/opensurvey.lang b/htdocs/langs/es_ES/opensurvey.lang
index d8c903ef943..8820e240a46 100644
--- a/htdocs/langs/es_ES/opensurvey.lang
+++ b/htdocs/langs/es_ES/opensurvey.lang
@@ -58,3 +58,4 @@ MoreChoices=Introduzca más opciones para los votantes
 SurveyExpiredInfo=La encuesta se ha cerrado o el periodo para la votación de ha terminado.
 EmailSomeoneVoted=%s  ha rellenado una línea.\nPuede encontrar su encuesta en el enlace:\n%s 
 ShowSurvey=Mostrar encuesta
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/es_ES/orders.lang b/htdocs/langs/es_ES/orders.lang
index 25e4a009ea8..cbebd3033d3 100644
--- a/htdocs/langs/es_ES/orders.lang
+++ b/htdocs/langs/es_ES/orders.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Área pedidos de clientes
-SuppliersOrdersArea=Área pedidos a proveedores
+SuppliersOrdersArea=Purchase orders area
 OrderCard=Ficha pedido
 OrderId=Id pedido
 Order=Pedido
-PdfOrderTitle=Orden
+PdfOrderTitle=Pedido
 Orders=Pedidos
 OrderLine=Línea de pedido
 OrderDate=Fecha pedido
@@ -13,10 +13,10 @@ OrderToProcess=Pedido a procesar
 NewOrder=Nuevo pedido
 ToOrder=Realizar pedido
 MakeOrder=Realizar pedido
-SupplierOrder=Pedido a proveedor
-SuppliersOrders=Pedidos a proveedor
-SuppliersOrdersRunning=Pedidos a proveedor en curso
-CustomerOrder=Pedido de cliente
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=Cuenta bloqueada
 CustomersOrders=Pedidos de clientes
 CustomersOrdersRunning=Pedidos de clientes en curso
 CustomersOrdersAndOrdersLines=Pedidos de clientes y líneas de pedido
@@ -24,7 +24,7 @@ OrdersDeliveredToBill=Pedidos de clientes enviados a facturar
 OrdersToBill=Pedidos de clientes enviados
 OrdersInProcess=Pedidos de clientes en proceso
 OrdersToProcess=Pedidos de clientes a procesar
-SuppliersOrdersToProcess=Pedidos a proveedores a procesar
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=Anulado
 StatusOrderDraftShort=Borrador
 StatusOrderValidatedShort=Validado
@@ -75,15 +75,15 @@ ShowOrder=Mostrar pedido
 OrdersOpened=Pedidos a procesar
 NoDraftOrders=Sin pedidos borrador
 NoOrder=Sin pedidos
-NoSupplierOrder=Sin pedidos a proveedor
+NoSupplierOrder=No purchase order
 LastOrders=Últimos %s pedidos de clientes
 LastCustomerOrders=Últimos %s pedidos de clientes
-LastSupplierOrders=Últimos %s pedidos a proveedores
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=Últimos %s pedidos de clientes modificados
 AllOrders=Todos los pedidos
 NbOfOrders=Número de pedidos
 OrdersStatistics=Estadísticas de pedidos de clientes
-OrdersStatisticsSuppliers=Estadísticas de pedidos a proveedores
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Número de pedidos por mes
 AmountOfOrdersByMonthHT=Importe total de pedidos por mes (sin IVA)
 ListOfOrders=Listado de pedidos
@@ -97,12 +97,12 @@ ConfirmMakeOrder=¿Está seguro de querer confirmar este pedido en fecha de <b>%
 GenerateBill=Facturar
 ClassifyShipped=Clasificar enviado
 DraftOrders=Pedidos borrador
-DraftSuppliersOrders=Pedidos a proveedor en borrador
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=Pedidos en proceso
 RefOrder=Ref. pedido
 RefCustomerOrder=Ref. pedido para el cliente
-RefOrderSupplier=Ref. pedido para proveedor
-RefOrderSupplierShort=Ref. pedido a proveedor
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=Enviar pedido por e-mail
 ActionsOnOrder=Eventos sobre el pedido
 NoArticleOfTypeProduct=No hay artículos de tipo 'producto' y por lo tanto enviables en este pedido
@@ -115,9 +115,9 @@ ConfirmCloneOrder=¿Está seguro de querer clonar este pedido <b>%s</b>?
 DispatchSupplierOrder=Recepción del pedido a proveedor %s
 FirstApprovalAlreadyDone=Primera aprobación realizada
 SecondApprovalAlreadyDone=Segunda aprobación realizada
-SupplierOrderReceivedInDolibarr=Pedido a proveedor %s recibido %s
-SupplierOrderSubmitedInDolibarr=Pedido a proveedor %s enviado
-SupplierOrderClassifiedBilled=Pedido a proveedor %s clasificado como facturado
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Otros pedidos
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Responsable seguimiento pedido cliente
@@ -125,11 +125,11 @@ TypeContact_commande_internal_SHIPPING=Responsable envío pedido cliente
 TypeContact_commande_external_BILLING=Contacto cliente facturación pedido
 TypeContact_commande_external_SHIPPING=Contacto cliente entrega pedido
 TypeContact_commande_external_CUSTOMER=Contacto cliente seguimiento pedido
-TypeContact_order_supplier_internal_SALESREPFOLL=Responsable seguimiento pedido a proveedor
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Responsable recepción pedido a proveedor
-TypeContact_order_supplier_external_BILLING=Contacto proveedor facturación pedido
-TypeContact_order_supplier_external_SHIPPING=Contacto proveedor entrega pedido
-TypeContact_order_supplier_external_CUSTOMER=Contacto proveedor seguimiento pedido
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constante COMMANDE_SUPPLIER_ADDON no definida
 Error_COMMANDE_ADDON_NotDefined=Constante COMMANDE_ADDON no definida
 Error_OrderNotChecked=No se han seleccionado pedidos a facturar
diff --git a/htdocs/langs/es_ES/other.lang b/htdocs/langs/es_ES/other.lang
index 8a205565ff5..02a3b23739b 100644
--- a/htdocs/langs/es_ES/other.lang
+++ b/htdocs/langs/es_ES/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nEste es un correo de prueba enviado a __EMAIL__.
 PredefinedMailTestHtml=__(Hello)__\nEste es un correo de <b> prueba</b> (la palabra prueba debe estar en negrita). <br> Las dos líneas están separadas por un retorno de carro. <br> <br> __USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nAquí encontrará la factura __REF__\n\nEste es el enlace para realizar un pago en línea en caso de que la factura aún no se encuentre pagada:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nNos gustaría advertirle que la factura __REF__ parece no estar pagada. Así que le enviamos de nuevo la factura en el archivo adjunto, como un recordatorio.\n\nEste es el enlace para poder realizar un pago en línea de la misma\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hola)__\n\nNos ponemos en contacto con usted para facilitarle el presupuesto __PREF__\n\n\n__(Sinceramente)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hola)__\n\nNos ponemos en contacto con usted para facilitarle nuestra solicitud de presupuesto __REF__\n\n\n__(Sinceramente)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hola)__\n\nNos ponemos en contacto con usted para facilitarle el pedido __REF__\n\n\n__(Sinceramente)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hola)__\n\nNos ponemos en contacto con usted para facilitarle nuestro pedido __REF__\n\n\n__(Sinceramente)__\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=El archivo es demasiado grande
 PleaseBePatient=Rogamos espere unos instantes...
 NewPassword=Nueva contraseña
 ResetPassword=Reiniciar contraseña
-RequestToResetPasswordReceived=Se ha recibido una solicitud para cambiar tu contraseña de Dolibarr
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=Esta es su nueva contraseña para iniciar sesión
 NewKeyWillBe=Su nueva contraseña para iniciar sesión en el software será
 ClickHereToGoTo=Haga click aquí para ir a %s
@@ -233,6 +233,8 @@ PermissionsDelete=Permisos eliminados
 YourPasswordMustHaveAtLeastXChars=Su contraseña debe contener al menos <strong>%s</strong>  caracteres
 YourPasswordHasBeenReset=Su contraseña ha sido restablecida con éxito
 ApplicantIpAddress=Dirección IP del solicitante
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=Área de exportaciones
 AvailableFormats=Formatos disponibles
@@ -246,4 +248,4 @@ WEBSITE_PAGEURL=URL de la página
 WEBSITE_TITLE=Título
 WEBSITE_DESCRIPTION=Descripción
 WEBSITE_KEYWORDS=Claves
-LinesToImport=Lines to import
+LinesToImport=Líneas a importar
diff --git a/htdocs/langs/es_ES/productbatch.lang b/htdocs/langs/es_ES/productbatch.lang
index 1a6500487f1..62ddca8498c 100644
--- a/htdocs/langs/es_ES/productbatch.lang
+++ b/htdocs/langs/es_ES/productbatch.lang
@@ -16,7 +16,7 @@ printEatby=Caducidad: %s
 printSellby=Límite venta: %s
 printQty=Cant.: %d
 AddDispatchBatchLine=Añada una línea para despacho por caducidad
-WhenProductBatchModuleOnOptionAreForced=Cuando el módulo de lotes/series está activado, el incremento y disminución de stock se fuerza en la validación de los envíos y la recepción manual y no se puede editar. Las otras opciones pueden ser definidas como desee.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=Este producto no usa lotes/series
 ProductLotSetup=Configuración del módulo lotes/series
 ShowCurrentStockOfLot=Mostrar el stock actual de este producto/lote
diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang
index c97d546f831..90671e8cb9c 100644
--- a/htdocs/langs/es_ES/products.lang
+++ b/htdocs/langs/es_ES/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Importe ventas
 PurchasedAmount=Importe compras
 NewPrice=Nuevo precio
 MinPrice=Precio de venta mín.
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=El precio de venta no debe ser inferior al mínimo para este producto (%s sin IVA). Este mensaje puede estar causado por un descuento muy grande.
 ContractStatusClosed=Cerrado
 ErrorProductAlreadyExists=Un producto con la referencia %s ya existe.
@@ -155,7 +156,7 @@ BuyingPrices=Precios de compra
 CustomerPrices=Precios a clientes
 SuppliersPrices=Precios de proveedores
 SuppliersPricesOfProductsOrServices=Precios de proveedores (productos o servicios)
-CustomCode=Código aduanero
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=País de origen
 Nature=Naturaleza
 ShortLabel=Etiqueta corta
diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang
index 96c5555f427..6c97e4fb36c 100644
--- a/htdocs/langs/es_ES/projects.lang
+++ b/htdocs/langs/es_ES/projects.lang
@@ -77,6 +77,7 @@ Time=Tiempo
 ListOfTasks=Listado de tareas
 GoToListOfTimeConsumed=Ir al listado de tiempos consumidos
 GoToListOfTasks=Ir al listado de tareas
+GoToGanttView=Go to Gantt view
 GanttView=Vista de Gantt
 ListProposalsAssociatedProject=Listado de presupuestos asociados al proyecto
 ListOrdersAssociatedProject=Listado de pedidos de clientes asociados al proyecto
@@ -226,4 +227,4 @@ AllowCommentOnProject=Permitir comentarios de los usuarios en los proyectos
 DontHavePermissionForCloseProject=No tienes permisos para cerrar el proyecto %s
 DontHaveTheValidateStatus=El proyecto %s debe estar abierto para ser cerrado
 RecordsClosed=%s proyecto(s) cerrado(s)
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/es_ES/stocks.lang b/htdocs/langs/es_ES/stocks.lang
index 9d11fd501e0..ec53257453d 100644
--- a/htdocs/langs/es_ES/stocks.lang
+++ b/htdocs/langs/es_ES/stocks.lang
@@ -8,9 +8,9 @@ WarehouseEdit=Edición almacén
 MenuNewWarehouse=Nuevo almacén
 WarehouseSource=Almacén origen
 WarehouseSourceNotDefined=Sin almacenes definidos,
-AddWarehouse=Create warehouse
+AddWarehouse=Crear almacén
 AddOne=Añadir uno
-DefaultWarehouse=Default warehouse
+DefaultWarehouse=Almacén por defecto
 WarehouseTarget=Almacén destino
 ValidateSending=Validar envío
 CancelSending=Anular envío
@@ -24,7 +24,7 @@ Movements=Movimientos
 ErrorWarehouseRefRequired=El nombre de referencia del almacén es obligatorio
 ListOfWarehouses=Listado de almacenes
 ListOfStockMovements=Listado de movimientos de stock
-ListOfInventories=List of inventories
+ListOfInventories=Listado de inventarios
 MovementId=ID movimiento
 StockMovementForId=ID movimiento %d
 ListMouvementStockProject=Listado de movimientos de stock asociados al proyecto
@@ -203,3 +203,4 @@ RegulateStock=Regular stock
 ListInventory=Listado
 StockSupportServices=Servicios de apoyo a la gestión de stocks
 StockSupportServicesDesc=Por defecto sólo puede almacenar el producto con el tipo "producto". Si está activado y si el servicio de módulo está activado, también puede almacenar un producto con el tipo "servicio"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/es_ES/stripe.lang b/htdocs/langs/es_ES/stripe.lang
index 36618376145..65a14bc2547 100644
--- a/htdocs/langs/es_ES/stripe.lang
+++ b/htdocs/langs/es_ES/stripe.lang
@@ -49,7 +49,7 @@ OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca _...)
 BankAccountForBankTransfer=Cuenta bancaria para transferencias
 StripeAccount=Cuenta Stripe
 StripeChargeList=Listado de gastos de Stripe
-StripeTransactionList=List of Stripe transactions
+StripeTransactionList=Listado de transacciones
 StripeCustomerId=Id de cliente de Stripe
 StripePaymentModes=Modos de pago de Stripe
 LocalID=ID local
@@ -58,8 +58,8 @@ NameOnCard=Nombre en la tarjeta
 CardNumber=Número de tarjeta
 ExpiryDate=Fecha de caducidad
 CVN=CVN
-DeleteACard=Eliminar registro de tarjeta
-ConfirmDeleteCard=¿Está seguro de querer eliminar este registro de tarjeta?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Crear cliente en Stripe
 CreateCardOnStripe=Crea una tarjeta en Stripe
 ShowInStripe=Mostrar en Stripe
diff --git a/htdocs/langs/es_ES/supplier_proposal.lang b/htdocs/langs/es_ES/supplier_proposal.lang
index b46518fee5f..07e5cf18b19 100644
--- a/htdocs/langs/es_ES/supplier_proposal.lang
+++ b/htdocs/langs/es_ES/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Presupuestos de proveedor
-supplier_proposalDESC=Gestionar presupuestos de proveedor
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
 SupplierProposalNew=Nuevo presupuesto
 CommRequest=Presupuesto
 CommRequests=Presupuestos
 SearchRequest=Buscar un presupuesto
 DraftRequests=Presupuestos borrador
-SupplierProposalsDraft=Presupuestos de proveedor borrador
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=Últimos %s consultas de precios modificados
 RequestsOpened=Presupuestos abiertos
-SupplierProposalArea=Área presupuestos de proveedores
-SupplierProposalShort=Presupuesto de proveedor
-SupplierProposals=Presupuestos de proveedor
-SupplierProposalsShort=Presupuestos de proveedor
+SupplierProposalArea=Vendor proposals area
+SupplierProposalShort=Vendor proposal
+SupplierProposals=Vendor proposals
+SupplierProposalsShort=Vendor proposals
 NewAskPrice=Nuevo presupuesto
 ShowSupplierProposal=Mostrar presupuesto
 AddSupplierProposal=Crear un presupuesto
-SupplierProposalRefFourn=Ref. Proveedor
+SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=Fecha de entrega
 SupplierProposalRefFournNotice=Antes de cerrar a "Aceptado", piense en consultar las referencias de proveedores.
 ConfirmValidateAsk=¿Está seguro de querer validar este presupuesto bajo la referencia <b>%s</b>?
@@ -47,9 +47,9 @@ CommercialAsk=Presupuesto
 DefaultModelSupplierProposalCreate=Modelo por defecto
 DefaultModelSupplierProposalToBill=Modelo por defecto al cerrar un presupuesto (aceptado)
 DefaultModelSupplierProposalClosed=Modelo por defecto al cerrar un presupuesto (rechazado)
-ListOfSupplierProposals=Listado de presupuestos de proveedores
-ListSupplierProposalsAssociatedProject=Listado de presupuestos de proveedores asociados al proyecto
-SupplierProposalsToClose=Presupuestos de proveedor a cerrar
-SupplierProposalsToProcess=Presupuestos de proveedor a procesar
+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=Últimos %s presupuestos
 AllPriceRequests=Todos los presupuestos
diff --git a/htdocs/langs/es_ES/suppliers.lang b/htdocs/langs/es_ES/suppliers.lang
index 66c70af3f56..0cc0b1805c4 100644
--- a/htdocs/langs/es_ES/suppliers.lang
+++ b/htdocs/langs/es_ES/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Proveedores
-SuppliersInvoice=Factura proveedor
-ShowSupplierInvoice=Ver factura de proveedor
-NewSupplier=Nuevo proveedor
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=Histórico
-ListOfSuppliers=Listado de proveedores
-ShowSupplier=Mostrar proveedor
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=Fecha de pedido
 BuyingPriceMin=Mejor precio de compra
 BuyingPriceMinShort=Mejor precio de compra
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Total de los precios de venta de los subproductos
 SomeSubProductHaveNoPrices=Algunos subproductos no tienen precio definido
 AddSupplierPrice=Añadir precio de compra
 ChangeSupplierPrice=Cambiar precio de compra
-SupplierPrices=Precios de proveedores
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Esta referencia de proveedor ya está asociada a la referencia: %s
-NoRecordedSuppliers=Sin proveedores registrados
-SupplierPayment=Pago a proveedor
-SuppliersArea=Área proveedores
-RefSupplierShort=Ref. proveedor
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=Disponibilidad
-ExportDataset_fournisseur_1=Facturas de proveedores y líneas de factura
-ExportDataset_fournisseur_2=Facturas proveedores y pagos
-ExportDataset_fournisseur_3=Pedidos de proveedores y líneas de pedido
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=Aprobar este pedido
 ConfirmApproveThisOrder=Está seguro de querer aprobar el pedido a proveedor <b>%s</b>?
 DenyingThisOrder=Denegar este pedido
 ConfirmDenyingThisOrder=¿Está seguro de querer denegar el pedido a proveedor <b>%s</b>?
 ConfirmCancelThisOrder=¿Está seguro de querer cancelar el pedido a proveedor <b>%s</b>?
-AddSupplierOrder=Crear pedido a proveedor
-AddSupplierInvoice=Crear factura de proveedor
-ListOfSupplierProductForSupplier=Listado de productos y precios del proveedor <b>%s</b>
-SentToSuppliers=Enviado a proveedores
-ListOfSupplierOrders=Listado de pedidos a proveedor
-MenuOrdersSupplierToBill=Pedidos a proveedor a facturar
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Tiempo de entrega en días
 DescNbDaysToDelivery=El mayor retraso en las entregas de productos de este pedido
-SupplierReputation=Reputación del proveedor
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=No realizar pedidos
 NotTheGoodQualitySupplier=Mala calidad
 ReputationForThisProduct=Reputación
 BuyerName=Nombre del comprador
 AllProductServicePrices=Todos los precios de producto / servicio
 AllProductReferencesOfSupplier=Todos las referencias de proveedores de producto / servicio
-BuyingPriceNumShort=Precios de proveedores
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/es_ES/website.lang b/htdocs/langs/es_ES/website.lang
index f1698c7689f..bda2c9cd750 100644
--- a/htdocs/langs/es_ES/website.lang
+++ b/htdocs/langs/es_ES/website.lang
@@ -38,9 +38,9 @@ RealURL=URL Real
 ViewWebsiteInProduction=Ver sitio web usando la URL de inicio
 SetHereVirtualHost=Si tu puedes crear, en tu servidor web (Apache, Nginx...), un Host Virtual con PHP activado y un directorio Root en <br><strong>%s</strong> <br>introduce aquí el nombre del host virtual que has creado, así que la previsualización puede verse usando este acceso directo al servidor, y no solo usando el servidor de Dolibarr
 YouCanAlsoTestWithPHPS=En el entorno de desarrollo, es posible que prefiera probar el sitio con el servidor web incrustado de PHP (se requiere PHP 5.5) ejecutando <br><strong> php -S 0.0.0.0:8080 -t %s</strong>
-CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+CheckVirtualHostPerms=Compruebe también que el host virtual tiene <strong>%s</strong> en archivos en <strong>%s</strong>
 ReadPerm=Leido
-WritePerm=Write
+WritePerm=Escribir
 PreviewSiteServedByWebServer=<u>Vista previa de %s en una nueva pestaña.</u> <br><br>%s será servido por un servidor web externo (como Apache, Nginx, IIS). Debe instalar y configurar este servidor antes de apuntar al directorio:<br><strong>%s</strong><br> URL servida por el servidor externo: <br><strong>%s</strong>
 PreviewSiteServedByDolibarr=<u>Vista previa %s en una nueva pestaña.</u> <br> <br> El %s será servido por el servidor de Dolibarr por lo que no necesita instalar ningún servidor web extra (como Apache, Nginx, IIS). <br> El inconveniente es que la URL de las páginas no amigables y comienzan con la ruta de su Dolibarr. <br> URL que sirve Dolibarr: <br><strong>%s</strong>   <br> <br>Para utilizar su propio servidor web externo para servir esta web, cree un host virtual en su servidor web que apunte al directorio<br> <strong>%s</strong><br> luego escriba el nombre de este servidor virtual y haga clic en el otro botón de vista previa.
 VirtualHostUrlNotDefined=URL del Host Virtual servido por un servidor externo no definido
@@ -73,7 +73,7 @@ AnotherContainer=Otro contenedor
 WEBSITE_USE_WEBSITE_ACCOUNTS=Habilitar tabla de cuentas del sitio web
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Habilitar tabla para almacenar cuentas del sitio web (inicio de sesión/contraseña) para cada sitio web/tercero
 YouMustDefineTheHomePage=Antes debe definir la página de inicio por defecto
-OnlyEditionOfSourceForGrabbedContentFuture=Nota: solo será posible editar una fuente HTML cuando el contenido de una página se integre utilizando una página externa (el editor WYSIWYG no estará disponible)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Nota: solo será posible editar una fuente HTML cuando el contenido de una página se integre utilizando una página externa
 GrabImagesInto=Obtener también imágenes encontradas en css y página.
 ImagesShouldBeSavedInto=Las imágenes deben guardarse en el directorio
diff --git a/htdocs/langs/es_ES/workflow.lang b/htdocs/langs/es_ES/workflow.lang
index 1f20a2bc19e..058e6bf75f0 100644
--- a/htdocs/langs/es_ES/workflow.lang
+++ b/htdocs/langs/es_ES/workflow.lang
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Clasificar pedido(s) de client
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Clasificar pedido(s) de cliente origen como facturado cuando la factura a cliente sea marcada como pagada (y si el importe de la factura es la misma que la suma de los importes de los pedidos relacionados)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Clasificar automáticamente el pedido origen como enviado cuando el envío se valide (y si la cantidad enviada por todos los envíos sea la misma que el pedido)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Clasificar automáticamente el presupuestos(s) de proveedor como facturado cuando la factura se valide (y si el importe de la factura sea la misma que el total de los presupuestos enlazados)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Clasificar automáticamente el pedido(s) a proveedor como facturado cuando la factura se valide (y si el importe de la factura sea la misma que el total de los pedidos enlazados)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=Creación automática
 AutomaticClassification=Clasificación automática
diff --git a/htdocs/langs/es_MX/accountancy.lang b/htdocs/langs/es_MX/accountancy.lang
index 19eb4bb13c3..f3cd24091c9 100644
--- a/htdocs/langs/es_MX/accountancy.lang
+++ b/htdocs/langs/es_MX/accountancy.lang
@@ -16,7 +16,6 @@ ShowAccountingJournal=Mostrar registro de contabilidad
 MenuBankAccounts=Cuentas de banco
 Ventilation=Agregando a cuentas
 CustomersVentilation=Agregar factura de cliente
-SuppliersVentilation=Agregar factura de proveedor
 CreateMvts=Crear nueva transaccion
 UpdateMvts=Modificación de una transacción
 ValidTransaction=Validar transacción
@@ -52,10 +51,8 @@ NumMvts=Número de transacción
 ListeMvts=Lista de movimientos
 ErrorDebitCredit=Débito y Crédito no pueden tener un valor al mismo tiempo
 ReportThirdParty=Listar cuenta de terceros
-DescThirdPartyReport=Consulte aquí la lista de clientes y proveedores de terceros y sus cuentas de contabilidad
 TotalVente=Facturación total antes de impuestos
 TotalMarge=Margen de ventas total
-DescVentilDoneSupplier=Consulte aquí la lista de partidas de las facturas a proveedores y sus cuentas contables
 DescVentilExpenseReport=Consulte aquí la lista de líneas de reporte de gastos vinculadas (o no) a una cuenta de contabilidad de comisiones
 DescVentilExpenseReportMore=Si configura la cuenta contable en el tipo de líneas de reporte de gastos, la aplicación podrá hacer todo el enlace entre sus líneas de informes de gastos y la cuenta de contabilidad de su plan de cuentas, con un clic con el botón <strong> "%s" </strong>. Si la cuenta no se ha establecido en el diccionario de comisiones o si todavía tiene algunas líneas no vinculadas a ninguna cuenta, tendrá que realizar una vinculación manual en el menú "<strong> %s</strong>".
 ErrorAccountancyCodeIsAlreadyUse=Error, no es posible eliminar ésta cuenta contable porque está siendo usada
diff --git a/htdocs/langs/es_MX/admin.lang b/htdocs/langs/es_MX/admin.lang
index bd9f0e85b94..e333350393a 100644
--- a/htdocs/langs/es_MX/admin.lang
+++ b/htdocs/langs/es_MX/admin.lang
@@ -134,4 +134,7 @@ LDAPFieldFirstName=Nombre(s)
 CacheByServerDesc=Por ejemplo, utilizando la directiva Apache "ExpiresByType image/gif A2592000"
 AGENDA_SHOW_LINKED_OBJECT=Mostrar objeto vinculado en la vista de agenda
 ConfFileMustContainCustom=Instalar o construir un módulo externo desde la aplicación necesita guardar los archivos del módulo en el directorio <strong> %s </strong>. Para que este directorio sea procesado por Dolibarr, debe configurar su <strong> conf/conf.php </strong> para agregar las 2 líneas de directiva: <strong> $dolibarr_main_url_root_alt='/custom'; </strong> <br> <strong> $dolibarr_main_document_root_alt='%s/custom'; </strong>
+MailToSendProposal=Propuestas de clientes
+MailToSendOrder=Pedidos de los clientes
+MailToSendInvoice=Facturas de clientes
 WarningNoteModulePOSForFrenchLaw=Este módulo %s es compatible con las leyes francesas (Loi Finance 2016) porque el módulo Non Reversible Logs se activa automáticamente.
diff --git a/htdocs/langs/es_MX/bills.lang b/htdocs/langs/es_MX/bills.lang
index 8fc6a1858bc..bc4047a4106 100644
--- a/htdocs/langs/es_MX/bills.lang
+++ b/htdocs/langs/es_MX/bills.lang
@@ -51,3 +51,4 @@ PaymentTypeCB=Tarjeta de crédito
 PaymentTypeShortCB=Tarjeta de crédito
 IBANNumber=CLABE Interbancaria
 BICNumber=Sucursal
+situationInvoiceShortcode_S=D
diff --git a/htdocs/langs/es_MX/companies.lang b/htdocs/langs/es_MX/companies.lang
index 559b3eb9c73..7c8f3679e88 100644
--- a/htdocs/langs/es_MX/companies.lang
+++ b/htdocs/langs/es_MX/companies.lang
@@ -5,7 +5,6 @@ SelectThirdParty=Selecciona un tercero
 ConfirmDeleteCompany=¿Estás seguro que quieres borrar esta compañía y toda la información heredada?
 DeleteContact=Eliminar un contacto/dirección
 ConfirmDeleteContact=¿Estás seguro que quieres borrar este contacto y toda la información heredada?
-CreateDolibarrThirdPartySupplier=Crear tercero (proveedor)
 CreateThirdPartyAndContact=Crear un tercero + un contacto hijo
 IdThirdParty=ID de tercero
 IdCompany=ID de empresa
@@ -35,16 +34,13 @@ No_Email=Rechazar e-mailings masivos
 Town=Ciudad
 Web=Página de internet
 CopyAddressFromSoc=Rellenar dirección con dirección de terceros
-ThirdpartyNotCustomerNotSupplierSoNoRef=Tercero, ni cliente ni proveedor, ningún objeto de referencia disponible
 OverAllProposals=Propuestas
 OverAllSupplierProposals=Solicitudes de precios
 LocalTax1IsUsed=Usar segundo impuesto
 LocalTax1IsUsedES=RE se utiliza
 LocalTax2IsUsed=Usar tercer impuesto
 WrongCustomerCode=Código de cliente inválido
-WrongSupplierCode=Código de proveedor inválido
 CustomerCodeModel=Modelo de código de cliente
-SupplierCodeModel=Modelo de código de proveedor
 ProfId1Short=ID Prof. 1
 ProfId2Short=ID Prof. 2
 ProfId3Short=ID Prof. 3
@@ -113,13 +109,9 @@ DefaultContact=Contacto/dirección por defecto
 DeleteACompany=Eliminar empresa
 PersonalInformations=Datos personales
 CustomerCode=Código de cliente
-SupplierCode=Código de proveedor
 CustomerCodeShort=Código de cliente
-SupplierCodeShort=Código de proveedor
 CustomerCodeDesc=Código de cliente, único para todos los clientes
-SupplierCodeDesc=Código de proveedor, único para todos los proveedores
 RequiredIfCustomer=Requerido si el tercero es un cliente o cliente potencial
-RequiredIfSupplier=Requerido si el tercero es un proveedor
 CompanyDeleted=Empresa "%s" eliminada de la base de datos.
 ListOfContacts=Lista de contactos/direcciones
 ListOfContactsAddresses=Lista de contactos/direcciones
@@ -129,7 +121,6 @@ ContactForOrdersOrShipments=Contacto de la orden o del envío
 ContactForInvoices=Contacto de facturación
 NoContactForAnyOrderOrShipments=Este contacto no es un contacto para cualquier pedido o envío
 EditCompany=Editar empresa
-ThisUserIsNot=Este usuario no es un cliente potencial, cliente ni proveedor
 VATIntraCheckDesc=El enlace <b>%s</b> permite consultar al servicio de control de números de IVA intracomunitario. Se requiere acceso a Internet desde el servidor para que este servicio funcione.
 VATIntraManualCheck=También puedes verificar manualmente desde el sitio web europeo <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=No es posible realizar la verificación. El servicio de comprobación no es prestado por el país miembro (%s).
@@ -158,13 +149,11 @@ FiscalYearInformation=Información sobre el año fiscal
 FiscalMonthStart=Més de inicio del año fiscal
 YouMustAssignUserMailFirst=Debe crear un correo electrónico para este usuario primero para poder agregar notificaciones de correo electrónico para él.
 YouMustCreateContactFirst=Para poder agregar notificaciones por correo electrónico, primero debe definir contactos con correos electrónicos válidos para el tercero
-ListSuppliersShort=Lista de proveedores
 ListProspectsShort=Lista de clientes potenciales
 ListCustomersShort=Lista de clientes
 ThirdPartiesArea=Terceros y área de contacto
 InActivity=Abierta
 OutstandingBillReached=Max. para la cuenta pendiente alcanzada
-MonkeyNumRefModelDesc=Devuelve un número con formato %syymm-nnnn para el código de cliente y %syymm-nnnn para código de proveedor donde yy es el año, mm el mes y nnnn una secuencia numérica sin ruptura y sin regresar a 0.
 LeopardNumRefModelDesc=El código es libre. Este código puede ser modificado en cualquier momento.
 ManagingDirectors=Administrador(es) (CEO, Director, Presidente...)
 MergeOriginThirdparty=Tercero duplicado (tercero que deseas eliminar)
@@ -173,4 +162,3 @@ ConfirmMergeThirdparties=¿Está seguro de que desea combinar este tercero en el
 SaleRepresentativeLogin=Inicio de sesión del representante de ventas
 SaleRepresentativeFirstname=Nombre del representante de ventas
 SaleRepresentativeLastname=Apellido del representante de ventas
-NewCustomerSupplierCodeProposed=Nuevo código de cliente o proveedor sugerido en código duplicado
diff --git a/htdocs/langs/es_MX/install.lang b/htdocs/langs/es_MX/install.lang
index bbd54f20597..21493052a99 100644
--- a/htdocs/langs/es_MX/install.lang
+++ b/htdocs/langs/es_MX/install.lang
@@ -69,8 +69,6 @@ DolibarrAdminLogin=Dolibarr Admin Login
 AdminLoginAlreadyExists=Ya existe la cuenta de administrador Dolibarr '<b>%s</b>'. Regresa, si quieres crear otro.
 WarningRemoveInstallDir=Advertencia, por razones de seguridad, una vez que la instalación o actualización esté completa, para evitar el uso de herramientas de instalación de nuevo, se debe añadir un archivo llamado <b>install.lock</b> en el directorio de documentos Dolibarr, con el fin de evitar el uso malintencionado de la misma.
 ChoosedMigrateScript=Elija script de migración
-DataMigration=Migración de datos
-DatabaseMigration=Migración de estructura de base de datos
 ProcessMigrateScript=Procesamiento de script
 ChooseYourSetupMode=Elige tu modo de configuración y haga clic en "Iniciar"...
 FreshInstall=Nueva instalación
diff --git a/htdocs/langs/es_MX/main.lang b/htdocs/langs/es_MX/main.lang
index 72cb06a152d..022f780c2e4 100644
--- a/htdocs/langs/es_MX/main.lang
+++ b/htdocs/langs/es_MX/main.lang
@@ -80,6 +80,7 @@ PersonalValue=Valor personal
 MultiLanguage=Multi-idioma
 Action=Evento
 AmountByMonth=Cantidad por mes
+Connection=Inicio de sesión
 DateEnd=Fecha de finalización
 DateCreationShort=Fecha de creación
 DateModificationShort=Fecha Modif.
@@ -108,7 +109,6 @@ Average=Promedio
 Modules=Módulos/Aplicaciones
 List=Lista
 FullList=Lista completa
-RefSupplier=Ref. Proveedor
 RefPayment=Ref. Pago
 CommercialProposalsShort=Propuestas comerciales
 ActionsToDo=Eventos por realizar
@@ -136,7 +136,6 @@ ResultKo=Fallo
 Reporting=Informes
 Opened=Abierta
 ByCompanies=Por terceros
-ByUsers=Por usuarios
 Links=Vínculos
 Link=Vínculo
 Rejects=Rechazos
@@ -158,6 +157,10 @@ MonthShort04=Abr
 MonthShort05=Mayo
 MonthShort08=Ago
 MonthShort12=Dic
+MonthVeryShort02=V
+MonthVeryShort03=L
+MonthVeryShort05=L
+MonthVeryShort09=D
 DateFormatYYYYMM=MM-YYYY
 DateFormatYYYYMMDD=DD-MM-YYYY
 DateFormatYYYYMMDDHHMM=DD-MM-YYYY HH:SS
@@ -180,9 +183,7 @@ Warnings=Advertencias
 BuildDoc=Generar Doc
 Entity=Ambiente
 CustomerPreview=Vista previa del cliente
-SupplierPreview=Vista previa de proveedores
 ShowCustomerPreview=Mostrar vista previa del cliente
-ShowSupplierPreview=Mostrar vista previa del proveedor
 Currency=Moneda
 Undo=Deshacer
 UndoExpandAll=Deshacer ampliar
@@ -292,7 +293,6 @@ Select2Enter=Entrar
 SearchIntoCustomerInvoices=Facturas de clientes
 SearchIntoCustomerOrders=Pedidos de los clientes
 SearchIntoCustomerProposals=Propuestas de clientes
-SearchIntoSupplierProposals=Propuestas de proveedores
 SearchIntoExpenseReports=Reporte de gastos
 SearchIntoLeaves=Licencias
 AssignedTo=Asignado a
diff --git a/htdocs/langs/es_MX/orders.lang b/htdocs/langs/es_MX/orders.lang
index 248ecd8d34d..bfa371a2396 100644
--- a/htdocs/langs/es_MX/orders.lang
+++ b/htdocs/langs/es_MX/orders.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - orders
-CustomersOrders=Pedidos de los clientes
 StatusOrderCanceledShort=Cancelado
 StatusOrderCanceled=Cancelado
diff --git a/htdocs/langs/es_MX/supplier_proposal.lang b/htdocs/langs/es_MX/supplier_proposal.lang
index 003cc102261..9f6029af65c 100644
--- a/htdocs/langs/es_MX/supplier_proposal.lang
+++ b/htdocs/langs/es_MX/supplier_proposal.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
 CommRequests=Solicitudes de precios
-SupplierProposals=Propuestas de proveedores
-SupplierProposalsShort=Propuestas de proveedores
 SupplierProposalStatusClosed=Cerrada
 SupplierProposalStatusClosedShort=Cerrada
diff --git a/htdocs/langs/es_MX/suppliers.lang b/htdocs/langs/es_MX/suppliers.lang
deleted file mode 100644
index 0e64c07df37..00000000000
--- a/htdocs/langs/es_MX/suppliers.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - suppliers
-ListOfSuppliers=Lista de proveedores
-RefSupplierShort=Ref. Proveedor
diff --git a/htdocs/langs/es_PE/accountancy.lang b/htdocs/langs/es_PE/accountancy.lang
index a698f2a951a..4b1e234cf96 100644
--- a/htdocs/langs/es_PE/accountancy.lang
+++ b/htdocs/langs/es_PE/accountancy.lang
@@ -15,7 +15,6 @@ Selectchartofaccounts=Seleccione el plan de cuentas activo
 Addanaccount=Agregar una cuenta contable
 Ventilation=Vinculación a cuentas
 CustomersVentilation=Fijación de la factura del cliente
-SuppliersVentilation=Factura de proveedores vinculados
 CreateMvts=Crear nueva transacción
 UpdateMvts=Modificación de una transacción
 WriteBookKeeping=Periodizar transacción en Libro Mayor
diff --git a/htdocs/langs/es_VE/admin.lang b/htdocs/langs/es_VE/admin.lang
index 9d2f86e0ae9..bad5f3de05e 100644
--- a/htdocs/langs/es_VE/admin.lang
+++ b/htdocs/langs/es_VE/admin.lang
@@ -29,11 +29,6 @@ ExtraFieldsSupplierInvoices=Atributos adicionales (facturas)
 ExtraFieldsProject=Atributos adicionales (proyectos)
 ExtraFieldsProjectTask=Atributos adicionales (tareas)
 ExtraFieldHasWrongValue=El atributo %s tiene un valor no válido
-SupplierProposalSetup=Configuración del módulo Solicitudes a proveedor
-SupplierProposalNumberingModules=Modelos de numeración de solicitud de precios a proveedor
-SupplierProposalPDFModules=Modelos de documentos de solicitud de precios a proveedores
-FreeLegalTextOnSupplierProposal=Texto libre en solicitudes de precios a proveedores
-WatermarkOnDraftSupplierProposal=Marca de agua en solicitudes de precios a proveedor (en caso de estar vacío)
 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)
diff --git a/htdocs/langs/es_VE/bills.lang b/htdocs/langs/es_VE/bills.lang
index 8471b2384ea..c1962b00649 100644
--- a/htdocs/langs/es_VE/bills.lang
+++ b/htdocs/langs/es_VE/bills.lang
@@ -12,3 +12,4 @@ PaymentTypeShortTRA=A validar
 IntracommunityVATNumber=Número de IVA
 VATIsNotUsedForInvoice=-
 LawApplicationPart1=-
+situationInvoiceShortcode_S=D
diff --git a/htdocs/langs/es_VE/main.lang b/htdocs/langs/es_VE/main.lang
index d37320995a8..a0aed660c7d 100644
--- a/htdocs/langs/es_VE/main.lang
+++ b/htdocs/langs/es_VE/main.lang
@@ -27,6 +27,10 @@ TotalLT2ES=Total ISLR
 LT1ES=Retención
 LT2ES=ISLR
 Opened=Abierta
+MonthVeryShort02=V
+MonthVeryShort03=L
+MonthVeryShort05=L
+MonthVeryShort09=D
 FindBug=Señalar un bug
 NewAttribute=Nuevo atributo
 AttributeCode=Código atributo
@@ -34,6 +38,5 @@ LinkToOrder=Enlazar a un pedido
 Progress=Progresión
 Export=Exportación
 ExpenseReports=Gastos
-SearchIntoSupplierProposals=Presupuestos de proveedores
 SearchIntoExpenseReports=Gastos
 SearchIntoLeaves=Días libres
diff --git a/htdocs/langs/es_VE/margins.lang b/htdocs/langs/es_VE/margins.lang
index 3f84b463aa7..1fcd15f6ab9 100644
--- a/htdocs/langs/es_VE/margins.lang
+++ b/htdocs/langs/es_VE/margins.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - margins
-MargeType1=Margen de proveedor con mejor precio
 MargeType2=Margen de Precio Promedio Ponderado (WAP)
diff --git a/htdocs/langs/es_VE/orders.lang b/htdocs/langs/es_VE/orders.lang
index 0280aa50bcb..f4130fdc0c4 100644
--- a/htdocs/langs/es_VE/orders.lang
+++ b/htdocs/langs/es_VE/orders.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - orders
-PdfOrderTitle=Pedido
 StatusOrderDeliveredShort=Emitido
diff --git a/htdocs/langs/es_VE/supplier_proposal.lang b/htdocs/langs/es_VE/supplier_proposal.lang
index add488de79f..c79be84b226 100644
--- a/htdocs/langs/es_VE/supplier_proposal.lang
+++ b/htdocs/langs/es_VE/supplier_proposal.lang
@@ -1,21 +1,14 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Presupuestos comerciales de proveedor
-supplier_proposalDESC=Administrar solicitudes de precios a proveedores
 SupplierProposalNew=Nueva solicitud de precio
 CommRequest=Solicitud de precio
 CommRequests=Solicitudes de precios
 SearchRequest=Encontrar una solicitud
 DraftRequests=Solicitudes en borrador
-SupplierProposalsDraft=Presupuestos a proveedor en borrador
 LastModifiedRequests=Últimas %s solicitudes de precios modificadas
 RequestsOpened=Abrir solicitudes de precios
-SupplierProposalArea=Área de presupuestos de proveedores
-SupplierProposals=Presupuestos de proveedores
-SupplierProposalsShort=Presupuestos de proveedores
 NewAskPrice=Nueva solicitud de precio
 ShowSupplierProposal=Mostrar solicitud de precio
 AddSupplierProposal=Crear solicitud de precio
-SupplierProposalRefFourn=Ref. de proveedor
 SupplierProposalRefFournNotice=Antes de cerrar a "Aceptado", pensar para captar referencias de proveedores.
 ConfirmValidateAsk=¿Seguro que deseas validar ésta solicitud de precio bajo el nombre <b> %s</b>?
 DeleteAsk=Borrar solicitud
@@ -43,9 +36,5 @@ DocModelAuroreDescription=Modelo completo de solicitud (logo...)
 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)
-ListOfSupplierProposals=Lista de solicitudes de presupuestos a proveedores
-ListSupplierProposalsAssociatedProject=Lista de presupuestos a proveedor asociados con el proyecto
-SupplierProposalsToClose=Presupuestos a proveedor a cerrar
-SupplierProposalsToProcess=Presupuestos a proveedor a procesar
 LastSupplierProposals=Últimas %s solicitudes de precios
 AllPriceRequests=Todas las solicitudes
diff --git a/htdocs/langs/et_EE/accountancy.lang b/htdocs/langs/et_EE/accountancy.lang
index 2d98bec9264..54037291e4f 100644
--- a/htdocs/langs/et_EE/accountancy.lang
+++ b/htdocs/langs/et_EE/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Raamatupidamine
 ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
 ACCOUNTING_EXPORT_DATE=Date format for export file
 ACCOUNTING_EXPORT_PIECE=Export the number of piece
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Accounts with non zero values
 ListOfAccounts=List of accounts
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers 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
 
-AccountancyArea=Accountancy area
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
 AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
@@ -89,7 +90,7 @@ MenuProductsAccounts=Product accounts
 ProductsBinding=Products accounts
 Ventilation=Binding to accounts
 CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Supplier invoice binding
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
 ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
@@ -185,11 +187,12 @@ ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
-DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Group of account
 Pcgsubtype=Subgroup of account
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
 ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
 DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report 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 fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -293,4 +296,9 @@ Binded=Lines bound
 ToBind=Lines to bind
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang
index a3bbabd58af..e627ec78c6e 100644
--- a/htdocs/langs/et_EE/admin.lang
+++ b/htdocs/langs/et_EE/admin.lang
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS host (vaikimisi php.ini failis: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS port (pole Unix laadsetel süsteemidel PHPs määratletud)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS host (pole Unix laadsetel süsteemidel PHPs määratletud)
 MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= Saada kõigist saadetud kirjadest automaatselt pimekoopia aadressile
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=E-kirjade saatmiseks kasutatav meetod
 MAIN_MAIL_SMTPS_ID=SMTP kasutaja, kui autentimine on nõutud
 MAIN_MAIL_SMTPS_PW=SMTP parool, kui autentimine on nõutud
@@ -291,7 +292,7 @@ ModuleSetup=Moodulite seadistamine
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=Süsteem
 ModuleFamilyCrm=Kliendihaldus (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projektid/koostöö
@@ -373,7 +374,8 @@ NoSmsEngine=Ühtki SMSi saatmise haldurit pole võimalik kasutada. SMSi saatmise
 PDF=PDF
 PDFDesc=Siit saab määratleda üldised PDFide loomise seaded
 PDFAddressForging=Aadressikastide loomise reeglid
-HideAnyVATInformationOnPDF=Peida loodud PDFis kõik käibemaksudega seotud andmed
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=Peida loodud PDFis toodete kirjeldused
@@ -445,7 +447,8 @@ DisplayCompanyInfo=Display company address
 DisplayCompanyManagers=Display manager names
 DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party 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.
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Set this to 1 if you want to attach main document to emai
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=Kasutajad ja grupid
 Module0Desc=Users / Employees and Groups management
@@ -479,7 +485,7 @@ Module1Desc=Ettevõtete ja kontaktide haldamine (kliendid, huvilised)
 Module2Name=Äritegevus
 Module2Desc=Äritegevuse seadistamine
 Module10Name=Raamatupidamine
-Module10Desc=Lihtsad andmebaasi sisul põhinevad raamatupidamise aruanded (žurnaalid, käibearuanne). Ilma saatmiseta.
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=Pakkumised
 Module20Desc=Pakkumiste haldamine
 Module22Name=Masspostitus
@@ -546,8 +552,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=WebCalendari integratsioon
-Module500Name=Erikulud
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Payment of employee wages
 Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
@@ -561,14 +567,14 @@ Module700Name=Annetused
 Module700Desc=Annetuste haldamine
 Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Mantise integratsioon
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
 Module1780Name=Sildid/kategooriad
-Module1780Desc=Siltide/kategooriate loomine (tooted, kliendid, hankijad, kontaktid või liikmed)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=WYSIWYG toimeti
 Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
 Module2200Name=Dynamic Prices
@@ -576,7 +582,7 @@ Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Plaanitud käivitused
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API/Web services (SOAP server)
@@ -613,7 +619,7 @@ Module50100Desc=Point of sales module (POS).
 Module50200Name=Paypal
 Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Poll, Survey or Vote
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=Hilinemise viivitus (päevades) enne hoiatust hilinenu
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Hilinemise viivitus (päevades) enne hoiatust deponeerimata tšekkide kohta
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=Teised menüükanded haldavad muid parameetreid
 LogEvents=Sündmuste turvaaudit
 Audit=Audit
@@ -1054,8 +1060,9 @@ LogEventDesc=Siin saab sisse lülitada Dolibarri turvalisusega seotud sündmuste
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Süsteemi info sisaldab mitmesugust tehnilist infot, mida ei saa muuta ning mis on nähtav vaid administraatoritele.
 SystemAreaForAdminOnly=Sellele alale saavad ligi ainult administraatorid. Ükski Dolibarri õigus ei saa seda piirangut eemaldada.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=Siit saab muuta iga parameetrit, mis on seotud Dolibarri kujundusega
 AvailableModules=Available app/modules
 ToActivateModule=Moodulite aktiveerimiseks mine süsteemi seadistusesse (Kodu->Seadistamine->Moodulid).
@@ -1188,11 +1195,11 @@ UserMailRequired=Uue kasutaja loomiseks on vajalik e-posti aadress
 HRMSetup=HRM module setup
 ##### Company setup #####
 CompanySetup=Ettevõtete mooduli seadistamine
-CompanyCodeChecker=Kolmandate isikute loomise ja kontrollimise moodul (klient või hankija)
-AccountCodeManager=Module for accounting code generation (customer or supplier)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
 NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
 ModelModules=Dokumendimallid
 DocumentModelOdt=Loo dokumendid OpenDocument mallidest (.ODT või .ODS failid OpenOffices, KOffices, TextEditis jne)
@@ -1203,6 +1210,9 @@ MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
 TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Eksportimise link <b>%s</b> formaati on saadaval järgmisel aadressil: %s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=Vaba tekst pakkumistel
 WatermarkOnDraftProposal=Vesimärk pakkumiste mustanditel (puudub, kui tühi)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
 ##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=Tellimuste haldamise seadistamine
 OrdersNumberingModules=Tellimuste numeratsiooni mudelid
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=Ühendumine serveri '%s' andmebaasiga '%s' kasutajga '%s' õnne
 OSCommerceTestKo1=Ühendumine serveriga '%s' õnnestus, kuid andmebaasi '%s' ei õnnestunud kätte saada.
 OSCommerceTestKo2=Ühendumine serveriga '%s' kasutajaga '%s' ebaõnnestus.
 ##### Stock #####
-StockSetup=Warehouse module setup
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
 ##### Menu #####
 MenuDeleted=Menüü kustutatud
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
 MultiCompanySetup=Mitme ettevõtte mooduli seadistamine
 ##### Suppliers #####
 SuppliersSetup=Hankijate mooduli seadistamine
-SuppliersCommandModel=Täielik ostutellimuse mall (logo jne)
-SuppliersInvoiceModel=Täielik ostuarve mall (logo jne)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Ostuarvete numeratsiooni mudel
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","
 SalariesSetup=Setup of module salaries
 SortOrder=Sort order
 Format=Formaat
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Install of external module from applic
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
-TextTitleColor=Color of page title
+TextTitleColor=Text color of Page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=Background color for Top menu
 TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
 ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-MailToMember=To send email from member page
-MailToUser=To send email from user page
-MailToProject= To send email from project page
+MailToSendProposal=Customer proposals
+MailToSendOrder=Customer orders
+MailToSendInvoice=Customer invoices
+MailToSendShipment=Saadetised
+MailToSendIntervention=Sekkumised
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Lepingud
+MailToThirdparty=Kolmandad isikud
+MailToMember=Liikmed
+MailToUser=Kasutajad
+MailToProject=Projects page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1780,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/et_EE/bills.lang b/htdocs/langs/et_EE/bills.lang
index 5448d580972..28769f6330a 100644
--- a/htdocs/langs/et_EE/bills.lang
+++ b/htdocs/langs/et_EE/bills.lang
@@ -109,7 +109,7 @@ CancelBill=Tühista arve
 SendRemindByMail=Saada meeldetuletus e-postiga
 DoPayment=Enter payment
 DoPaymentBack=Enter refund
-ConvertToReduc=Teisenda tuleviku allahindluseks
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Sisesta kliendilt saadud makse
@@ -120,7 +120,7 @@ BillStatus=Arve staatus
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Mustand (kinnitada)
 BillStatusPaid=Makstud
-BillStatusPaidBackOrConverted=Credit note refund or converted into discount
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Hüljatud
 BillStatusValidated=Kinnitatud (vajab maksmist)
@@ -296,10 +296,10 @@ DiscountType=Discount type
 NoteReason=Märkus/põhjus
 ReasonDiscount=Põhjus
 DiscountOfferedBy=Andis
-DiscountStillRemaining=Discounts available
-DiscountAlreadyCounted=Discounts already consumed
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+SupplierDiscounts=Vendors discounts
 BillAddress=Arve aadress
 HelpEscompte=Kliendile anti see soodustus, kuna ta maksis enne tähtaega.
 HelpAbandonBadCustomer=Sellest summast on loobutud (kuna tegu olevat halva kliendiga) ning on loetud erandlikuks kaotuseks.
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Every %s days
 FrequencyPer_m=Every %s months
 FrequencyPer_y=Every %s years
@@ -505,9 +511,14 @@ SituationAmount=Situation invoice amount(net)
 SituationDeduction=Situation subtraction
 ModifyAllLines=Modify all lines
 CreateNextSituationInvoice=Create next situation
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=P
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
 NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
@@ -532,3 +543,4 @@ AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/et_EE/categories.lang b/htdocs/langs/et_EE/categories.lang
index f32feaa031d..a2cf559b9a8 100644
--- a/htdocs/langs/et_EE/categories.lang
+++ b/htdocs/langs/et_EE/categories.lang
@@ -16,7 +16,7 @@ MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
-SubCats=Alamkategooriad
+SubCats=Sub-categories
 CatList=List of tags/categories
 NewCategory=New tag/category
 ModifCat=Modify tag/category
@@ -85,3 +85,4 @@ CategorieRecursivHelp=If activated, product will also linked to parent category
 AddProductServiceIntoCategory=Add the following product/service
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
+ChooseCategory=Choose category
diff --git a/htdocs/langs/et_EE/commercial.lang b/htdocs/langs/et_EE/commercial.lang
index dfbff82eb21..9f2d984aae7 100644
--- a/htdocs/langs/et_EE/commercial.lang
+++ b/htdocs/langs/et_EE/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=Sulge
 ActionAC_EMAILING=Saada masspostitus
 ActionAC_COM=Saada kliendi tellimuse posti teel
 ActionAC_SHIP=Saada saatekiri posti teel
-ActionAC_SUP_ORD=Saada hankija tellimus posti teel
-ActionAC_SUP_INV=Saada hankija arve posti teel
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=Muud
 ActionAC_OTH_AUTO=Automaatselt sisestatud tegevused
 ActionAC_MANUAL=Käsitsi sisestatud tegevused
diff --git a/htdocs/langs/et_EE/companies.lang b/htdocs/langs/et_EE/companies.lang
index b852ea4faba..6922c531961 100644
--- a/htdocs/langs/et_EE/companies.lang
+++ b/htdocs/langs/et_EE/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Are you sure you want to delete this contact and all inheri
 MenuNewThirdParty=Uus kolmas isik
 MenuNewCustomer=Uus klient
 MenuNewProspect=Uus huviline
-MenuNewSupplier=Uus hankija
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=Uus eraisik
-NewCompany=Uus ettevõte (pot klient, klient, hankija)
-NewThirdParty=Uus kolmas isik (pot klient, klient, hankija)
-CreateDolibarrThirdPartySupplier=Loo kolmas isik (hankija)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=Uus kolmas isik
 CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Huviliste ala
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=Huvilised
 ThirdPartyCustomers=Kliendid
 ThirdPartyCustomersStats=Kliendid
 ThirdPartyCustomersWithIdProf12=Klient koos %s või %s
-ThirdPartySuppliers=Hankijad
+ThirdPartySuppliers=Vendors
 ThirdPartyType=Kolmanda isiku tüüp
 Individual=Eraisik
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
@@ -77,11 +77,11 @@ Web=Veeb
 Poste= Ametikoht
 DefaultLang=Vaikimisi keel
 VATIsUsed=Sales tax is used
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
-ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Pakkumised
 OverAllOrders=Tellimused
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=RE liik
 TypeLocaltax2ES=IRPF liik
 WrongCustomerCode=Vigane kliendi kood
-WrongSupplierCode=Vigane hankija kood
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Kliendi koodi mudel
-SupplierCodeModel=Hankija koodi mudel
+SupplierCodeModel=Vendor code model
 Gencod=Vöötkood
 ##### Professional ID #####
 ProfId1Short=Reg nr 1
@@ -267,7 +267,7 @@ Prospect=Huviline
 CustomerCard=Kliendikaart
 Customer=Klient
 CustomerRelativeDiscount=Protsentuaalne kliendi allahindlus
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=Protsentuaalne allahindlus
 CustomerAbsoluteDiscountShort=Summaline allahindlus
 CompanyHasRelativeDiscount=Sellel kliendil on vaikimisi allahindlus <b>%s%%</b>
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this suppl
 CompanyHasNoAbsoluteDiscount=Kliendil pole allahindluse krediiti
 CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
 CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=Pole
 Supplier=Hankija
 AddContact=Uus kontakt
@@ -304,13 +304,13 @@ DeleteACompany=Kustuta ettevõte
 PersonalInformations=Isikuandmed
 AccountancyCode=Accounting account
 CustomerCode=Kliendi kood
-SupplierCode=Hankija kood
+SupplierCode=Vendor code
 CustomerCodeShort=Kliendi kood
-SupplierCodeShort=Hankija kood
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=Kliendi kood, igale kliendile unikaalne
-SupplierCodeDesc=Hankija kood, igale hankijale unikaalne
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=Nõutud, kui kolmas isik on klient või huviline
-RequiredIfSupplier=Nõutud, kui kolmas isik on hankija
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=Kehtivust kontrollib moodul
 ThisIsModuleRules=Reeglid sellele moodulile
 ProspectToContact=Huviline, kellega ühendust võtta
@@ -338,7 +338,7 @@ MyContacts=Minu kontaktid
 Capital=Kapital
 CapitalOf=%s kapital
 EditCompany=Muuda ettevõtet
-ThisUserIsNot=See kasutaja ei ole huviline, klient ega hankija
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=Kontrolli
 VATIntraCheckDesc=Link <b>%s</b> võimaldab kasutada Euroopa käibemaksuregistri kontrollija teenust. Veebiserverile peab olema lubatud Interneti teenuse kasutamine.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -396,7 +396,7 @@ ImportDataset_company_4=Third parties/Sales representatives (Assign sales repres
 PriceLevel=Hinnatase
 DeliveryAddress=Tarneaadress
 AddAddress=Lisa aadress
-SupplierCategory=Hankija kategooria
+SupplierCategory=Vendor category
 JuridicalStatus200=Sõltumatu
 DeleteFile=Kustuta fail
 ConfirmDeleteFile=Oled sa kindel, et soovid selle faili kustutada?
@@ -406,7 +406,7 @@ FiscalYearInformation=Majandusaasta informatsioon
 FiscalMonthStart=Majandusaasta esimene kuu
 YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
 YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
-ListSuppliersShort=Hankijate nimekiri
+ListSuppliersShort=List of vendors
 ListProspectsShort=Huviliste nimekiri
 ListCustomersShort=Klientide nimekiri
 ThirdPartiesArea=Kolmandate isikute ja kontaktide ala
@@ -420,7 +420,7 @@ CurrentOutstandingBill=Hetkel maksmata summa
 OutstandingBill=Suurim võimalik maksmata arve
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Tagasta arv formaadiga %syymm-nnnn kliendikoodi jaoks ja %syymm-nnnn hankija koodi jaoks, kus yy on aasta, mm on kuu ja nnnn on katkestuseta jada, mille väärtus pole kunagi 0.
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=Kood on vaba, seda saab igal ajal muuta.
 ManagingDirectors=Haldaja(te) nimi (CEO, direktor, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/et_EE/compta.lang b/htdocs/langs/et_EE/compta.lang
index 5d720ed98ec..22d853e1648 100644
--- a/htdocs/langs/et_EE/compta.lang
+++ b/htdocs/langs/et_EE/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=Makstud neto
 VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
-VATSummary=Tax Balance
+VATSummary=Tax monthly
+VATBalance=Tax Balance
 VATPaid=Tax paid
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=Raamatupidamise/vara ala
 NewPayment=Uus makse
 Payments=Maksed
 PaymentCustomerInvoice=Müügiarve makse
-PaymentSupplierInvoice=Ostuarve makse
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=KM makse
 ListPayment=Maksete nimekiri
 ListOfCustomerPayments=Klientide maksete nimekiri
-ListOfSupplierPayments=Hankijate maksete nimekiri
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Perioodi alguse kuupäev
 DateEndPeriod=Perioodi lõpu kuupäev
 newLT1Payment=New tax 2 payment
@@ -110,7 +111,7 @@ ShowVatPayment=Näita käibemaksu makset
 TotalToPay=Kokku maksta
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
 CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
 SupplierAccountancyCodeShort=Sup. account. code
 AccountNumber=Konto number
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Kolmandate isikute IRPFi aruanne
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Sisend- ja väljundkäibemaks kliendi alusel
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Chart of accounts models
 Pcg_type=Pcg tüü
 Pcg_subtype=Pcg alamtüüp
 InvoiceLinesToDispatch=Saadetavate arvete read
-ByProductsAndServices=Toodete ja teenuste kaupa
+ByProductsAndServices=By product and service
 RefExt=Väline viide
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
 LinkedOrder=Viide tellimusele
@@ -215,7 +218,8 @@ Mode1=Meetod 1
 Mode2=Meetod 2
 CalculationRuleDesc=KM kogusumma arvutamiseks on kaks meetodit:<br>Meetod 1 ümardab käibemaksu igal real ja siis summeerib.<br>Meetod 2 summeerib käibemaksu igal real ja siis ümardab tulemuse.<br>Lõppsumma võib erineda mõne sendi täpsusega. Vaikimisi režiim on režiim <b>%s</b>.
 CalculationRuleDescSupplier=According to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Käibearuanne toote kaupa, <b>kassapõhist raamatupidamist</b> kasutades pole režiim oluline. See aruanne on saadaval vaid <b>tekkepõhist raamatupidamist</b> kasutades (vaata raamatupidamise mooduli seadistust).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Arvutusrežiim
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
@@ -242,3 +246,10 @@ FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/et_EE/dict.lang b/htdocs/langs/et_EE/dict.lang
index ef2d798155a..e72204f69d8 100644
--- a/htdocs/langs/et_EE/dict.lang
+++ b/htdocs/langs/et_EE/dict.lang
@@ -5,7 +5,8 @@ CountryIT=Itaalia
 CountryES=Hispaania
 CountryDE=Saksamaa
 CountryCH=Šveits
-CountryGB=Suurbritannia
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=Ühendkuningriik
 CountryUK=Ühendkuningriik
 CountryIE=Iirimaa
 CountryCN=Hiina
diff --git a/htdocs/langs/et_EE/ecm.lang b/htdocs/langs/et_EE/ecm.lang
index 18020a21943..4e3f49f469d 100644
--- a/htdocs/langs/et_EE/ecm.lang
+++ b/htdocs/langs/et_EE/ecm.lang
@@ -39,9 +39,10 @@ ShowECMSection=Näita kausta
 DeleteSection=Eemalda kaust
 ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
 ECMDirectoryForFiles=Suhteline kaust failidele
-CannotRemoveDirectoryContainsFiles=Kustutada pole võimalik, kuna sisaldab faile
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=Failihaldur
-ECMSelectASection=Vali vasakul asuvas puus kaust...
+ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
diff --git a/htdocs/langs/et_EE/errors.lang b/htdocs/langs/et_EE/errors.lang
index e6e038cc4d7..692d1a573b3 100644
--- a/htdocs/langs/et_EE/errors.lang
+++ b/htdocs/langs/et_EE/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Bar code required
 ErrorCustomerCodeAlreadyUsed=Kliendi kood on juba kasutuses
 ErrorBarCodeAlreadyUsed=Bar code already used
 ErrorPrefixRequired=Prefiks on nõutud
-ErrorBadSupplierCodeSyntax=Halb hankija koodi süntaks
-ErrorSupplierCodeRequired=Hankija kood on nõutud
-ErrorSupplierCodeAlreadyUsed=Hankija kood on juba kasutuses
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Halvad parameetrid
 ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
 ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
@@ -87,7 +87,7 @@ ErrorsOnXLines=<b>%s</b> lähtekirje(t) on vigane/vigased
 ErrorFileIsInfectedWithAVirus=Antiviiruse programm ei suutnud faili valideerida (fail võib olla viiruse poolt nakatatud)
 ErrorSpecialCharNotAllowedForField="%s" väljal ei ole erisümbolid lubatud
 ErrorNumRefModel=Andmebaasi viide on juba olemas (%s) ja ei ole kooskõlas antud numeratsiooni reegliga. Kustuta kirje või nimeta viide ümber antud mooduli aktiveerimiseks.
-ErrorQtyTooLowForThisSupplier=Selle hankija jaoks on kogus liiga madal või ei ole antud hankija jaoks toote hinda määratletud
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Maski viga
 ErrorBadMaskFailedToLocatePosOfSequence=Viga: mask on järjekorranumbrita
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
-ErrorSupplierCountryIsNotDefined=Selle hankija riiki ei ole määratletud, paranda see esmalt
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
diff --git a/htdocs/langs/et_EE/install.lang b/htdocs/langs/et_EE/install.lang
index 552a4aac11b..0e5440888cb 100644
--- a/htdocs/langs/et_EE/install.lang
+++ b/htdocs/langs/et_EE/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=Seadistusfaili <b>%s</b> pole olemas n
 ConfFileCouldBeCreated=Seadistusfaili <b>%s</b> loomine on võimalik.
 ConfFileIsNotWritable=Seadistusfailil <b>%s</b> puudub kirjutamise õigus. Palun kontrolli õigusi. Esmapaigalduseks peab veebiserver saama sellesse faili seadistamise ajal kirjutada (näiteks &quot;chmod 666&quot; Unixi laadsetel operatsioonisüsteemidel).
 ConfFileIsWritable=Seadistusfail <b>%s</b> on kirjutatav.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Lae kogu informatsioon seadistusfailist uuesti.
 PHPSupportSessions=Antud PHP toetab sessioone.
 PHPSupportPOSTGETOk=Antud PHP toetab POST ja GET muutujaid.
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
 WarningRemoveInstallDir=Hoiatus: turvalisuse huvides tuleb pärast paigaldus- või uuendusprotsessi lõpetamist lisada Dolibarri dokumentide kausta fail nimega <b>install.lock</b>. See keelab paigaldusutiliitide kasutamise, et keegi ei saaks neid pahatahtlikel eesmärkidel kasutada.
 FunctionNotAvailableInThisPHP=Pole saadaval antud PHP paigaldusel
 ChoosedMigrateScript=Vali migratsiooni skript
-DataMigration=Andmete migratsioon
-DatabaseMigration=Andmebaasi struktuuri migratsioo
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Skripti töötlemine
 ChooseYourSetupMode=Vali paigalduse režiim ja klõpsa "Start" nupule...
 FreshInstall=Värske paigaldus
@@ -146,7 +147,7 @@ NothingToDo=Nothing to do
 # upgrade
 MigrationFixData=Paranda denormaliseeritud andmed
 MigrationOrder=Kliendi tellimuste andmete migreerimine
-MigrationSupplierOrder=Ostutellimuste andmete migreerimine
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Pakkumiste andmete migreerimine
 MigrationInvoice=Müügiarvete andmete migreerimine
 MigrationContract=Lepingute andmete migreerimine
@@ -196,6 +197,8 @@ MigrationEvents=Sündmuste migreerimine sündmuse omaniku lisamiseks seoste tabe
 MigrationEventsContact=Migration of events to add event contact into assignement table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 ShowNotAvailableOptions=Näita mitte saadaval olevaid lisavalikuid
diff --git a/htdocs/langs/et_EE/ldap.lang b/htdocs/langs/et_EE/ldap.lang
index 6bdda2fc79f..ca8304e7f0b 100644
--- a/htdocs/langs/et_EE/ldap.lang
+++ b/htdocs/langs/et_EE/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Domeeni salasõna
 YouMustChangePassNextLogon=Kasutaja <b>%s</b> salasõna domeenis <b>%s</b> peab muutma.
 UserMustChangePassNextLogon=Kasutaja peab muutma oma salasõna domeenis %s
 LDAPInformationsForThisContact=LDAPi andmebaasis selle kontakti kohta leiduv info
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Member type synchronized
 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
diff --git a/htdocs/langs/et_EE/loan.lang b/htdocs/langs/et_EE/loan.lang
index c11a2dfc08c..d23ccbef66f 100644
--- a/htdocs/langs/et_EE/loan.lang
+++ b/htdocs/langs/et_EE/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=Kapital
 Insurance=Insurance
 Interest=Interest
 Nbterms=Number of terms
+Term=Term
 LoanAccountancyCapitalCode=Accounting account capital
 LoanAccountancyInsuranceCode=Accounting account insurance
 LoanAccountancyInterestCode=Accounting account interest
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=Confirm deleting this loan
 LoanDeleted=Loan Deleted Successfully
 ConfirmPayLoan=Confirm classify paid this loan
 LoanPaid=Loan Paid
-# Calc
-LoanCalc=Bank Loans Calculator
-PurchaseFinanceInfo=Purchase & Financing Information
-SalePriceOfAsset=Sale Price of Asset
-PercentageDown=Percentage Down
-LengthOfMortgage=Duration of loan
-AnnualInterestRate=Annual Interest Rate
-ExplainCalculations=Explain Calculations
-ShowMeCalculationsAndAmortization=Show me the calculations and amortization
-MortgagePaymentInformation=Mortgage Payment Information
-DownPayment=Down Payment
-DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
-InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
-MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
-MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
-MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
-MonthlyPaymentDesc=The montly payment is figured out using the following formula
-AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
-AmountFinanced=Amount Financed
-AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
-Totalsforyear=Totals for year
-MonthlyPayment=Monthly Payment
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
-GoToInterest=%s will go towards INTEREST
-GoToPrincipal=%s will go towards PRINCIPAL
-YouWillSpend=You will spend %s in year %s
 ListLoanAssociatedProject=List of loan associated with the project
 AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Interest
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-FinancialCommitment=Financial commitment
 CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/langs/et_EE/mails.lang b/htdocs/langs/et_EE/mails.lang
index c95ad08c5d7..330eb48cd74 100644
--- a/htdocs/langs/et_EE/mails.lang
+++ b/htdocs/langs/et_EE/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Saatja
 MailErrorsTo=Vead aadressile
 MailReply=Vasta
 MailTo=Vastuvõtja(d)
+MailToUsers=To user(s)
 MailCC=Koopia
+MailToCCUsers=Copy to users(s)
 MailCCC=Puhverdatud koopia
 MailTopic=E-kirja teema
 MailText=Sõnum
@@ -164,4 +166,4 @@ InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Informatsioon
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/et_EE/main.lang b/htdocs/langs/et_EE/main.lang
index f1a8ff87ef5..783f08f1435 100644
--- a/htdocs/langs/et_EE/main.lang
+++ b/htdocs/langs/et_EE/main.lang
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is se
 Administrator=Administraator
 Undefined=Määratlemata
 PasswordForgotten=Password forgotten?
+NoAccount=No account?
 SeeAbove=Vt eespool
 HomeArea=Kodu ala
 LastConnexion=Latest connection
@@ -231,7 +232,7 @@ Limit=Piir
 Limits=Piirid
 Logout=Logi välja
 NoLogoutProcessWithAuthMode=Autentisrežiimiga <b>%s</b> pole seotud ühtki lahtiühendamise rakendust
-Connection=Logi sisse
+Connection=Kasutajanimi
 Setup=Seadistamine
 Alert=Hoiatus
 MenuWarnings=Häired
@@ -402,6 +403,7 @@ DefaultTaxRate=Default tax rate
 Average=Keskmine
 Sum=Summa
 Delta=Delta
+RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Valik
@@ -414,7 +416,7 @@ Favorite=Lemmik
 ShortInfo=Inform
 Ref=Viide
 ExternalRef=Väline viide
-RefSupplier=Hankija viide
+RefSupplier=Ref. vendor
 RefPayment=Makse viide
 CommercialProposalsShort=Pakkumised
 Comment=Kommentaar
@@ -493,7 +495,7 @@ Received=Vastu võetud
 Paid=Makstud
 Topic=Subject
 ByCompanies=Kolmandate isikute poolt
-ByUsers=Kasutajate poolt
+ByUsers=By user
 Links=Lingid
 Link=Link
 Rejects=Tagasi lükatud
@@ -619,9 +621,9 @@ BuildDoc=Loo Doc
 Entity=Keskkond
 Entities=Olemid
 CustomerPreview=Kliendi eelvaade
-SupplierPreview=Hankija eelvaade
+SupplierPreview=Vendor preview
 ShowCustomerPreview=Näita kliendi eelvaadet
-ShowSupplierPreview=Näita hankija eelvaadet
+ShowSupplierPreview=Show vendor preview
 RefCustomer=Kliendi viide
 Currency=Valuuta
 InfoAdmin=Administraatoritele vajalik informatsioon
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=Products or services
 SearchIntoProjects=Projektid
 SearchIntoTasks=Ülesanded
 SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Sekkumised
 SearchIntoContracts=Lepingud
 SearchIntoCustomerShipments=Customer shipments
@@ -941,3 +943,5 @@ Remote=Remote
 LocalAndRemote=Local and Remote
 KeyboardShortcut=Keyboard shortcut
 AssignedTo=Mõjutatud isik
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/et_EE/margins.lang b/htdocs/langs/et_EE/margins.lang
index 6bb758f4814..3640a325a38 100644
--- a/htdocs/langs/et_EE/margins.lang
+++ b/htdocs/langs/et_EE/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=Teenusena
 UseDiscountOnTotal=Vahesumma peal
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Määratleb, kas üldist allahindlust käsitletakse tootena, teenusena või ainult vahesummana marginaali arvutamisel.
 MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best supplier price
+MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Tootmishind
 UnitCharges=Ühiku kulud
 Charges=Kulud
diff --git a/htdocs/langs/et_EE/members.lang b/htdocs/langs/et_EE/members.lang
index b8e9cdb78dc..921971689aa 100644
--- a/htdocs/langs/et_EE/members.lang
+++ b/htdocs/langs/et_EE/members.lang
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
diff --git a/htdocs/langs/et_EE/opensurvey.lang b/htdocs/langs/et_EE/opensurvey.lang
index 2bbd8383ed2..99132b8102c 100644
--- a/htdocs/langs/et_EE/opensurvey.lang
+++ b/htdocs/langs/et_EE/opensurvey.lang
@@ -58,3 +58,4 @@ MoreChoices=Sisesta vastajatele rohkem vastusevariante
 SurveyExpiredInfo=The poll has been closed or voting delay has expired.
 EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
 ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/et_EE/orders.lang b/htdocs/langs/et_EE/orders.lang
index a6a62d6ed11..07444d69b5c 100644
--- a/htdocs/langs/et_EE/orders.lang
+++ b/htdocs/langs/et_EE/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Müügitellimuste ala
-SuppliersOrdersArea=Ostutellimuste ala
+SuppliersOrdersArea=Purchase orders area
 OrderCard=Tellimuse kaar
 OrderId=Tellimuse ID
 Order=Tellimus
@@ -13,18 +13,18 @@ OrderToProcess=Töödeldav tellimus
 NewOrder=Uus tellimus
 ToOrder=Telli
 MakeOrder=Telli
-SupplierOrder=Ostutellimus
-SuppliersOrders=Ostutellimus
-SuppliersOrdersRunning=Praegused ostutellimused
-CustomerOrder=Müügitellimus
-CustomersOrders=Customer orders
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=Kliendi tellimus
+CustomersOrders=Klientide tellimused
 CustomersOrdersRunning=Current customer orders
 CustomersOrdersAndOrdersLines=Customer orders and order lines
 OrdersDeliveredToBill=Customer orders delivered to bill
 OrdersToBill=Customer orders delivered
 OrdersInProcess=Customer orders in process
 OrdersToProcess=Customer orders to process
-SuppliersOrdersToProcess=Supplier orders to process
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=Tühistatud
 StatusOrderDraftShort=Mustand
 StatusOrderValidatedShort=Kinnitatud
@@ -75,15 +75,15 @@ ShowOrder=Näita tellimust
 OrdersOpened=Orders to process
 NoDraftOrders=Ühtki tellimuse mustandit ei ole
 NoOrder=No order
-NoSupplierOrder=No supplier order
+NoSupplierOrder=No purchase order
 LastOrders=Latest %s customer orders
 LastCustomerOrders=Latest %s customer orders
-LastSupplierOrders=Latest %s supplier orders
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=Latest %s modified orders
 AllOrders=Kõik tellimused
 NbOfOrders=Tellimusi
 OrdersStatistics=Tellimuste statistika
-OrdersStatisticsSuppliers=Ostutellimuste statistika
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Tellimuste arv kuude kaupa
 AmountOfOrdersByMonthHT=Tellimuste arv kuude järgi (km-ta)
 ListOfOrders=Tellimuste nimekiri
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</
 GenerateBill=Loo arve
 ClassifyShipped=Liigita saadetuks
 DraftOrders=Tellimuste mustandid
-DraftSuppliersOrders=Draft suppliers orders
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=Töötlemisel tellimused
 RefOrder=Tellimuse viide
 RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for supplier
-RefOrderSupplierShort=Ref. order supplier
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=Saada tellimus kirjaga
 ActionsOnOrder=Tellimisel toimuvad tegevused
 NoArticleOfTypeProduct=Ühtki 'toode' tüüpi artiklit ei leitud, seega pole sellel tellimusel ühtki saadetavat artiklit
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
 DispatchSupplierOrder=Ostutellimuse %s vastu võtmine
 FirstApprovalAlreadyDone=First approval already done
 SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=Supplier order %s received %s
-SupplierOrderSubmitedInDolibarr=Supplier order %s submited
-SupplierOrderClassifiedBilled=Supplier order %s set billed
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Muud tellimused
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Müügitellimuse järelkajaga tegelev müügiesindaja
@@ -125,11 +125,11 @@ TypeContact_commande_internal_SHIPPING=Saatmise järelkajaga tegelev müügiesin
 TypeContact_commande_external_BILLING=Kliendi arveldamise kontakt
 TypeContact_commande_external_SHIPPING=Kliendi saatmise kontakt
 TypeContact_commande_external_CUSTOMER=Kliendi kontakt tellimuse järelkajaks
-TypeContact_order_supplier_internal_SALESREPFOLL=Ostutellimuse järelkajaga tegelev müügiesindaja
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Saatmise järelkajaga tegelev müügiesindaja
-TypeContact_order_supplier_external_BILLING=Hankija arveldamise kontakt
-TypeContact_order_supplier_external_SHIPPING=Hankija saatmise kontakt
-TypeContact_order_supplier_external_CUSTOMER=Hankija kontakt tellimuse järelkajaks
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Konstant COMMANDE_SUPPLIER_ADDON on määratlemata
 Error_COMMANDE_ADDON_NotDefined=Konstant COMMANDE_ADDON on määratlemata
 Error_OrderNotChecked=Ühtki tellimust, mille kohta luua arve, pole valitud
diff --git a/htdocs/langs/et_EE/other.lang b/htdocs/langs/et_EE/other.lang
index 4db8fc2d614..11d3b4a66cc 100644
--- a/htdocs/langs/et_EE/other.lang
+++ b/htdocs/langs/et_EE/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=Failid on liiga suured
 PleaseBePatient=Palun ole kannatlik...
 NewPassword=New password
 ResetPassword=Reset password
-RequestToResetPasswordReceived=Sinu Dolibarri parooli muutmise palve on kohale jõudnud
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=Uued sisselogimise tunnused
 NewKeyWillBe=Uus tarkvarasse sisselogimise salasõna on
 ClickHereToGoTo=Klõpsa siia, et minna %s
@@ -233,6 +233,8 @@ PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=Ekspordi ala
 AvailableFormats=Saadaval olevad formaadid
diff --git a/htdocs/langs/et_EE/productbatch.lang b/htdocs/langs/et_EE/productbatch.lang
index feab8df9ad5..3a9bea23b43 100644
--- a/htdocs/langs/et_EE/productbatch.lang
+++ b/htdocs/langs/et_EE/productbatch.lang
@@ -16,7 +16,7 @@ printEatby=Eat-by: %s
 printSellby=Sell-by: %s
 printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic increase/decrease stock mode is forced to shipping validate and manual dispatching for reception and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
 ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
diff --git a/htdocs/langs/et_EE/products.lang b/htdocs/langs/et_EE/products.lang
index 04162735b32..d921471d1e5 100644
--- a/htdocs/langs/et_EE/products.lang
+++ b/htdocs/langs/et_EE/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=Uus hind
 MinPrice=Min. selling price
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=Müügihind ei saa olla madalam kui selle toote minimaalne lubatud hind (%s km-ta). Antud sõnumit näidatakse ka siis, kui sisestad liiga suure allahindluse.
 ContractStatusClosed=Suletud
 ErrorProductAlreadyExists=Toode viitega %s on juba olemas.
@@ -155,7 +156,7 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Supplier prices
 SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
-CustomCode=Customs/Commodity/HS code
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=Päritolumaa
 Nature=Olemus
 ShortLabel=Short label
diff --git a/htdocs/langs/et_EE/projects.lang b/htdocs/langs/et_EE/projects.lang
index 780168996fc..6608c1fa194 100644
--- a/htdocs/langs/et_EE/projects.lang
+++ b/htdocs/langs/et_EE/projects.lang
@@ -77,6 +77,7 @@ Time=Aeg
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=Antud projektiga seotud pakkumised
 ListOrdersAssociatedProject=List of customer orders associated with the project
@@ -226,4 +227,4 @@ AllowCommentOnProject=Allow user comments on projects
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/et_EE/stocks.lang b/htdocs/langs/et_EE/stocks.lang
index 2d0caee5fed..321441fa473 100644
--- a/htdocs/langs/et_EE/stocks.lang
+++ b/htdocs/langs/et_EE/stocks.lang
@@ -203,3 +203,4 @@ RegulateStock=Regulate Stock
 ListInventory=Loend
 StockSupportServices=Stock management support services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/et_EE/stripe.lang b/htdocs/langs/et_EE/stripe.lang
index 638d5134b67..1384f445b68 100644
--- a/htdocs/langs/et_EE/stripe.lang
+++ b/htdocs/langs/et_EE/stripe.lang
@@ -58,8 +58,8 @@ NameOnCard=Name on card
 CardNumber=Card Number
 ExpiryDate=Expiry Date
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/et_EE/supplier_proposal.lang b/htdocs/langs/et_EE/supplier_proposal.lang
index a1dc4329869..9e807fa3d83 100644
--- a/htdocs/langs/et_EE/supplier_proposal.lang
+++ b/htdocs/langs/et_EE/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Supplier commercial proposals
-supplier_proposalDESC=Manage price requests to suppliers
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
 SupplierProposalNew=New price request
 CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
-SupplierProposalsDraft=Draft supplier proposals
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=Latest %s modified price requests
 RequestsOpened=Open price requests
-SupplierProposalArea=Supplier proposals area
-SupplierProposalShort=Supplier proposal
-SupplierProposals=Supplier proposals
-SupplierProposalsShort=Supplier proposals
+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=Supplier ref
+SupplierProposalRefFourn=Vendor ref
 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>?
@@ -47,9 +47,9 @@ CommercialAsk=Price request
 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 supplier proposal requests
-ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
-SupplierProposalsToClose=Supplier proposals to close
-SupplierProposalsToProcess=Supplier proposals to process
+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
diff --git a/htdocs/langs/et_EE/suppliers.lang b/htdocs/langs/et_EE/suppliers.lang
index c58c3beeb0c..a68a5d7df7b 100644
--- a/htdocs/langs/et_EE/suppliers.lang
+++ b/htdocs/langs/et_EE/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Hankijad
-SuppliersInvoice=Ostuarved
-ShowSupplierInvoice=Show Supplier Invoice
-NewSupplier=Uus hankija
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=Ajalugu
-ListOfSuppliers=Hankijate nimekiri
-ShowSupplier=Kuva hankija
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=Tellimuse kuupäev
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Mõnedel alatoodetel pole määratletud hinda
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
-SupplierPrices=Supplier prices
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=See hankija viide on juba seotud viitega: %s
-NoRecordedSuppliers=Ühtki hankijat pole salvestatud
-SupplierPayment=Hankija makse
-SuppliersArea=Hankijate ala
-RefSupplierShort=Hankija viide
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=Kättesaadavus
-ExportDataset_fournisseur_1=Ostuarvete nimekiri ja arvete read
-ExportDataset_fournisseur_2=Ostuarved ja maksed
-ExportDataset_fournisseur_3=Ostutellimused ja tellimuste read
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=KIida see tellimuse heaks
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
 ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
 ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
-AddSupplierOrder=Loo ostutellimus
-AddSupplierInvoice=Loo ostuarve
-ListOfSupplierProductForSupplier=Hankija <b>%s</b> toodete ja hindade nimekiri
-SentToSuppliers=Saadetud hankijatele
-ListOfSupplierOrders=List of supplier orders
-MenuOrdersSupplierToBill=Supplier orders to invoice
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-SupplierReputation=Supplier reputation
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
 AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=Supplier prices
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/et_EE/website.lang b/htdocs/langs/et_EE/website.lang
index bb3decc822f..6e11d8873be 100644
--- a/htdocs/langs/et_EE/website.lang
+++ b/htdocs/langs/et_EE/website.lang
@@ -73,7 +73,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
diff --git a/htdocs/langs/et_EE/workflow.lang b/htdocs/langs/et_EE/workflow.lang
index 289b64d83f7..92e41fafbbd 100644
--- a/htdocs/langs/et_EE/workflow.lang
+++ b/htdocs/langs/et_EE/workflow.lang
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source custome
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/eu_ES/accountancy.lang b/htdocs/langs/eu_ES/accountancy.lang
index c37db78c215..daa15928096 100644
--- a/htdocs/langs/eu_ES/accountancy.lang
+++ b/htdocs/langs/eu_ES/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Accounting
 ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
 ACCOUNTING_EXPORT_DATE=Date format for export file
 ACCOUNTING_EXPORT_PIECE=Export the number of piece
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Accounts with non zero values
 ListOfAccounts=List of accounts
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers 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
 
-AccountancyArea=Accountancy area
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
 AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
@@ -89,7 +90,7 @@ MenuProductsAccounts=Product accounts
 ProductsBinding=Products accounts
 Ventilation=Binding to accounts
 CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Supplier invoice binding
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
 ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
@@ -185,11 +187,12 @@ ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
-DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Group of account
 Pcgsubtype=Subgroup of account
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
 ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
 DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report 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 fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -293,4 +296,9 @@ Binded=Lines bound
 ToBind=Lines to bind
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang
index 9234fa9e405..86659159e5e 100644
--- a/htdocs/langs/eu_ES/admin.lang
+++ b/htdocs/langs/eu_ES/admin.lang
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS zerbitzaria (berez php.ini fitxategian adierazi
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems)
 MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=Method to use to send EMails
 MAIN_MAIL_SMTPS_ID=SMTP ID-a autentifikazio behar bada
 MAIN_MAIL_SMTPS_PW=SMTP parahitza autentifikazioa behar bada
@@ -291,7 +292,7 @@ ModuleSetup=Moduluaren konfigurazioa
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=Sistema
 ModuleFamilyCrm=Customer Relation Management (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Proiektuak/Lan-taldeak
@@ -373,7 +374,8 @@ NoSmsEngine=No SMS sender manager available. SMS sender manager are not installe
 PDF=PDF
 PDFDesc=You can set each global options related to the PDF generation
 PDFAddressForging=Rules to forge address boxes
-HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=Hide products description on generated PDF
@@ -445,7 +447,8 @@ DisplayCompanyInfo=Display company address
 DisplayCompanyManagers=Display manager names
 DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party 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.
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Set this to 1 if you want to attach main document to emai
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=Erabiltzaileak & Taldeak
 Module0Desc=Users / Employees and Groups management
@@ -479,7 +485,7 @@ Module1Desc=Companies and contact management (customers, prospects...)
 Module2Name=Komertziala
 Module2Desc=Kudeaketa komertziala
 Module10Name=Kontabilitatea
-Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching.
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=Proposamenak
 Module20Desc=Proposamen komertzialak kudeatzea
 Module22Name=Mass E-mailings
@@ -546,8 +552,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Web-egutegia
 Module410Desc=Web-egutegiaren integrazioa
-Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Payment of employee wages
 Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
@@ -561,14 +567,14 @@ Module700Name=Diru-emateak
 Module700Desc=Diru-emateak kudeatzea
 Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Mantis integration
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
 Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=WYSIWYG editorea
 Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
 Module2200Name=Dynamic Prices
@@ -576,7 +582,7 @@ Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Scheduled jobs
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API/Web services (SOAP server)
@@ -613,7 +619,7 @@ Module50100Desc=Point of sales module (POS).
 Module50200Name=Paypal
 Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Poll, Survey or Vote
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed memb
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=Other menu entries manage optional parameters.
 LogEvents=Security audit events
 Audit=Audit
@@ -1054,8 +1060,9 @@ LogEventDesc=You can enable here the logging for Dolibarr security events. Admin
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1188,11 +1195,11 @@ UserMailRequired=EMail required to create a new user
 HRMSetup=HRM module setup
 ##### Company setup #####
 CompanySetup=Companies module setup
-CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier)
-AccountCodeManager=Module for accounting code generation (customer or supplier)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
 NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
 ModelModules=Documents templates
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
@@ -1203,6 +1210,9 @@ MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
 TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=Free text on commercial proposals
 WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
 ##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=Order management setup
 OrdersNumberingModules=Orders numbering models
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe
 OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
 OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
 ##### Stock #####
-StockSetup=Warehouse module setup
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
 ##### Menu #####
 MenuDeleted=Menu deleted
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
 MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
 SuppliersSetup=Supplier module setup
-SuppliersCommandModel=Complete template of supplier order (logo...)
-SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","
 SalariesSetup=Setup of module salaries
 SortOrder=Sort order
 Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Install of external module from applic
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
-TextTitleColor=Color of page title
+TextTitleColor=Text color of Page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=Background color for Top menu
 TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
 ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-MailToMember=To send email from member page
-MailToUser=To send email from user page
-MailToProject= To send email from project page
+MailToSendProposal=Customer proposals
+MailToSendOrder=Customer orders
+MailToSendInvoice=Customer invoices
+MailToSendShipment=Bidalketak
+MailToSendIntervention=Interventions
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Kontratuak
+MailToThirdparty=Third parties
+MailToMember=Kideak
+MailToUser=Erabiltzaileak
+MailToProject=Projects page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1780,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/eu_ES/bills.lang b/htdocs/langs/eu_ES/bills.lang
index fa5fcddcf05..f02b2200566 100644
--- a/htdocs/langs/eu_ES/bills.lang
+++ b/htdocs/langs/eu_ES/bills.lang
@@ -109,7 +109,7 @@ CancelBill=Cancel an invoice
 SendRemindByMail=Oroigarria e-postaz bidali
 DoPayment=Enter payment
 DoPaymentBack=Enter refund
-ConvertToReduc=Convert into future discount
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
@@ -120,7 +120,7 @@ BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
 BillStatusPaid=Paid
-BillStatusPaidBackOrConverted=Credit note refund or converted into discount
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Abandoned
 BillStatusValidated=Validated (needs to be paid)
@@ -296,10 +296,10 @@ DiscountType=Discount type
 NoteReason=Note/Reason
 ReasonDiscount=Reason
 DiscountOfferedBy=Granted by
-DiscountStillRemaining=Discounts available
-DiscountAlreadyCounted=Discounts already consumed
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+SupplierDiscounts=Vendors discounts
 BillAddress=Bill address
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Every %s days
 FrequencyPer_m=Every %s months
 FrequencyPer_y=Every %s years
@@ -505,9 +511,14 @@ SituationAmount=Situation invoice amount(net)
 SituationDeduction=Situation subtraction
 ModifyAllLines=Modify all lines
 CreateNextSituationInvoice=Create next situation
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=S
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
 NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
@@ -532,3 +543,4 @@ AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/eu_ES/categories.lang b/htdocs/langs/eu_ES/categories.lang
index 41e5f4e4c13..c0c8d4c0cef 100644
--- a/htdocs/langs/eu_ES/categories.lang
+++ b/htdocs/langs/eu_ES/categories.lang
@@ -16,7 +16,7 @@ MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
-SubCats=Subcategories
+SubCats=Sub-categories
 CatList=List of tags/categories
 NewCategory=New tag/category
 ModifCat=Modify tag/category
@@ -85,3 +85,4 @@ CategorieRecursivHelp=If activated, product will also linked to parent category
 AddProductServiceIntoCategory=Add the following product/service
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
+ChooseCategory=Choose category
diff --git a/htdocs/langs/eu_ES/commercial.lang b/htdocs/langs/eu_ES/commercial.lang
index b7e83dbd13c..694e5f8f987 100644
--- a/htdocs/langs/eu_ES/commercial.lang
+++ b/htdocs/langs/eu_ES/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=Itxi
 ActionAC_EMAILING=Send mass email
 ActionAC_COM=Send customer order by mail
 ActionAC_SHIP=Send shipping by mail
-ActionAC_SUP_ORD=Send supplier order by mail
-ActionAC_SUP_INV=Send supplier invoice by mail
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=Besteak
 ActionAC_OTH_AUTO=Automatically inserted events
 ActionAC_MANUAL=Manually inserted events
diff --git a/htdocs/langs/eu_ES/companies.lang b/htdocs/langs/eu_ES/companies.lang
index 9dc9e6d8420..b9501126d3a 100644
--- a/htdocs/langs/eu_ES/companies.lang
+++ b/htdocs/langs/eu_ES/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Are you sure you want to delete this contact and all inheri
 MenuNewThirdParty=New third party
 MenuNewCustomer=New customer
 MenuNewProspect=New prospect
-MenuNewSupplier=New supplier
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=New private individual
-NewCompany=New company (prospect, customer, supplier)
-NewThirdParty=New third party (prospect, customer, supplier)
-CreateDolibarrThirdPartySupplier=Create a third party (supplier)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=Create third party
 CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Prospection area
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=Prospects
 ThirdPartyCustomers=Customers
 ThirdPartyCustomersStats=Customers
 ThirdPartyCustomersWithIdProf12=Customers with %s or %s
-ThirdPartySuppliers=Hornitzaileak
+ThirdPartySuppliers=Vendors
 ThirdPartyType=Third party type
 Individual=Private individual
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
@@ -77,11 +77,11 @@ Web=Web
 Poste= Posizioa
 DefaultLang=Language by default
 VATIsUsed=Sales tax is used
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
-ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Proposamenak
 OverAllOrders=Orders
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=RE Type
 TypeLocaltax2ES=IRPF Type
 WrongCustomerCode=Customer code invalid
-WrongSupplierCode=Supplier code invalid
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Customer code model
-SupplierCodeModel=Supplier code model
+SupplierCodeModel=Vendor code model
 Gencod=Bar code
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
@@ -267,7 +267,7 @@ Prospect=Prospect
 CustomerCard=Customer Card
 Customer=Bezeroa
 CustomerRelativeDiscount=Relative customer discount
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=Relative discount
 CustomerAbsoluteDiscountShort=Absolute discount
 CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this suppl
 CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
 CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
 CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=None
 Supplier=Hornitzailea
 AddContact=Kontaktua sortu
@@ -304,13 +304,13 @@ DeleteACompany=Delete a company
 PersonalInformations=Personal data
 AccountancyCode=Accounting account
 CustomerCode=Customer code
-SupplierCode=Supplier code
+SupplierCode=Vendor code
 CustomerCodeShort=Customer code
-SupplierCodeShort=Supplier code
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=Customer code, unique for all customers
-SupplierCodeDesc=Supplier code, unique for all suppliers
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=Required if third party is a customer or prospect
-RequiredIfSupplier=Required if third party is a supplier
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=Validity controled by module
 ThisIsModuleRules=This is rules for this module
 ProspectToContact=Prospect to contact
@@ -338,7 +338,7 @@ MyContacts=My contacts
 Capital=Capital
 CapitalOf=Capital of %s
 EditCompany=Edit company
-ThisUserIsNot=This user is not a prospect, customer nor supplier
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=Check
 VATIntraCheckDesc=The link <b>%s</b> allows to ask the european VAT checker service. An external internet access from server is required for this service to work.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -396,7 +396,7 @@ ImportDataset_company_4=Third parties/Sales representatives (Assign sales repres
 PriceLevel=Price level
 DeliveryAddress=Delivery address
 AddAddress=Add address
-SupplierCategory=Supplier category
+SupplierCategory=Vendor category
 JuridicalStatus200=Independent
 DeleteFile=Delete file
 ConfirmDeleteFile=Are you sure you want to delete this file?
@@ -406,7 +406,7 @@ FiscalYearInformation=Information on the fiscal year
 FiscalMonthStart=Starting month of the fiscal year
 YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
 YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
-ListSuppliersShort=List of suppliers
+ListSuppliersShort=List of vendors
 ListProspectsShort=List of prospects
 ListCustomersShort=List of customers
 ThirdPartiesArea=Third parties and contact area
@@ -420,7 +420,7 @@ CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/eu_ES/compta.lang b/htdocs/langs/eu_ES/compta.lang
index 1f50554a2d9..fc5943935e3 100644
--- a/htdocs/langs/eu_ES/compta.lang
+++ b/htdocs/langs/eu_ES/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=Net paid
 VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
-VATSummary=Tax Balance
+VATSummary=Tax monthly
+VATBalance=Tax Balance
 VATPaid=Tax paid
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=Accountancy/Treasury area
 NewPayment=New payment
 Payments=Ordainketak
 PaymentCustomerInvoice=Customer invoice payment
-PaymentSupplierInvoice=Supplier invoice payment
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
-ListOfSupplierPayments=List of supplier payments
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -110,7 +111,7 @@ ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
 CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
 SupplierAccountancyCodeShort=Sup. account. code
 AccountNumber=Account number
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
 Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
-ByProductsAndServices=By products and services
+ByProductsAndServices=By product and service
 RefExt=External ref
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
 LinkedOrder=Link to order
@@ -215,7 +218,8 @@ Mode1=Method 1
 Mode2=Method 2
 CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
 CalculationRuleDescSupplier=According to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
@@ -242,3 +246,10 @@ FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/eu_ES/dict.lang b/htdocs/langs/eu_ES/dict.lang
index 2401017338b..fc5f4cb803c 100644
--- a/htdocs/langs/eu_ES/dict.lang
+++ b/htdocs/langs/eu_ES/dict.lang
@@ -5,7 +5,8 @@ CountryIT=Italia
 CountryES=Espainia
 CountryDE=Alemania
 CountryCH=Suitza
-CountryGB=Britania Handia
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=United Kingdom
 CountryUK=United Kingdom
 CountryIE=Irlanda
 CountryCN=Txina
diff --git a/htdocs/langs/eu_ES/ecm.lang b/htdocs/langs/eu_ES/ecm.lang
index 65e9b17bdb2..5200fa30b1d 100644
--- a/htdocs/langs/eu_ES/ecm.lang
+++ b/htdocs/langs/eu_ES/ecm.lang
@@ -39,9 +39,10 @@ ShowECMSection=Show directory
 DeleteSection=Remove directory
 ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
 ECMDirectoryForFiles=Relative directory for files
-CannotRemoveDirectoryContainsFiles=Removed not possible because it contains some files
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=File manager
-ECMSelectASection=Select a directory on left tree...
+ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
diff --git a/htdocs/langs/eu_ES/errors.lang b/htdocs/langs/eu_ES/errors.lang
index ec036b28bc5..0ca7488b8cb 100644
--- a/htdocs/langs/eu_ES/errors.lang
+++ b/htdocs/langs/eu_ES/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Bar code required
 ErrorCustomerCodeAlreadyUsed=Customer code already used
 ErrorBarCodeAlreadyUsed=Bar code already used
 ErrorPrefixRequired=Prefix required
-ErrorBadSupplierCodeSyntax=Bad syntax for supplier code
-ErrorSupplierCodeRequired=Supplier code required
-ErrorSupplierCodeAlreadyUsed=Supplier code already used
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Bad parameters
 ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
 ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
@@ -87,7 +87,7 @@ ErrorsOnXLines=Errors on <b>%s</b> source record(s)
 ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
 ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s"
 ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
-ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Error on mask
 ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
-ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
diff --git a/htdocs/langs/eu_ES/install.lang b/htdocs/langs/eu_ES/install.lang
index e602c54640c..587d4f83da6 100644
--- a/htdocs/langs/eu_ES/install.lang
+++ b/htdocs/langs/eu_ES/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not
 ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
 ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be granted to be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reload all information from configuration file.
 PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
 WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called <b>install.lock</b> into Dolibarr document directory, in order to avoid malicious use of it.
 FunctionNotAvailableInThisPHP=Not available on this PHP
 ChoosedMigrateScript=Choose migration script
-DataMigration=Data migration
-DatabaseMigration=Structure database migration
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script processing
 ChooseYourSetupMode=Choose your setup mode and click "Start"...
 FreshInstall=Fresh install
@@ -146,7 +147,7 @@ NothingToDo=Nothing to do
 # upgrade
 MigrationFixData=Fix for denormalized data
 MigrationOrder=Data migration for customer's orders
-MigrationSupplierOrder=Data migration for supplier's orders
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Data migration for commercial proposals
 MigrationInvoice=Data migration for customer's invoices
 MigrationContract=Data migration for contracts
@@ -196,6 +197,8 @@ MigrationEvents=Migration of events to add event owner into assignement table
 MigrationEventsContact=Migration of events to add event contact into assignement table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 ShowNotAvailableOptions=Show not available options
diff --git a/htdocs/langs/eu_ES/ldap.lang b/htdocs/langs/eu_ES/ldap.lang
index d6360f3e540..abe11602147 100644
--- a/htdocs/langs/eu_ES/ldap.lang
+++ b/htdocs/langs/eu_ES/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Password for domain
 YouMustChangePassNextLogon=Password for user <b>%s</b> on the domain <b>%s</b> must be changed.
 UserMustChangePassNextLogon=User must change password on the domain %s
 LDAPInformationsForThisContact=Information in LDAP database for this contact
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Member type synchronized
 ContactSynchronized=Contact synchronized
 ForceSynchronize=Force synchronizing Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Failed to read LDAP database. Check LDAP module setup and database accessibility.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/eu_ES/loan.lang b/htdocs/langs/eu_ES/loan.lang
index 9aae3869cc3..534dee08867 100644
--- a/htdocs/langs/eu_ES/loan.lang
+++ b/htdocs/langs/eu_ES/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=Capital
 Insurance=Insurance
 Interest=Interest
 Nbterms=Number of terms
+Term=Term
 LoanAccountancyCapitalCode=Accounting account capital
 LoanAccountancyInsuranceCode=Accounting account insurance
 LoanAccountancyInterestCode=Accounting account interest
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=Confirm deleting this loan
 LoanDeleted=Loan Deleted Successfully
 ConfirmPayLoan=Confirm classify paid this loan
 LoanPaid=Loan Paid
-# Calc
-LoanCalc=Bank Loans Calculator
-PurchaseFinanceInfo=Purchase & Financing Information
-SalePriceOfAsset=Sale Price of Asset
-PercentageDown=Percentage Down
-LengthOfMortgage=Duration of loan
-AnnualInterestRate=Annual Interest Rate
-ExplainCalculations=Explain Calculations
-ShowMeCalculationsAndAmortization=Show me the calculations and amortization
-MortgagePaymentInformation=Mortgage Payment Information
-DownPayment=Down Payment
-DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
-InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
-MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
-MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
-MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
-MonthlyPaymentDesc=The montly payment is figured out using the following formula
-AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
-AmountFinanced=Amount Financed
-AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
-Totalsforyear=Totals for year
-MonthlyPayment=Monthly Payment
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
-GoToInterest=%s will go towards INTEREST
-GoToPrincipal=%s will go towards PRINCIPAL
-YouWillSpend=You will spend %s in year %s
 ListLoanAssociatedProject=List of loan associated with the project
 AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Interest
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-FinancialCommitment=Financial commitment
 CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/langs/eu_ES/mails.lang b/htdocs/langs/eu_ES/mails.lang
index 7fb75aa5175..0764bf3cdda 100644
--- a/htdocs/langs/eu_ES/mails.lang
+++ b/htdocs/langs/eu_ES/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Sender
 MailErrorsTo=Errors to
 MailReply=Reply to
 MailTo=Receiver(s)
+MailToUsers=To user(s)
 MailCC=Copy to
+MailToCCUsers=Copy to users(s)
 MailCCC=Cached copy to
 MailTopic=EMail topic
 MailText=Mezua
@@ -164,4 +166,4 @@ InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Informazioa
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/eu_ES/main.lang b/htdocs/langs/eu_ES/main.lang
index 26c1565229e..ce414364dac 100644
--- a/htdocs/langs/eu_ES/main.lang
+++ b/htdocs/langs/eu_ES/main.lang
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is se
 Administrator=Administrator
 Undefined=Undefined
 PasswordForgotten=Password forgotten?
+NoAccount=No account?
 SeeAbove=See above
 HomeArea=Home area
 LastConnexion=Latest connection
@@ -231,7 +232,7 @@ Limit=Limitea
 Limits=Limiteak
 Logout=Logout
 NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Konexia
+Connection=Hasi saioa honela
 Setup=Konfigurazioa
 Alert=Alert
 MenuWarnings=Alerts
@@ -402,6 +403,7 @@ DefaultTaxRate=Default tax rate
 Average=Average
 Sum=Sum
 Delta=Delta
+RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
@@ -414,7 +416,7 @@ Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
 ExternalRef=Ref. extern
-RefSupplier=Ref. supplier
+RefSupplier=Ref. vendor
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
 Comment=Comment
@@ -493,7 +495,7 @@ Received=Received
 Paid=Paid
 Topic=Subject
 ByCompanies=By third parties
-ByUsers=By users
+ByUsers=By user
 Links=Estekak
 Link=Esteka
 Rejects=Rejects
@@ -619,9 +621,9 @@ BuildDoc=Build Doc
 Entity=Environment
 Entities=Entities
 CustomerPreview=Customer preview
-SupplierPreview=Supplier preview
+SupplierPreview=Vendor preview
 ShowCustomerPreview=Show customer preview
-ShowSupplierPreview=Show supplier preview
+ShowSupplierPreview=Show vendor preview
 RefCustomer=Ref. customer
 Currency=Currency
 InfoAdmin=Information for administrators
@@ -679,7 +681,7 @@ Color=Color
 Documents=Linked files
 Documents2=Documents
 UploadDisabled=Upload disabled
-MenuAccountancy=Accountancy
+MenuAccountancy=Accounting
 MenuECM=Documents
 MenuAWStats=AWStats
 MenuMembers=Kideak
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=Products or services
 SearchIntoProjects=Proiektuak
 SearchIntoTasks=Tasks
 SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Interventions
 SearchIntoContracts=Kontratuak
 SearchIntoCustomerShipments=Customer shipments
@@ -941,3 +943,5 @@ Remote=Remote
 LocalAndRemote=Local and Remote
 KeyboardShortcut=Keyboard shortcut
 AssignedTo=Assigned to
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/eu_ES/margins.lang b/htdocs/langs/eu_ES/margins.lang
index 7d5506f6880..97ed5f003fe 100644
--- a/htdocs/langs/eu_ES/margins.lang
+++ b/htdocs/langs/eu_ES/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=As a service
 UseDiscountOnTotal=On subtotal
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
 MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best supplier price
+MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Cost price
 UnitCharges=Unit charges
 Charges=Charges
diff --git a/htdocs/langs/eu_ES/members.lang b/htdocs/langs/eu_ES/members.lang
index 4df74aea9c3..aed3f436e71 100644
--- a/htdocs/langs/eu_ES/members.lang
+++ b/htdocs/langs/eu_ES/members.lang
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
diff --git a/htdocs/langs/eu_ES/opensurvey.lang b/htdocs/langs/eu_ES/opensurvey.lang
index 87e6a74913a..76684955e56 100644
--- a/htdocs/langs/eu_ES/opensurvey.lang
+++ b/htdocs/langs/eu_ES/opensurvey.lang
@@ -58,3 +58,4 @@ MoreChoices=Enter more choices for the voters
 SurveyExpiredInfo=The poll has been closed or voting delay has expired.
 EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
 ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/eu_ES/orders.lang b/htdocs/langs/eu_ES/orders.lang
index 7aeff7e04cf..bacc69a6487 100644
--- a/htdocs/langs/eu_ES/orders.lang
+++ b/htdocs/langs/eu_ES/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Customers orders area
-SuppliersOrdersArea=Suppliers orders area
+SuppliersOrdersArea=Purchase orders area
 OrderCard=Order card
 OrderId=Order Id
 Order=Order
@@ -13,18 +13,18 @@ OrderToProcess=Order to process
 NewOrder=New order
 ToOrder=Make order
 MakeOrder=Make order
-SupplierOrder=Supplier order
-SuppliersOrders=Suppliers orders
-SuppliersOrdersRunning=Current suppliers orders
-CustomerOrder=Customer order
-CustomersOrders=Customer orders
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=Customer Order
+CustomersOrders=Bezeroen Eskaerak
 CustomersOrdersRunning=Current customer orders
 CustomersOrdersAndOrdersLines=Customer orders and order lines
 OrdersDeliveredToBill=Customer orders delivered to bill
 OrdersToBill=Customer orders delivered
 OrdersInProcess=Customer orders in process
 OrdersToProcess=Customer orders to process
-SuppliersOrdersToProcess=Supplier orders to process
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=Canceled
 StatusOrderDraftShort=Draft
 StatusOrderValidatedShort=Validated
@@ -75,15 +75,15 @@ ShowOrder=Show order
 OrdersOpened=Orders to process
 NoDraftOrders=No draft orders
 NoOrder=No order
-NoSupplierOrder=No supplier order
+NoSupplierOrder=No purchase order
 LastOrders=Latest %s customer orders
 LastCustomerOrders=Latest %s customer orders
-LastSupplierOrders=Latest %s supplier orders
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=Latest %s modified orders
 AllOrders=All orders
 NbOfOrders=Number of orders
 OrdersStatistics=Order's statistics
-OrdersStatisticsSuppliers=Supplier order's statistics
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Number of orders by month
 AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
 ListOfOrders=List of orders
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</
 GenerateBill=Generate invoice
 ClassifyShipped=Classify delivered
 DraftOrders=Draft orders
-DraftSuppliersOrders=Draft suppliers orders
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=In process orders
 RefOrder=Ref. order
 RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for supplier
-RefOrderSupplierShort=Ref. order supplier
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=Send order by mail
 ActionsOnOrder=Events on order
 NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
 DispatchSupplierOrder=Receiving supplier order %s
 FirstApprovalAlreadyDone=First approval already done
 SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=Supplier order %s received %s
-SupplierOrderSubmitedInDolibarr=Supplier order %s submited
-SupplierOrderClassifiedBilled=Supplier order %s set billed
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Other orders
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
@@ -125,11 +125,11 @@ TypeContact_commande_internal_SHIPPING=Representative following-up shipping
 TypeContact_commande_external_BILLING=Customer invoice contact
 TypeContact_commande_external_SHIPPING=Customer shipping contact
 TypeContact_commande_external_CUSTOMER=Customer contact following-up order
-TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
-TypeContact_order_supplier_external_BILLING=Supplier invoice contact
-TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact
-TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
 Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
 Error_OrderNotChecked=No orders to invoice selected
diff --git a/htdocs/langs/eu_ES/other.lang b/htdocs/langs/eu_ES/other.lang
index bae24449fa4..e6b190af1de 100644
--- a/htdocs/langs/eu_ES/other.lang
+++ b/htdocs/langs/eu_ES/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=Files is too big
 PleaseBePatient=Please be patient...
 NewPassword=New password
 ResetPassword=Reset password
-RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
@@ -233,6 +233,8 @@ PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=Exports area
 AvailableFormats=Available formats
diff --git a/htdocs/langs/eu_ES/productbatch.lang b/htdocs/langs/eu_ES/productbatch.lang
index ea678dd50ae..fa8e5e62d68 100644
--- a/htdocs/langs/eu_ES/productbatch.lang
+++ b/htdocs/langs/eu_ES/productbatch.lang
@@ -16,7 +16,7 @@ printEatby=Eat-by: %s
 printSellby=Sell-by: %s
 printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic increase/decrease stock mode is forced to shipping validate and manual dispatching for reception and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
 ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
diff --git a/htdocs/langs/eu_ES/products.lang b/htdocs/langs/eu_ES/products.lang
index df077e0d5a8..8ad945d4488 100644
--- a/htdocs/langs/eu_ES/products.lang
+++ b/htdocs/langs/eu_ES/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
 MinPrice=Min. selling price
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
 ContractStatusClosed=Closed
 ErrorProductAlreadyExists=A product with reference %s already exists.
@@ -155,7 +156,7 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Supplier prices
 SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
-CustomCode=Customs/Commodity/HS code
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
 Nature=Nature
 ShortLabel=Short label
diff --git a/htdocs/langs/eu_ES/projects.lang b/htdocs/langs/eu_ES/projects.lang
index 70e1457a0ee..ea77b367d8b 100644
--- a/htdocs/langs/eu_ES/projects.lang
+++ b/htdocs/langs/eu_ES/projects.lang
@@ -77,6 +77,7 @@ Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer orders associated with the project
@@ -226,4 +227,4 @@ AllowCommentOnProject=Allow user comments on projects
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/eu_ES/stocks.lang b/htdocs/langs/eu_ES/stocks.lang
index 6fd65070e8c..7b3a6615365 100644
--- a/htdocs/langs/eu_ES/stocks.lang
+++ b/htdocs/langs/eu_ES/stocks.lang
@@ -203,3 +203,4 @@ RegulateStock=Regulate Stock
 ListInventory=List
 StockSupportServices=Stock management support services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/eu_ES/stripe.lang b/htdocs/langs/eu_ES/stripe.lang
index c8cf25aa87d..7f9d13aa46d 100644
--- a/htdocs/langs/eu_ES/stripe.lang
+++ b/htdocs/langs/eu_ES/stripe.lang
@@ -58,8 +58,8 @@ NameOnCard=Name on card
 CardNumber=Card Number
 ExpiryDate=Expiry Date
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/eu_ES/supplier_proposal.lang b/htdocs/langs/eu_ES/supplier_proposal.lang
index d5b51978920..ef2e7242e31 100644
--- a/htdocs/langs/eu_ES/supplier_proposal.lang
+++ b/htdocs/langs/eu_ES/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Supplier commercial proposals
-supplier_proposalDESC=Manage price requests to suppliers
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
 SupplierProposalNew=New price request
 CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
-SupplierProposalsDraft=Draft supplier proposals
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=Latest %s modified price requests
 RequestsOpened=Open price requests
-SupplierProposalArea=Supplier proposals area
-SupplierProposalShort=Supplier proposal
-SupplierProposals=Supplier proposals
-SupplierProposalsShort=Supplier proposals
+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=Supplier ref
+SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=Delivery date
 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>?
@@ -47,9 +47,9 @@ CommercialAsk=Price request
 DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposals=List of supplier proposal requests
-ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
-SupplierProposalsToClose=Supplier proposals to close
-SupplierProposalsToProcess=Supplier proposals to process
+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
diff --git a/htdocs/langs/eu_ES/suppliers.lang b/htdocs/langs/eu_ES/suppliers.lang
index a2e15cd786d..d0cf540d3eb 100644
--- a/htdocs/langs/eu_ES/suppliers.lang
+++ b/htdocs/langs/eu_ES/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Hornitzaileak
-SuppliersInvoice=Suppliers invoice
-ShowSupplierInvoice=Show Supplier Invoice
-NewSupplier=New supplier
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=History
-ListOfSuppliers=List of suppliers
-ShowSupplier=Show supplier
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=Order date
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
-SupplierPrices=Supplier prices
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
-NoRecordedSuppliers=No suppliers recorded
-SupplierPayment=Supplier payment
-SuppliersArea=Suppliers area
-RefSupplierShort=Ref. supplier
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=Availability
-ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
-ExportDataset_fournisseur_2=Supplier invoices and payments
-ExportDataset_fournisseur_3=Supplier orders and order lines
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=Approve this order
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
 ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
 ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
-AddSupplierOrder=Create supplier order
-AddSupplierInvoice=Create supplier invoice
-ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
-SentToSuppliers=Sent to suppliers
-ListOfSupplierOrders=List of supplier orders
-MenuOrdersSupplierToBill=Supplier orders to invoice
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-SupplierReputation=Supplier reputation
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
 AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=Supplier prices
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/eu_ES/website.lang b/htdocs/langs/eu_ES/website.lang
index a2baa7dcf07..bd74a3bdf89 100644
--- a/htdocs/langs/eu_ES/website.lang
+++ b/htdocs/langs/eu_ES/website.lang
@@ -73,7 +73,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
diff --git a/htdocs/langs/eu_ES/workflow.lang b/htdocs/langs/eu_ES/workflow.lang
index a50bd91595b..783373ad66d 100644
--- a/htdocs/langs/eu_ES/workflow.lang
+++ b/htdocs/langs/eu_ES/workflow.lang
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source custome
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/fa_IR/accountancy.lang b/htdocs/langs/fa_IR/accountancy.lang
index 61889177e87..cf4e45d8bd5 100644
--- a/htdocs/langs/fa_IR/accountancy.lang
+++ b/htdocs/langs/fa_IR/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=حسابداری
 ACCOUNTING_EXPORT_SEPARATORCSV=جداکنندۀ ستون برای فایل صادرات
 ACCOUNTING_EXPORT_DATE=حالت بندی تاریخ برای صادرات
 ACCOUNTING_EXPORT_PIECE=صادر کردن به تعداد
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Accounts with non zero values
 ListOfAccounts=List of accounts
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers 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
 
-AccountancyArea=Accountancy area
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
 AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
@@ -89,7 +90,7 @@ MenuProductsAccounts=Product accounts
 ProductsBinding=Products accounts
 Ventilation=شامل شدن به حساب های
 CustomersVentilation=شامل شدن با صورت حسابهای مشتری
-SuppliersVentilation=شامل شدن با صورت حسابهای تامین کننده
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=ایجاد نقل و انتقال جدید
 UpdateMvts=ویرایش نقل و انتقال
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
 ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
@@ -185,11 +187,12 @@ ListeMvts=List of movements
 ErrorDebitCredit=بدهی و اعتبار نمی توانند بطور همزمان حاوی مقدار باشند
 AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
-DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=فهرست حساب های حسابداری
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Group of account
 Pcgsubtype=Subgroup of account
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
 ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
 DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report 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 fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -293,4 +296,9 @@ Binded=Lines bound
 ToBind=Lines to bind
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang
index 66412163c61..2be9185620c 100644
--- a/htdocs/langs/fa_IR/admin.lang
+++ b/htdocs/langs/fa_IR/admin.lang
@@ -3,9 +3,9 @@ Foundation=موسسه
 Version=نسخه
 Publisher=Publisher
 VersionProgram=نسخه برنامه 
-VersionLastInstall=Initial install version
-VersionLastUpgrade=Latest version upgrade
-VersionExperimental=تجربی
+VersionLastInstall=نسخه اولیه نصب شده
+VersionLastUpgrade=آخرين نسخه ارتقا يافته
+VersionExperimental=آزمایشی
 VersionDevelopment=توسعه
 VersionUnknown=ناشناخته
 VersionRecommanded=توصیه شده
@@ -29,7 +29,7 @@ SessionId=شناسه جلسه
 SessionSaveHandler=هندلر برای صرفه جویی در جلسات
 SessionSavePath=محلی سازی را وارد نمایید و ذخیره سازی
 PurgeSessions=پاکسازی جلسات
-ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
+ConfirmPurgeSessions=آيا واقعاً می‌خواهيد تمام جلسات پاک شود؟ در اين حالت اتصال همه کاربران قطع می شود (بجز خودتان)
 NoSessionListWithThisHandler=کنترل جویی در هزینه را وارد نمایید پیکربندی در PHP شما اجازه نمی دهد که لیست تمام جلسات در حال اجرا.
 LockNewSessions=قفل کردن ارتباطات جدید
 ConfirmLockNewSessions=آیا مطمئن هستید که می خواهید برای محدود کردن هر اتصال جدید Dolibarr به خودتان. تنها <b>کاربر٪ s را</b> قادر پس از آن برای اتصال خواهد بود.
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=SMTP / SMTPS میزبان (به طور پیش فرض در
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP / SMTPS بندر (به PHP بر روی یونیکس تعریف نشده مانند سیستم)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPS هاست (به PHP بر روی یونیکس تعریف نشده مانند سیستم)
 MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= ارسال سیستماتیک مخفی کربن کپی از همه ایمیل های ارسال شده به
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=روش استفاده برای ارسال ایمیل
 MAIN_MAIL_SMTPS_ID=SMTP ID اگر احراز هویت مورد نیاز
 MAIN_MAIL_SMTPS_PW=SMTP رمز عبور در صورت احراز هویت مورد نیاز
@@ -291,7 +292,7 @@ ModuleSetup=ماژول راه اندازی
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=سیستم
 ModuleFamilyCrm=مدیریت ارتباط با مشتری (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=پروژه ها / کار مشارکتی
@@ -373,7 +374,8 @@ NoSmsEngine=بدون SMS مدیر فرستنده در دسترس است. مدی
 PDF=PDF
 PDFDesc=شما می توانید هر یک از گزینه های جهانی مربوط به نسل PDF مجموعه
 PDFAddressForging=قوانین برای ایجاد جعبه آدرس
-HideAnyVATInformationOnPDF=مخفی کردن همه اطلاعات مربوط به مالیات بر ارزش افزوده در تولید PDF
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=پنهان کردن محصولات توضیحات در تولید PDF
@@ -445,7 +447,8 @@ DisplayCompanyInfo=Display company address
 DisplayCompanyManagers=Display manager names
 DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party 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.
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Set this to 1 if you want to attach main document to emai
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=کاربران و گروه های
 Module0Desc=Users / Employees and Groups management
@@ -479,7 +485,7 @@ Module1Desc=شرکت ها و مدیریت تماس (مشتریان، چشم ان
 Module2Name=تجاری
 Module2Desc=مدیریت بازرگانی
 Module10Name=حسابداری
-Module10Desc=گزارش حسابداری ساده (مجلات، گردش مالی) بر روی محتوای پایگاه داده باشد. بدون اعزام.
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=پیشنهادات
 Module20Desc=مدیریت طرح های تجاری
 Module22Name=توده E-نامههای پستی
@@ -546,8 +552,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=ادغام Webcalendar
-Module500Name=هزینه های ویژه
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Payment of employee wages
 Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
@@ -561,14 +567,14 @@ Module700Name=کمک های مالی
 Module700Desc=مدیریت کمک مالی
 Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=اخوندک
 Module1200Desc=ادغام آخوندک
 Module1520Name=ساخت سند
 Module1520Desc=Mass mail document generation
 Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=ویرایشگر WYSIWYG
 Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
 Module2200Name=قیمت های پویا.
@@ -576,7 +582,7 @@ Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=شغل برنامه ریزی
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API/Web services (SOAP server)
@@ -613,7 +619,7 @@ Module50100Desc=Point of sales module (POS).
 Module50200Name=پی پال
 Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Poll, Survey or Vote
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=تاخیر تحمل (در روز) قبل از آماد
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=تاخیر تحمل (در روز) قبل از آماده باش برای چک سپرده به انجام
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=دیگر نوشته های منو مدیریت پارامتر اختیاری دارد.
 LogEvents=رویدادهای ممیزی امنیت
 Audit=ممیزی
@@ -1054,8 +1060,9 @@ LogEventDesc=شما می توانید در اینجا قادر به ورود ب
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=اطلاعات سیستم اطلاعات فنی موارد دیگر شما در حالت فقط خواندنی و قابل مشاهده فقط برای مدیران دریافت می باشد.
 SystemAreaForAdminOnly=این منطقه در دسترس است فقط برای کاربران مدیر سیستم باشد. هیچ یک از مجوز Dolibarr می تواند از این حد کاهش دهد.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=شما می توانید هر پارامتر مربوط به نگاه Dolibarr را انتخاب کنید و احساس می کنید در اینجا
 AvailableModules=Available app/modules
 ToActivateModule=برای فعال کردن ماژول ها، رفتن در منطقه راه اندازی (صفحه اصلی> راه اندازی-> ماژول).
@@ -1188,11 +1195,11 @@ UserMailRequired=ایمیل مورد نیاز برای ایجاد یک کارب
 HRMSetup=HRM module setup
 ##### Company setup #####
 CompanySetup=راه اندازی ماژول شرکت
-CompanyCodeChecker=ماژول برای نسل اشخاص ثالث کد و چک کردن (مشتری یا عرضه کننده کالا)
-AccountCodeManager=Module for accounting code generation (customer or supplier)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
 NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
 ModelModules=اسناد قالب
 DocumentModelOdt=تولید اسناد از OpenDocuments قالب (. ODT و یا فایل های ODS برای آفیس اپن سورس کنند، KOffice، TextEdit، ...)
@@ -1203,6 +1210,9 @@ MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
 TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=لینک صادرات به <b>فرمت٪ s</b> در لینک زیر موجود است:٪ s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=متن رایگان در طرح های تجاری
 WatermarkOnDraftProposal=تعیین میزان مد آب در پیش نویس طرح تجاری (هیچ اگر خالی)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
 ##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=راه اندازی مدیریت سفارش
 OrdersNumberingModules=سفارشات شماره مدل
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=اتصال به سرور '٪ s' را در پایگاه داده
 OSCommerceTestKo1=اتصال به کارگزار «٪ s 'موفق اما پایگاه داده'٪ s 'را نمی تواند رسید.
 OSCommerceTestKo2=اتصال به کارگزار «٪ s 'با کاربر'٪ s 'شکست خورده است.
 ##### Stock #####
-StockSetup=Warehouse module setup
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
 ##### Menu #####
 MenuDeleted=منوی حذف
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
 MultiCompanySetup=چند شرکت نصب ماژول
 ##### Suppliers #####
 SuppliersSetup=تامین کننده راه اندازی ماژول
-SuppliersCommandModel=قالب کامل جهت عرضه کننده کالا (logo. ..)
-SuppliersInvoiceModel=قالب کامل منبع فاکتور (logo. ..)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=فاکتورها تامین کننده شماره مدل
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","
 SalariesSetup=Setup of module salaries
 SortOrder=Sort order
 Format=قالب
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Install of external module from applic
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
-TextTitleColor=Color of page title
+TextTitleColor=Text color of Page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=Background color for Top menu
 TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
 ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-MailToMember=To send email from member page
-MailToUser=To send email from user page
-MailToProject= To send email from project page
+MailToSendProposal=Customer proposals
+MailToSendOrder=Customer orders
+MailToSendInvoice=Customer invoices
+MailToSendShipment=حمل و نقل
+MailToSendIntervention=مداخلات
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=قراردادها
+MailToThirdparty=احزاب سوم
+MailToMember=کاربران
+MailToUser=کاربران
+MailToProject=Projects page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1780,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/fa_IR/bills.lang b/htdocs/langs/fa_IR/bills.lang
index 25f4f69129f..203fba7a6e9 100644
--- a/htdocs/langs/fa_IR/bills.lang
+++ b/htdocs/langs/fa_IR/bills.lang
@@ -109,7 +109,7 @@ CancelBill=لغو فاکتور
 SendRemindByMail=ارسال یادآور با ایمیل
 DoPayment=Enter payment
 DoPaymentBack=Enter refund
-ConvertToReduc=تبدیل به تخفیف آینده
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=پرداخت های دریافت شده از مشتری را وارد کنید
@@ -120,7 +120,7 @@ BillStatus=وضعیت فاکتور
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=پیش نویس (نیاز به تایید می شود)
 BillStatusPaid=پرداخت
-BillStatusPaidBackOrConverted=Credit note refund or converted into discount
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=متروک
 BillStatusValidated=اعتبار (نیاز به پرداخت می شود)
@@ -296,10 +296,10 @@ DiscountType=Discount type
 NoteReason=توجه داشته باشید / عقل
 ReasonDiscount=دلیل
 DiscountOfferedBy=اعطا شده از
-DiscountStillRemaining=Discounts available
-DiscountAlreadyCounted=Discounts already consumed
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+SupplierDiscounts=Vendors discounts
 BillAddress=آدرس بیل
 HelpEscompte=این تخفیف تخفیف اعطا شده به مشتری است، زیرا پرداخت آن قبل از واژه ساخته شده است.
 HelpAbandonBadCustomer=این مقدار متوقف شده (مشتری گفته می شود یک مشتری بد) است و به عنوان یک شل استثنایی در نظر گرفته.
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Every %s days
 FrequencyPer_m=Every %s months
 FrequencyPer_y=Every %s years
@@ -505,9 +511,14 @@ SituationAmount=Situation invoice amount(net)
 SituationDeduction=Situation subtraction
 ModifyAllLines=Modify all lines
 CreateNextSituationInvoice=Create next situation
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=S
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
 NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
@@ -532,3 +543,4 @@ AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/fa_IR/categories.lang b/htdocs/langs/fa_IR/categories.lang
index 0b9bcf3900b..c75835a389e 100644
--- a/htdocs/langs/fa_IR/categories.lang
+++ b/htdocs/langs/fa_IR/categories.lang
@@ -16,7 +16,7 @@ MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
-SubCats=زیر شاخه ها
+SubCats=Sub-categories
 CatList=List of tags/categories
 NewCategory=New tag/category
 ModifCat=Modify tag/category
@@ -85,3 +85,4 @@ CategorieRecursivHelp=اگر فعال شود، محصول نیز به دسته 
 AddProductServiceIntoCategory=افزودن پیگیری محصول/سرویس
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
+ChooseCategory=Choose category
diff --git a/htdocs/langs/fa_IR/commercial.lang b/htdocs/langs/fa_IR/commercial.lang
index 9d4fe42753b..5f357b8e982 100644
--- a/htdocs/langs/fa_IR/commercial.lang
+++ b/htdocs/langs/fa_IR/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=نزدیک
 ActionAC_EMAILING=ارسال ایمیل انبوه
 ActionAC_COM=ارسال سفارش مشتری از طریق پست
 ActionAC_SHIP=ارسال حمل و نقل از طریق پست
-ActionAC_SUP_ORD=ارسال سفارش کالا از طریق پست
-ActionAC_SUP_INV=ارسال کننده کالا صورت حساب از طریق پست
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=دیگر
 ActionAC_OTH_AUTO=رویدادی به صورت خودکار قرار داده
 ActionAC_MANUAL=رویدادهای دستی قرار داده
diff --git a/htdocs/langs/fa_IR/companies.lang b/htdocs/langs/fa_IR/companies.lang
index e34a7cbde5e..e5c540124da 100644
--- a/htdocs/langs/fa_IR/companies.lang
+++ b/htdocs/langs/fa_IR/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Are you sure you want to delete this contact and all inheri
 MenuNewThirdParty=شخص ثالث جدید
 MenuNewCustomer=مشتری جدید
 MenuNewProspect=چشم انداز جدید
-MenuNewSupplier=منبع جدید
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=فردی خصوصی جدید
-NewCompany=شرکت جدید (چشم انداز، مشتری، عرضه کننده کالا)
-NewThirdParty=شخص ثالث جدید (چشم انداز، مشتری، عرضه کننده کالا)
-CreateDolibarrThirdPartySupplier=ایجاد یک حزب سوم (منبع)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=Create third party
 CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=منطقه Prospection
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=چشم انداز
 ThirdPartyCustomers=مشتریان
 ThirdPartyCustomersStats=مشتریان
 ThirdPartyCustomersWithIdProf12=مشتریان با٪ s یا٪ s
-ThirdPartySuppliers=تامین کنندگان
+ThirdPartySuppliers=Vendors
 ThirdPartyType=نوع شخص ثالث
 Individual=فردی خصوصی
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
@@ -77,11 +77,11 @@ Web=وب سایت
 Poste= درجه
 DefaultLang=زبان پیش فرض
 VATIsUsed=Sales tax is used
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
-ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=پیشنهادات
 OverAllOrders=سفارشات
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=نوع RE
 TypeLocaltax2ES=IRPF نوع
 WrongCustomerCode=کد مشتری نامعتبر است
-WrongSupplierCode=کد تامین کننده نامعتبر است
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=مدل کد مشتری
-SupplierCodeModel=مدل کد تامین کننده
+SupplierCodeModel=Vendor code model
 Gencod=کد نوار
 ##### Professional ID #####
 ProfId1Short=پروفسور شناسه (شماره) 1
@@ -267,7 +267,7 @@ Prospect=چشم انداز
 CustomerCard=کارت به مشتری
 Customer=مشتریان
 CustomerRelativeDiscount=تخفیف به مشتریان نسبی
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=تخفیف نسبی
 CustomerAbsoluteDiscountShort=تخفیف مطلق
 CompanyHasRelativeDiscount=این مشتری است تخفیف به طور پیش فرض <b>از٪ s٪٪</b>
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this suppl
 CompanyHasNoAbsoluteDiscount=این مشتری است هیچ اعتباری تخفیف در دسترس
 CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
 CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=هیچ یک
 Supplier=تامین کننده
 AddContact=Create contact
@@ -304,13 +304,13 @@ DeleteACompany=حذف یک شرکت
 PersonalInformations=اطلاعات شخصی
 AccountancyCode=حساب حسابداری
 CustomerCode=کد مشتری
-SupplierCode=کد تامین کننده
+SupplierCode=Vendor code
 CustomerCodeShort=کد مشتری
-SupplierCodeShort=کد تامین کننده
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=کد مشتری، منحصر به فرد برای همه مشتریان
-SupplierCodeDesc=کد تامین کننده، منحصر به فرد برای همه تامین کنندگان
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=در صورتیکه شخص ثالث یک مشتری و یا چشم انداز است
-RequiredIfSupplier=در صورتیکه شخص ثالث تامین کنندگان است
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=اعتبار کنترل های ماژول
 ThisIsModuleRules=این قوانین برای این ماژول است
 ProspectToContact=چشم انداز تماس
@@ -338,7 +338,7 @@ MyContacts=مخاطبین من
 Capital=سرمایه
 CapitalOf=سرمایه از٪ s
 EditCompany=ویرایش شرکت
-ThisUserIsNot=این کاربر، چشم انداز، مشتری و نه عرضه کننده کالا نمی
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=تصفیه
 VATIntraCheckDesc=لینک <b>از٪ s</b> اجازه می دهد تا به درخواست سرویس جستجوگر مالیات بر ارزش افزوده اروپا. دسترسی به اینترنت خارجی را از سرور مورد نیاز است برای این سرویس به کار می کنند.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -396,7 +396,7 @@ ImportDataset_company_4=Third parties/Sales representatives (Assign sales repres
 PriceLevel=سطح قیمت
 DeliveryAddress=آدرس تحویل
 AddAddress=اضافه کردن آدرس
-SupplierCategory=طبقه بندی کننده
+SupplierCategory=Vendor category
 JuridicalStatus200=Independent
 DeleteFile=حذف فایل
 ConfirmDeleteFile=آیا مطمئن هستید که می خواهید این فایل را حذف کنید؟
@@ -406,7 +406,7 @@ FiscalYearInformation=اطلاعات در سال مالی
 FiscalMonthStart=شروع ماه از سال مالی
 YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
 YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
-ListSuppliersShort=فهرست تامین کنندگان
+ListSuppliersShort=List of vendors
 ListProspectsShort=فهرست چشم انداز
 ListCustomersShort=فهرست مشتریان
 ThirdPartiesArea=Third parties and contact area
@@ -420,7 +420,7 @@ CurrentOutstandingBill=لایحه برجسته کنونی
 OutstandingBill=حداکثر. برای لایحه برجسته
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=numero بازگشت با فرمت syymm-NNNN برای کد مشتری و٪ syymm-NNNN برای کد منبع که در آن YY سال است٪، میلی متر در ماه است و NNNN دنباله بدون استراحت و بدون بازگشت به 0 است.
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=کد آزاد است. این کد را می توان در هر زمان تغییر یافتهاست.
 ManagingDirectors=مدیر (بازدید کنندگان) نام (مدیر عامل شرکت، مدیر، رئيس جمهور ...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/fa_IR/compta.lang b/htdocs/langs/fa_IR/compta.lang
index 1906c78c042..00864db2514 100644
--- a/htdocs/langs/fa_IR/compta.lang
+++ b/htdocs/langs/fa_IR/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=خالص پرداخت می شود
 VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
-VATSummary=Tax Balance
+VATSummary=Tax monthly
+VATBalance=Tax Balance
 VATPaid=Tax paid
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=منطقه حسابداری / خزانه داری
 NewPayment=پرداخت جدید
 Payments=پرداخت
 PaymentCustomerInvoice=پرداخت صورت حساب به مشتری
-PaymentSupplierInvoice=پرداخت صورتحساب تامین کننده
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=پرداخت مالیات بر ارزش افزوده
 ListPayment=فهرست پرداخت
 ListOfCustomerPayments=لیست پرداخت های مشتری
-ListOfSupplierPayments=لیست پرداخت های منبع
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=دوره تاریخ شروع
 DateEndPeriod=دوره تاریخ پایان
 newLT1Payment=New tax 2 payment
@@ -110,7 +111,7 @@ ShowVatPayment=نمایش پرداخت مالیات بر ارزش افزوده
 TotalToPay=مجموع به پرداخت
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
 CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
 SupplierAccountancyCodeShort=Sup. account. code
 AccountNumber=شماره حساب
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=گزارش شده توسط شخص ثالث RE
 LT2ReportByCustomersES=گزارش شده توسط شخص ثالث IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=گزارش های مالیات بر ارزش افزوده مشتری جمع آوری و پرداخت
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Chart of accounts models
 Pcg_type=نوع PCG
 Pcg_subtype=زیر گروه PCG
 InvoiceLinesToDispatch=خطوط فاکتور به اعزام
-ByProductsAndServices=با محصولات و خدمات
+ByProductsAndServices=By product and service
 RefExt=کد عکس خارجی
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
 LinkedOrder=Link to order
@@ -215,7 +218,8 @@ Mode1=روش 1
 Mode2=روش 2
 CalculationRuleDesc=برای محاسبه مالیات بر ارزش افزوده در کل، دو روش وجود دارد: <br> روش 1 است گرد کردن مالیات بر ارزش افزوده در هر خط، و سپس جمع آنها. <br> روش 2 است جمع تمام مالیات بر ارزش افزوده در هر خط، و سپس گرد کردن نتیجه. <br> نتیجه نهایی ممکن است از چند سنت متفاوت است. حالت پیش فرض <b>حالت٪ s است.</b>
 CalculationRuleDescSupplier=According to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=گزارش گردش مالی در هر محصول، در هنگام استفاده از حالت <b>حسابداری نقدی</b> مربوط نیست. این گزارش که با استفاده از <b>تعامل</b> حالت <b>حسابداری</b> (راه اندازی ماژول حسابداری را مشاهده کنید) فقط در دسترس است.
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=حالت محاسبه
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
@@ -242,3 +246,10 @@ FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/fa_IR/dict.lang b/htdocs/langs/fa_IR/dict.lang
index 6a169d3ad8d..be678a6bd65 100644
--- a/htdocs/langs/fa_IR/dict.lang
+++ b/htdocs/langs/fa_IR/dict.lang
@@ -5,7 +5,8 @@ CountryIT=ایتالیا
 CountryES=کشور اسپانیا
 CountryDE=آلمان
 CountryCH=سویس
-CountryGB=بریتانیا
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=پادشاهی متحده
 CountryUK=پادشاهی متحده
 CountryIE=ایرلند
 CountryCN=کشور چین
diff --git a/htdocs/langs/fa_IR/ecm.lang b/htdocs/langs/fa_IR/ecm.lang
index 1dad8a6d342..9cb9e2cf546 100644
--- a/htdocs/langs/fa_IR/ecm.lang
+++ b/htdocs/langs/fa_IR/ecm.lang
@@ -39,9 +39,10 @@ ShowECMSection=نمایش دایرکتوری
 DeleteSection=حذف دایرکتوری
 ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
 ECMDirectoryForFiles=دایرکتوری نسبی برای فایل ها
-CannotRemoveDirectoryContainsFiles=ممکن است حذف شده، زیرا حاوی بعضی از فایل ها نمی
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=مدیریت فایل ها
-ECMSelectASection=انتخاب یک دایرکتوری در درخت سمت چپ ...
+ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
diff --git a/htdocs/langs/fa_IR/errors.lang b/htdocs/langs/fa_IR/errors.lang
index 7886ebadee5..89754d79012 100644
--- a/htdocs/langs/fa_IR/errors.lang
+++ b/htdocs/langs/fa_IR/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=کد نوار مورد نیاز
 ErrorCustomerCodeAlreadyUsed=کد مشتری در حال حاضر استفاده می شود
 ErrorBarCodeAlreadyUsed=کد نوار در حال حاضر استفاده می شود
 ErrorPrefixRequired=پیشوند مورد نیاز
-ErrorBadSupplierCodeSyntax=نحو بد برای کد منبع
-ErrorSupplierCodeRequired=کد تامین کننده مورد نیاز
-ErrorSupplierCodeAlreadyUsed=کد تامین کننده در حال حاضر استفاده می شود
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=پارامترهای بد
 ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
 ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
@@ -87,7 +87,7 @@ ErrorsOnXLines=خطا <b>در٪ s را</b> ثبت منبع (ها)
 ErrorFileIsInfectedWithAVirus=برنامه آنتی ویروس قادر به اعتبار فایل (فایل ممکن است توسط یک ویروس آلوده)
 ErrorSpecialCharNotAllowedForField=شخصیت های ویژه برای رشته "٪ s" مجاز نیست
 ErrorNumRefModel=مرجع به پایگاه داده وجود دارد (٪ s) و سازگار با این قانون شماره نیست. حذف رکورد و یا مرجع تغییر نام داد و به این ماژول را فعال کنید.
-ErrorQtyTooLowForThisSupplier=مقدار خیلی کم برای این عرضه کننده کالا یا بدون قیمت در این محصول برای این کالا تعریف شده
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=خطا در ماسک
 ErrorBadMaskFailedToLocatePosOfSequence=خطا، ماسک بدون شماره ترتیب
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
-ErrorSupplierCountryIsNotDefined=کشور برای این کالا تعریف نشده است. اولین تصحیح این.
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
diff --git a/htdocs/langs/fa_IR/install.lang b/htdocs/langs/fa_IR/install.lang
index 4fec2d61286..b7a4bfbac3a 100644
--- a/htdocs/langs/fa_IR/install.lang
+++ b/htdocs/langs/fa_IR/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=فایل <b>پیکربندی٪ s</b> 
 ConfFileCouldBeCreated=فایل <b>پیکربندی٪ s را</b> می تواند ایجاد شود.
 ConfFileIsNotWritable=فایل <b>پیکربندی٪ است</b> قابل نوشتن نیست. مجوز بررسی کنید. برای اولین بار نصب کنید، وب سرور شما باید اعطا می شود که قادر به ارسال این فایل در فرایند پیکربندی (به عنوان مثال در یونیکس مانند سیستم عامل "سطح دسترسی 666").
 ConfFileIsWritable=فایل <b>پیکربندی٪ s</b> قابل نوشتن است.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=بازنگری تمام اطلاعات از فایل پیکربندی.
 PHPSupportSessions=این جلسات PHP پشتیبانی می کند.
 PHPSupportPOSTGETOk=این PHP پشتیبانی از متغیر های POST و GET.
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
 WarningRemoveInstallDir=اخطار، به دلایل امنیتی، پس از نصب و یا ارتقا کامل است، برای جلوگیری از استفاده از ابزار را دوباره نصب کنید، شما باید یک فایل <b>install.lock</b> به دایرکتوری سند Dolibarr نام اضافه، به منظور جلوگیری از سوء استفاده از آن را.
 FunctionNotAvailableInThisPHP=در این پی اچ پی در دسترس نیست
 ChoosedMigrateScript=را انتخاب کنید اسکریپت مهاجرت
-DataMigration=اطلاعات مهاجرت
-DatabaseMigration=مهاجرت پایگاه داده ساختار
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=پردازش اسکریپت
 ChooseYourSetupMode=حالت راه اندازی خود را انتخاب کنید و دکمه "شروع" ...
 FreshInstall=تازه نصب
@@ -146,7 +147,7 @@ NothingToDo=Nothing to do
 # upgrade
 MigrationFixData=ثابت برای داده های denormalized
 MigrationOrder=اطلاعات مهاجرت برای سفارشات مشتری
-MigrationSupplierOrder=اطلاعات مهاجرت برای سفارشات کننده
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=مهاجرت داده ها برای طرح های تجاری
 MigrationInvoice=اطلاعات مهاجرت برای صورت حساب مشتری
 MigrationContract=اطلاعات مهاجرت برای قرارداد
@@ -196,6 +197,8 @@ MigrationEvents=Migration of events to add event owner into assignement table
 MigrationEventsContact=Migration of events to add event contact into assignement table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 ShowNotAvailableOptions=نمایش گزینه های در دسترس نیست
diff --git a/htdocs/langs/fa_IR/ldap.lang b/htdocs/langs/fa_IR/ldap.lang
index 49ba425d67f..f19f47d011b 100644
--- a/htdocs/langs/fa_IR/ldap.lang
+++ b/htdocs/langs/fa_IR/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=رمز عبور برای دامنه
 YouMustChangePassNextLogon=رمز عبور برای <b> کاربر از٪ s </ B> در دامنه <b> از٪ s </ b> باید تغییر کند.
 UserMustChangePassNextLogon=کاربر باید رمز عبور بر روی دامنه را تغییر دهد %s
 LDAPInformationsForThisContact=اطلاعات در پایگاه داده LDAP برای این مخاطب
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Member type synchronized
 ContactSynchronized=تعریف تماس
 ForceSynchronize=هماهنگ سازی نیروی Dolibarr -> LDAP
 ErrorFailedToReadLDAP=برای خواندن پایگاه داده LDAP شکست خورده است. LDAP راه اندازی ماژول و دسترسی به پایگاه داده را بررسی کنید.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/fa_IR/loan.lang b/htdocs/langs/fa_IR/loan.lang
index 6d611d21b53..98ce58f36f4 100644
--- a/htdocs/langs/fa_IR/loan.lang
+++ b/htdocs/langs/fa_IR/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=سرمایه
 Insurance=Insurance
 Interest=Interest
 Nbterms=Number of terms
+Term=Term
 LoanAccountancyCapitalCode=Accounting account capital
 LoanAccountancyInsuranceCode=Accounting account insurance
 LoanAccountancyInterestCode=Accounting account interest
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=Confirm deleting this loan
 LoanDeleted=Loan Deleted Successfully
 ConfirmPayLoan=Confirm classify paid this loan
 LoanPaid=Loan Paid
-# Calc
-LoanCalc=Bank Loans Calculator
-PurchaseFinanceInfo=Purchase & Financing Information
-SalePriceOfAsset=Sale Price of Asset
-PercentageDown=Percentage Down
-LengthOfMortgage=Duration of loan
-AnnualInterestRate=Annual Interest Rate
-ExplainCalculations=Explain Calculations
-ShowMeCalculationsAndAmortization=Show me the calculations and amortization
-MortgagePaymentInformation=Mortgage Payment Information
-DownPayment=Down Payment
-DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
-InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
-MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
-MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
-MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
-MonthlyPaymentDesc=The montly payment is figured out using the following formula
-AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
-AmountFinanced=Amount Financed
-AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
-Totalsforyear=Totals for year
-MonthlyPayment=Monthly Payment
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
-GoToInterest=%s will go towards INTEREST
-GoToPrincipal=%s will go towards PRINCIPAL
-YouWillSpend=You will spend %s in year %s
 ListLoanAssociatedProject=List of loan associated with the project
 AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Interest
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-FinancialCommitment=Financial commitment
 CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/langs/fa_IR/mails.lang b/htdocs/langs/fa_IR/mails.lang
index fec6ad70949..20c7d01f630 100644
--- a/htdocs/langs/fa_IR/mails.lang
+++ b/htdocs/langs/fa_IR/mails.lang
@@ -11,7 +11,9 @@ MailFrom=فرستنده
 MailErrorsTo=خطاها به
 MailReply=پاسخ به
 MailTo=گیرنده (ها)
+MailToUsers=To user(s)
 MailCC=کپی کنید به
+MailToCCUsers=Copy to users(s)
 MailCCC=نسخه های کش شده به
 MailTopic=موضوع ایمیل
 MailText=پیام
@@ -164,4 +166,4 @@ InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=اطلاعات
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang
index 1ec4ab29da9..27229ba30cb 100644
--- a/htdocs/langs/fa_IR/main.lang
+++ b/htdocs/langs/fa_IR/main.lang
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is se
 Administrator=مدیر
 Undefined=تعریف نشده
 PasswordForgotten=Password forgotten?
+NoAccount=No account?
 SeeAbove=در بالا مشاهده کنید
 HomeArea=منطقه خانه
 LastConnexion=Latest connection
@@ -231,7 +232,7 @@ Limit=حد
 Limits=محدوده
 Logout=خروج از سیستم
 NoLogoutProcessWithAuthMode=بدون قابلیت قطع عملی با حالت تائید <b>شده٪ s</b>
-Connection=ارتباط
+Connection=ورود به سیستم
 Setup=برپایی
 Alert=هوشیار
 MenuWarnings=تصویر، موسیقی
@@ -402,6 +403,7 @@ DefaultTaxRate=Default tax rate
 Average=متوسط
 Sum=مجموع
 Delta=دلتا
+RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=انتخاب
@@ -414,7 +416,7 @@ Favorite=Favorite
 ShortInfo=اطلاعات.
 Ref=کد عکس.
 ExternalRef=Ref. extern
-RefSupplier=کد عکس. تهیه کننده
+RefSupplier=Ref. vendor
 RefPayment=کد عکس. پرداخت
 CommercialProposalsShort=طرح های تجاری
 Comment=توضیح
@@ -493,7 +495,7 @@ Received=رسیده
 Paid=پرداخت
 Topic=Subject
 ByCompanies=توسط اشخاص ثالث
-ByUsers=با کاربران
+ByUsers=By user
 Links=ها
 Link=پیوند
 Rejects=رد
@@ -619,9 +621,9 @@ BuildDoc=ساخت فیلم کارگردان تهیه کننده
 Entity=محیط
 Entities=اشخاص
 CustomerPreview=پیش نمایش با مشتری
-SupplierPreview=پیش نمایش تامین کننده
+SupplierPreview=Vendor preview
 ShowCustomerPreview=نشان دادن پیش نمایش مشتری
-ShowSupplierPreview=منبع نمایش پیش نمایش
+ShowSupplierPreview=Show vendor preview
 RefCustomer=کد عکس. مشتری
 Currency=پول
 InfoAdmin=اطلاعات برای مدیران
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=Products or services
 SearchIntoProjects=پروژه ها
 SearchIntoTasks=وظایف
 SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=مداخلات
 SearchIntoContracts=قراردادها
 SearchIntoCustomerShipments=Customer shipments
@@ -941,3 +943,5 @@ Remote=Remote
 LocalAndRemote=Local and Remote
 KeyboardShortcut=Keyboard shortcut
 AssignedTo=واگذار شده به
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/fa_IR/margins.lang b/htdocs/langs/fa_IR/margins.lang
index 0683333589e..2840f60ac5f 100644
--- a/htdocs/langs/fa_IR/margins.lang
+++ b/htdocs/langs/fa_IR/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=به عنوان یک سرویس
 UseDiscountOnTotal=در ساب توتال
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=معرفی می کند اگر تخفیف های جهانی به عنوان یک محصول، سرویس و یا فقط در ساب توتال برای محاسبه حاشیه درمان می شود.
 MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best supplier price
+MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=قیمت تمام شده
 UnitCharges=اتهامات واحد
 Charges=عوارض
diff --git a/htdocs/langs/fa_IR/members.lang b/htdocs/langs/fa_IR/members.lang
index ff2cd389668..9d61cdfb298 100644
--- a/htdocs/langs/fa_IR/members.lang
+++ b/htdocs/langs/fa_IR/members.lang
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
diff --git a/htdocs/langs/fa_IR/opensurvey.lang b/htdocs/langs/fa_IR/opensurvey.lang
index 7ee12af7ebe..3fcc36089c9 100644
--- a/htdocs/langs/fa_IR/opensurvey.lang
+++ b/htdocs/langs/fa_IR/opensurvey.lang
@@ -58,3 +58,4 @@ MoreChoices=انتخاب های بیشتر برای رای دهندگان را 
 SurveyExpiredInfo=The poll has been closed or voting delay has expired.
 EmailSomeoneVoted=٪ s را تا به یک خط پر شده است. شما می توانید نظر سنجی خود را در لینک پیدا کنید:٪ s
 ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/fa_IR/orders.lang b/htdocs/langs/fa_IR/orders.lang
index 63d0a6ab769..8db6d9d2e0e 100644
--- a/htdocs/langs/fa_IR/orders.lang
+++ b/htdocs/langs/fa_IR/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=منطقه سفارشات مشتریان
-SuppliersOrdersArea=منطقه سفارشات تولید کنندگان
+SuppliersOrdersArea=Purchase orders area
 OrderCard=کارت منظور
 OrderId=سفارش کد سفارش
 Order=سفارش
@@ -13,18 +13,18 @@ OrderToProcess=منظور پردازش
 NewOrder=سفارش
 ToOrder=سفارش
 MakeOrder=سفارش
-SupplierOrder=منظور تامین کننده
-SuppliersOrders=سفارشات تولید کنندگان
-SuppliersOrdersRunning=سفارشات تامین کنندگان کنونی
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=سفارش مشتری
-CustomersOrders=Customer orders
+CustomersOrders=سفارشات مشتری
 CustomersOrdersRunning=Current customer orders
 CustomersOrdersAndOrdersLines=Customer orders and order lines
 OrdersDeliveredToBill=Customer orders delivered to bill
 OrdersToBill=Customer orders delivered
 OrdersInProcess=Customer orders in process
 OrdersToProcess=Customer orders to process
-SuppliersOrdersToProcess=Supplier orders to process
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=لغو شد
 StatusOrderDraftShort=پیش نویس
 StatusOrderValidatedShort=اعتبار
@@ -75,15 +75,15 @@ ShowOrder=نمایش جهت
 OrdersOpened=Orders to process
 NoDraftOrders=بدون پیش نویس سفارشات
 NoOrder=No order
-NoSupplierOrder=No supplier order
+NoSupplierOrder=No purchase order
 LastOrders=Latest %s customer orders
 LastCustomerOrders=Latest %s customer orders
-LastSupplierOrders=Latest %s supplier orders
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=Latest %s modified orders
 AllOrders=تمام سفارشات
 NbOfOrders=تعداد سفارشات
 OrdersStatistics=آمار سفارش
-OrdersStatisticsSuppliers=آمار تامین کننده سفارش
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=تعداد سفارشات در ماه
 AmountOfOrdersByMonthHT=میزان سفارشات توسط ماه (خالص از مالیات)
 ListOfOrders=فهرست سفارشات
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</
 GenerateBill=تولید صورت حساب
 ClassifyShipped=طبقه بندی تحویل
 DraftOrders=دستور پیش نویس
-DraftSuppliersOrders=Draft suppliers orders
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=در دستور روند
 RefOrder=کد عکس. سفارش
 RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for supplier
-RefOrderSupplierShort=Ref. order supplier
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=ارسال سفارش از طریق پست
 ActionsOnOrder=رویدادهای سفارش
 NoArticleOfTypeProduct=هیچ مقاله از نوع «تولید» بنابراین هیچ مقاله قابل حمل با کشتی برای این منظور
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
 DispatchSupplierOrder=دریافت کننده کالا منظور از٪ s
 FirstApprovalAlreadyDone=First approval already done
 SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=Supplier order %s received %s
-SupplierOrderSubmitedInDolibarr=Supplier order %s submited
-SupplierOrderClassifiedBilled=Supplier order %s set billed
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=دیگر سفارشات
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=نماینده سفارش مشتری زیر به بالا
@@ -125,11 +125,11 @@ 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_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=نماینده زیر را به بالا حمل و نقل
-TypeContact_order_supplier_external_BILLING=منبع تماس با فاکتور
-TypeContact_order_supplier_external_SHIPPING=تماس با تامین کننده حمل و نقل
-TypeContact_order_supplier_external_CUSTOMER=منبع تماس با منبع زیر تا منظور
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=COMMANDE_SUPPLIER_ADDON ثابت تعریف نشده
 Error_COMMANDE_ADDON_NotDefined=COMMANDE_ADDON ثابت تعریف نشده
 Error_OrderNotChecked=بدون سفارشات به فاکتور انتخاب شده
diff --git a/htdocs/langs/fa_IR/other.lang b/htdocs/langs/fa_IR/other.lang
index a16e9e0f828..1c15114b547 100644
--- a/htdocs/langs/fa_IR/other.lang
+++ b/htdocs/langs/fa_IR/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=فایل های بیش از حد بزرگ است
 PleaseBePatient=لطفا صبور باشید ...
 NewPassword=New password
 ResetPassword=Reset password
-RequestToResetPasswordReceived=درخواست رمز عبور Dolibarr خود را تغییر دریافت شده است
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=این کلید جدید خود را برای ورود به سایت است
 NewKeyWillBe=کلید جدید را برای ورود به نرم افزار خواهد بود
 ClickHereToGoTo=برای رفتن به٪ s اینجا را کلیک کنید
@@ -233,6 +233,8 @@ PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=منطقه صادرات
 AvailableFormats=فرمت های موجود
diff --git a/htdocs/langs/fa_IR/productbatch.lang b/htdocs/langs/fa_IR/productbatch.lang
index b4f33e0aeb8..3d1ea9c10f1 100644
--- a/htdocs/langs/fa_IR/productbatch.lang
+++ b/htdocs/langs/fa_IR/productbatch.lang
@@ -16,7 +16,7 @@ printEatby=Eat-by: %s
 printSellby=Sell-by: %s
 printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic increase/decrease stock mode is forced to shipping validate and manual dispatching for reception and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
 ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
diff --git a/htdocs/langs/fa_IR/products.lang b/htdocs/langs/fa_IR/products.lang
index 2585e68fd11..7fb584460ae 100644
--- a/htdocs/langs/fa_IR/products.lang
+++ b/htdocs/langs/fa_IR/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=قیمت های جدید
 MinPrice=Min. selling price
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=قیمت فروش نمی تواند کمتر از حداقل مجاز برای این محصول (٪ بدون مالیات). این پیام همچنین می تواند به نظر می رسد اگر شما نوع تخفیف بیش از حد مهم است.
 ContractStatusClosed=بسته
 ErrorProductAlreadyExists=محصول با مرجع٪ s در حال حاضر وجود دارد.
@@ -155,7 +156,7 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Supplier prices
 SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
-CustomCode=Customs/Commodity/HS code
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=کشور مبدا
 Nature=طبیعت
 ShortLabel=Short label
diff --git a/htdocs/langs/fa_IR/projects.lang b/htdocs/langs/fa_IR/projects.lang
index 26bd37294d7..971df275cb8 100644
--- a/htdocs/langs/fa_IR/projects.lang
+++ b/htdocs/langs/fa_IR/projects.lang
@@ -77,6 +77,7 @@ Time=زمان
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=فهرست طرح تجاری مرتبط با پروژه
 ListOrdersAssociatedProject=List of customer orders associated with the project
@@ -226,4 +227,4 @@ AllowCommentOnProject=Allow user comments on projects
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/fa_IR/stocks.lang b/htdocs/langs/fa_IR/stocks.lang
index 737f2254f05..524bba76502 100644
--- a/htdocs/langs/fa_IR/stocks.lang
+++ b/htdocs/langs/fa_IR/stocks.lang
@@ -203,3 +203,4 @@ RegulateStock=Regulate Stock
 ListInventory=فهرست
 StockSupportServices=Stock management support services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/fa_IR/stripe.lang b/htdocs/langs/fa_IR/stripe.lang
index aabcc15b8ce..98fb851fc50 100644
--- a/htdocs/langs/fa_IR/stripe.lang
+++ b/htdocs/langs/fa_IR/stripe.lang
@@ -58,8 +58,8 @@ NameOnCard=Name on card
 CardNumber=Card Number
 ExpiryDate=Expiry Date
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/fa_IR/supplier_proposal.lang b/htdocs/langs/fa_IR/supplier_proposal.lang
index ccafdb2127a..c6dfa87b347 100644
--- a/htdocs/langs/fa_IR/supplier_proposal.lang
+++ b/htdocs/langs/fa_IR/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Supplier commercial proposals
-supplier_proposalDESC=Manage price requests to suppliers
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
 SupplierProposalNew=New price request
 CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
-SupplierProposalsDraft=Draft supplier proposals
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=Latest %s modified price requests
 RequestsOpened=Open price requests
-SupplierProposalArea=Supplier proposals area
-SupplierProposalShort=Supplier proposal
-SupplierProposals=Supplier proposals
-SupplierProposalsShort=Supplier proposals
+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=Supplier ref
+SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=تاریخ تحویل
 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>?
@@ -47,9 +47,9 @@ CommercialAsk=Price request
 DefaultModelSupplierProposalCreate=ایجاد مدل پیش فرض
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposals=List of supplier proposal requests
-ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
-SupplierProposalsToClose=Supplier proposals to close
-SupplierProposalsToProcess=Supplier proposals to process
+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
diff --git a/htdocs/langs/fa_IR/suppliers.lang b/htdocs/langs/fa_IR/suppliers.lang
index 9b8ddb1743c..4deda671b8b 100644
--- a/htdocs/langs/fa_IR/suppliers.lang
+++ b/htdocs/langs/fa_IR/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=تولید کنندگان
-SuppliersInvoice=تولید کنندگان صورتحساب
-ShowSupplierInvoice=Show Supplier Invoice
-NewSupplier=منبع جدید
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=تاریخ
-ListOfSuppliers=لیست تامین کنندگان
-ShowSupplier=منبع نمایش
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=تاریخ سفارش
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=برخی از زیر محصولات هیچ قیمت تعریف شده
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
-SupplierPrices=Supplier prices
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=این منبع مرجع در حال حاضر با یک مرجع در ارتباط است:٪ s را
-NoRecordedSuppliers=بدون تامین کنندگان ثبت
-SupplierPayment=پرداخت کننده
-SuppliersArea=منطقه تامین کنندگان
-RefSupplierShort=کد عکس. تهیه کننده
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=دسترسی
-ExportDataset_fournisseur_1=فهرست فاکتورها تامین کننده و فاکتور خطوط
-ExportDataset_fournisseur_2=فاکتورها تامین کننده و پرداخت
-ExportDataset_fournisseur_3=سفارشات تامین کننده و خطوط جهت
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=تصویب این منظور
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
 ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
 ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
-AddSupplierOrder=ایجاد نظم عرضه کننده کالا
-AddSupplierInvoice=ایجاد کننده کالا فاکتور
-ListOfSupplierProductForSupplier=لیست محصولات و قیمت ها را برای عرضه کننده کالا <b>از٪ s</b>
-SentToSuppliers=ارسال شده به تامین کنندگان
-ListOfSupplierOrders=List of supplier orders
-MenuOrdersSupplierToBill=Supplier orders to invoice
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-SupplierReputation=Supplier reputation
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
 AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=Supplier prices
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/fa_IR/website.lang b/htdocs/langs/fa_IR/website.lang
index ac4ff9a9d5a..5115f976cbd 100644
--- a/htdocs/langs/fa_IR/website.lang
+++ b/htdocs/langs/fa_IR/website.lang
@@ -73,7 +73,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
diff --git a/htdocs/langs/fa_IR/workflow.lang b/htdocs/langs/fa_IR/workflow.lang
index 1f6cd0180c3..527acaf70d2 100644
--- a/htdocs/langs/fa_IR/workflow.lang
+++ b/htdocs/langs/fa_IR/workflow.lang
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source custome
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/fi_FI/accountancy.lang b/htdocs/langs/fi_FI/accountancy.lang
index 6869e233c86..60296957996 100644
--- a/htdocs/langs/fi_FI/accountancy.lang
+++ b/htdocs/langs/fi_FI/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Accounting
 ACCOUNTING_EXPORT_SEPARATORCSV=Sarake-erotin vientitiedostoon
 ACCOUNTING_EXPORT_DATE=Vientitiedoston päivämäärän muoto
 ACCOUNTING_EXPORT_PIECE=Vie kappaleen määrä
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Accounts with non zero values
 ListOfAccounts=List of accounts
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers 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
 
-AccountancyArea=Kirjanpitoalue
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
 AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
@@ -89,7 +90,7 @@ MenuProductsAccounts=Tuotetilit
 ProductsBinding=Products accounts
 Ventilation=Tilien täsmäytys
 CustomersVentilation=Asiakaan laskun täsmäytys
-SuppliersVentilation=Toimittajan laskun täsmäytys
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Luo uusi transaktio
 UpdateMvts=Transaktion muuttaminen
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=Ostopäiväkirja
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Sekalainenpäiväkirja
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Kuluraportti päiväkirja
 ACCOUNTING_SOCIAL_JOURNAL=Sosiaalinen päiväkirja
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
 ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
@@ -185,11 +187,12 @@ ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
-DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Group of account
 Pcgsubtype=Subgroup of account
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
 ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
 DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report 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 fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Virhe, tätä kirjanpito tiliä ei voida poistaa koska se on käytössä
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -293,4 +296,9 @@ Binded=Rivit yhdistetty
 ToBind=Yhdistettäviä rivejä
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang
index 9183daa85f5..14785cd4390 100644
--- a/htdocs/langs/fi_FI/admin.lang
+++ b/htdocs/langs/fi_FI/admin.lang
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=SMTP Host (oletusarvoisesti <b>php.ini: %s)</b>
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP-portti (Ei määritelty osaksi PHP Unix-koneissa)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP Host (Ei määritelty osaksi PHP Unix-koneissa)
 MAIN_MAIL_EMAIL_FROM=Lähettäjä sähköposti automaattisille sähköpostiviesteille (Oletuksena php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= Lähetä järjestelmällisesti piilotettu hiili-kopio kaikki lähetetyt sähköpostit
 MAIN_DISABLE_ALL_MAILS=Poista käytöstä kaikki sähköpostiviestin lähetykset (testaus tarkoituksiin tai demoihin)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=Käyttömenetelmä sähköposteja lähettäessä
 MAIN_MAIL_SMTPS_ID=SMTP tunnus, jos vaaditaan
 MAIN_MAIL_SMTPS_PW=SMTP Salasana jos vaaditaan
@@ -291,7 +292,7 @@ ModuleSetup=Moduuli asetukset
 ModulesSetup=Moduulit/Applikaatio asetukset
 ModuleFamilyBase=Järjestelmä
 ModuleFamilyCrm=Asiakkuudenhallinta (CRM)
-ModuleFamilySrm=Toimittaja Suhteiden Hallinta (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Tuotehallinta (PM)
 ModuleFamilyHr=Henkilöstöhallinta (HR)
 ModuleFamilyProjects=Projektit / Yhteistyöhankkeet
@@ -373,7 +374,8 @@ NoSmsEngine=Ei SMS lähettäjän Manager. SMS lähettäjä johtaja ei ole asenne
 PDF=PDF
 PDFDesc=Voit määrittää kunkin globaalin liittyviä vaihtoehtoja PDF sukupolvi
 PDFAddressForging=Säännöt luoda osoitteeseen laatikot
-HideAnyVATInformationOnPDF=Piilota kaikki tiedot, jotka liittyvät arvonlisäveroon syntyvässä PDF -tiedostossa
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=Piilota tuotekuvaukset syntyvässä PDF -tiedostossa
@@ -445,7 +447,8 @@ DisplayCompanyInfo=Näytä yrityksen osoitetiedot
 DisplayCompanyManagers=Display manager names
 DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party 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.
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Set this to 1 if you want to attach main document to emai
 FilesAttachedToEmail=Liitä tiedosto
 SendEmailsReminders=Lähetä asialista muistutus sähköpostilla
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=Käyttäjät & ryhmät
 Module0Desc=Käyttäjien / Työntekijöiden ja ryhmien hallinta
@@ -479,7 +485,7 @@ Module1Desc=Yrityksien ja yhteystietojen hallinnointi (asiakkaat, prospektit...)
 Module2Name=Kaupalliset
 Module2Desc=Kaupallinen hallinnointi
 Module10Name=Kirjanpito
-Module10Desc=Yksinkertainen kirjanpito hallinta (laskua ja maksua lähettämistä)
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=Ehdotukset
 Module20Desc=Kaupalliset ehdotuksia hallinto -
 Module22Name=Massa sähköpostitus
@@ -546,8 +552,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar yhdentyminen
-Module500Name=Erityismenot (Verot, sosiaaliturvamaksut ja osingot)
-Module500Desc=Erityismenojen (verot, sosiaaliturvamaksut ja osingot) hallinnointi
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Suoritus työntekijöiden palkoista
 Module510Desc=Tallenna ja seuraa suorituksia työntekijöiden palkoista
 Module520Name=Laina
@@ -561,14 +567,14 @@ Module700Name=Lahjoitukset
 Module700Desc=Lahjoituksien hallinnointi
 Module770Name=Kuluraportit
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Mantis yhdentyminen
 Module1520Name=Dokumentin luonti
 Module1520Desc=Massa sähköposti dokumentin luominen
 Module1780Name=Merkit/Kategoriat
-Module1780Desc=Luo merkki/kategoria (tuotteet, asiakkaat, toimittajat, kontaktit tai jäsenet)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=FCKeditor
 Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
 Module2200Name=Dynaamiset Hinnat
@@ -576,7 +582,7 @@ Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Ajastetut työt
 Module2300Desc=Ajastettujen töiden hallinnointi (alias cron or chrono table)
 Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API/Web services (SOAP server)
@@ -613,7 +619,7 @@ Module50100Desc=Point of sales module (POS).
 Module50200Name=Paypal
 Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 Module50400Name=Kirjanpito (edistynyt)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=Tulosta IPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Vaalit, Kysely vai Äänestys
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=Suvaitsevaisuus viive (päivinä) ennen ilmoituksen my
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Suvaitsevaisuus viive (päivinä) ennen varoituksena sekit tallettaa tehdä
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=Muut valikkoon rivit hallita valinnaisia parametrejä.
 LogEvents=Security Audit tapahtumat
 Audit=Audit
@@ -1054,8 +1060,9 @@ LogEventDesc=Voit ottaa loki Dolibarr turvallisuus tapahtumia täältä. Järjes
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Järjestelmän tiedot ovat erinäiset tekniset tiedot saavat lukea vain tila ja näkyvissä vain järjestelmänvalvojat.
 SystemAreaForAdminOnly=Tämä alue on käytettävissä järjestelmänvalvojan käyttäjät vain. Ei mikään Dolibarr käyttöoikeudet voidaan vähentää tätä rajaa.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=Voit valita kunkin parametrin yhteydessä Dolibarr näyttävät ja tuntuvat täällä
 AvailableModules=Saatavilla olevat app/moduulit
 ToActivateModule=Aktivoi moduulit, mennä setup-alueella.
@@ -1188,11 +1195,11 @@ UserMailRequired=Sähköposti Vaaditaan Luo uusi käyttäjä
 HRMSetup=Henkilöstöhallinta moduulin asetukset
 ##### Company setup #####
 CompanySetup=Yritykset moduulin asetukset
-CompanyCodeChecker=Moduuli kolmansille osapuolille koodi sukupolven ja tarkastuslennot (asiakas tai toimittaja)
-AccountCodeManager=Module for accounting code generation (customer or supplier)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
 NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
 ModelModules=Asiakirjat mallit
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
@@ -1203,6 +1210,9 @@ MustBeUnique=Täytyy olla uniikki?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
 TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=<b>Vienti-yhteys %s-muodossa</b> on saatavilla seuraavasta linkistä: %s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=Vapaa tekstihaku kaupallisiin ehdotuksia
 WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
 ##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=Tilaukset hallinto-setup
 OrdersNumberingModules=Tilaukset numerointiin modules
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=Yhteys palvelimeen ' %s' on tietokanta' %s' kanssa käyttäjä
 OSCommerceTestKo1=Yhteys palvelimeen ' %s' onnistua mutta tietokanta' %s' ei tavoitettu.
 OSCommerceTestKo2=Yhteys palvelimeen ' %s' kanssa käyttäjä' %s' failed.
 ##### Stock #####
-StockSetup=Varasto moduuli asetukset
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
 ##### Menu #####
 MenuDeleted=Valikko poistettu
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
 MultiCompanySetup=Multi-yhtiö moduulin asetukset
 ##### Suppliers #####
 SuppliersSetup=Toimittajan moduuli setup
-SuppliersCommandModel=Täydellinen malli toimittajan järjestys (logo. ..)
-SuppliersInvoiceModel=Täydellinen malli toimittajan laskun (logo. ..)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","
 SalariesSetup=Palkka moduulin asetukset
 SortOrder=Lajittelujärjestys
 Format=Formaatti
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Kuluraportit moduulin asetukset
 TemplatePDFExpenseReports=Document templates to generate expense report document
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Install of external module from applic
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
-TextTitleColor=Sivun otsikon väri
+TextTitleColor=Text color of Page title
 LinkColor=Linkkien värit
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=Taustaväri ylävalikolle
 TopMenuDisableImages=Piilota kuvat ylävalikosta
 LeftMenuBackgroundColor=Taustaväri alavalikolle
 BackgroundTableTitleColor=Background color for Table title line
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
 ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-MailToMember=Sähköpostin lähettäminen jäsensivulta
-MailToUser=Sähköpostin lähettäminen käyttäjäsivulta
-MailToProject= To send email from project page
+MailToSendProposal=Tarjoukset asiakkaille
+MailToSendOrder=Asiakkaan tilaukset
+MailToSendInvoice=Asiakkaiden laskut
+MailToSendShipment=Lähetykset
+MailToSendIntervention=Interventions
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Sopimukset
+MailToThirdparty=Sidosryhmät
+MailToMember=Jäsenet
+MailToUser=Käyttäjät
+MailToProject=Projects page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1780,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=PDF:n alamarginaali
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/fi_FI/bills.lang b/htdocs/langs/fi_FI/bills.lang
index 3264db009cb..4d13ff493b8 100644
--- a/htdocs/langs/fi_FI/bills.lang
+++ b/htdocs/langs/fi_FI/bills.lang
@@ -109,7 +109,7 @@ CancelBill=Peruuta lasku
 SendRemindByMail=EMail muistutus
 DoPayment=Syötä suoritus
 DoPaymentBack=Syötä hyvitys
-ConvertToReduc=Muunna tulevaisuudessa edullisista
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Kirjoita maksun saanut asiakas
@@ -120,7 +120,7 @@ BillStatus=Laskun tila
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Luonnos (on vahvistettu)
 BillStatusPaid=Maksettu
-BillStatusPaidBackOrConverted=Credit note refund or converted into discount
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Hylätty
 BillStatusValidated=Validoidut (on maksanut)
@@ -296,10 +296,10 @@ DiscountType=Discount type
 NoteReason=Huomautus / syy
 ReasonDiscount=Perustelu
 DiscountOfferedBy=Myöntämä
-DiscountStillRemaining=Discounts available
-DiscountAlreadyCounted=Discounts already consumed
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+SupplierDiscounts=Vendors discounts
 BillAddress=Bill osoite
 HelpEscompte=Tämä alennus on alennus myönnetään asiakas, koska sen paiement tehtiin ennen aikavälillä.
 HelpAbandonBadCustomer=Tämä määrä on luovuttu (asiakas sanoi olla huono asiakas), ja se on pidettävä exceptionnal väljä.
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but
 PaymentNote=Maksuviesti
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Joka %s päivä
 FrequencyPer_m=Joka %s kuukausi
 FrequencyPer_y=Joka %s vuosi
@@ -505,9 +511,14 @@ SituationAmount=Situation invoice amount(net)
 SituationDeduction=Situation subtraction
 ModifyAllLines=Modify all lines
 CreateNextSituationInvoice=Create next situation
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=SU
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
 NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
@@ -532,3 +543,4 @@ AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/fi_FI/categories.lang b/htdocs/langs/fi_FI/categories.lang
index f8f9fb10ab0..1f4eede09b5 100644
--- a/htdocs/langs/fi_FI/categories.lang
+++ b/htdocs/langs/fi_FI/categories.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - categories
 Rubrique=Tag/Category
-Rubriques=Tags/Categories
+Rubriques=Merkit/Kategoriat
 RubriquesTransactions=Tags/Categories of transactions
 categories=tags/categories
 NoCategoryYet=No tag/category of this type created
@@ -16,7 +16,7 @@ MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
-SubCats=Alaluokat
+SubCats=Sub-categories
 CatList=List of tags/categories
 NewCategory=New tag/category
 ModifCat=Modify tag/category
@@ -85,3 +85,4 @@ CategorieRecursivHelp=If activated, product will also linked to parent category
 AddProductServiceIntoCategory=Add the following product/service
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
+ChooseCategory=Choose category
diff --git a/htdocs/langs/fi_FI/commercial.lang b/htdocs/langs/fi_FI/commercial.lang
index bf46f155328..6c0fc65e9bd 100644
--- a/htdocs/langs/fi_FI/commercial.lang
+++ b/htdocs/langs/fi_FI/commercial.lang
@@ -18,8 +18,8 @@ TaskRDVWith=Tapaaminen %s kanssa
 ShowTask=Näytä tehtävä
 ShowAction=Näytä toiminta
 ActionsReport=Tapahtumaraportti
-ThirdPartiesOfSaleRepresentative=Third parties with sales representative
-SaleRepresentativesOfThirdParty=Sales representatives of third party
+ThirdPartiesOfSaleRepresentative=Sidosryhmät myyntiedustajilla
+SaleRepresentativesOfThirdParty=Myyntiedustajien sidosryhmät
 SalesRepresentative=Myyntiedustaja
 SalesRepresentatives=Myyntiedustajat
 SalesRepresentativeFollowUp=Myyntiedustaja (follow-up)
@@ -60,20 +60,20 @@ ActionAC_CLO=Sulje
 ActionAC_EMAILING=Lähetä massasähköpostia
 ActionAC_COM=Lähetä asiakastilaus postitse
 ActionAC_SHIP=Lähetä toimitus postitse
-ActionAC_SUP_ORD=Lähetä toimittajan tilaus postitse
-ActionAC_SUP_INV=Lähetä toimittajan lasku postitse
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=Muut
 ActionAC_OTH_AUTO=Automaalliset lisätyt tapahtumat
 ActionAC_MANUAL=Manuaalisesti lisätyt tapahtumat
 ActionAC_AUTO=Automaalliset lisätyt tapahtumat
-ActionAC_OTH_AUTOShort=Auto
+ActionAC_OTH_AUTOShort=Automaattinen
 Stats=Myyntitilastot
 StatusProsp=Mahdollisuuden tila
 DraftPropals=Tarjousluonnos
 NoLimit=Rajoittamaton
-ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
-ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
-ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
-FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
+ToOfferALinkForOnlineSignature=Linkki sähköiseen allekirjoitukseen
+WelcomeOnOnlineSignaturePage=Tervetuloa tarjouspyyntö hyväksymis sivulle %s
+ThisScreenAllowsYouToSignDocFrom=Tämä näyttö sallii sinun hyväksyvän ja allekirjoittavan, tai hylkäävän, lainauksen/tarjouspyynnön
+ThisIsInformationOnDocumentToSign=Tämä on informaatiota dokumentistä hyväksymiseksi tai hylkäämiseksi
+SignatureProposalRef=Tarjouksen/ehdotuksen %s allekirjoitus
+FeatureOnlineSignDisabled=Sähköinen allekirjoitus on poissa käytöstä tai dokumentti on luotu ennen sen käyttöönottoa
diff --git a/htdocs/langs/fi_FI/companies.lang b/htdocs/langs/fi_FI/companies.lang
index b04630abd46..163a429db9f 100644
--- a/htdocs/langs/fi_FI/companies.lang
+++ b/htdocs/langs/fi_FI/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Haluatko varmasti poistaa tämän yhteystiedon ja kaikki si
 MenuNewThirdParty=Uusi sidosryhmä
 MenuNewCustomer=Uusi asiakas
 MenuNewProspect=Uusi prospekti
-MenuNewSupplier=Uusi toimittaja
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=Uusi yksityishenkilö
-NewCompany=Uusi yhtiö (prospekti, asiakas, toimittaja)
-NewThirdParty=Uusi sidosryhmä (prospekti, asiakas, toimittaja)
-CreateDolibarrThirdPartySupplier=Luo sidosryhmä (tavarantoimittaja)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=Luo sidosryhmä
 CreateThirdPartyAndContact=Luo sidosryhmä + ala yhteystieto
 ProspectionArea=Uusien mahdollisuuksien alue
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=Näkymät
 ThirdPartyCustomers=Asiakkaat
 ThirdPartyCustomersStats=Asiakkaat
 ThirdPartyCustomersWithIdProf12=Asiakkaat, joilla on %s tai %s
-ThirdPartySuppliers=Tavarantoimittajat
+ThirdPartySuppliers=Vendors
 ThirdPartyType=Sidosryhmän tyyppi
 Individual=Yksityishenkilö
 ToCreateContactWithSameName=Luo automaattisesti yhteystiedot/osoitteen sidosryhmän tiedoilla sidosryhmän alaisuuteen. Yleensä, vaikka sidosryhmä olisi henkilö, pelkkä sidosryhmän luominen riittää.
@@ -77,11 +77,11 @@ Web=Kotisivut
 Poste= Asema
 DefaultLang=Oletuskieli
 VATIsUsed=Sales tax is used
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Täytä osoite käyttäen sidosryhmän osoitetta
-ThirdpartyNotCustomerNotSupplierSoNoRef=Sidosryhmä ei ole asiakas eikä tavarantoimittaja, refering objects ei ole saatavilla
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Maksunt pankkitili
 OverAllProposals=Ehdotukset
 OverAllOrders=Tilaukset
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=RE tyyppi
 TypeLocaltax2ES=IRPF Tyyppi
 WrongCustomerCode=Asiakastunnus vihreellinen
-WrongSupplierCode=Toimittajatunnus virheellinen
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Asiakastunnuksen malli
-SupplierCodeModel=Toimittajatunnuksen malli
+SupplierCodeModel=Vendor code model
 Gencod=Viivakoodi
 ##### Professional ID #####
 ProfId1Short=Prof id 1
@@ -267,7 +267,7 @@ Prospect=Prospekti
 CustomerCard=Asiakaskortti
 Customer=Asiakas
 CustomerRelativeDiscount=Suhteellinen asiakasalennus
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=Suhteellinen alennus
 CustomerAbsoluteDiscountShort=Absoluuttinen alennus
 CompanyHasRelativeDiscount=Tällä asiakkaalla on oletusalennus<b> %s%%</b>
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this suppl
 CompanyHasNoAbsoluteDiscount=Asiakkaalla ei ole alennuksia saatavilla
 CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
 CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=Ei mitään
 Supplier=Toimittaja
 AddContact=Luo yhteystiedot
@@ -304,13 +304,13 @@ DeleteACompany=Poista yritys
 PersonalInformations=Henkilötiedot
 AccountancyCode=Kirjanpito tili
 CustomerCode=Asiakas-koodi
-SupplierCode=Toimittajan koodi
+SupplierCode=Vendor code
 CustomerCodeShort=Asiakas-koodi
-SupplierCodeShort=Toimittajan koodi
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=Asiakas koodi ainutlaatuinen kaikille asiakkaille
-SupplierCodeDesc=Toimittaja koodi ainutlaatuinen kaikille toimittajille
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=Vaaditaan, jos kolmas osapuoli on asiakas tai mahdollisuus
-RequiredIfSupplier=Vaaditaan, jos kolmas osapuoli on toimittajan
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=Voimassaolo hallinnassa moduuli
 ThisIsModuleRules=Tämä on säännöt tämän moduulin
 ProspectToContact=Esitetilaus yhteyttä
@@ -338,7 +338,7 @@ MyContacts=Omat yhteystiedot
 Capital=Pääoma
 CapitalOf=Pääoma of %s
 EditCompany=Muokkaa yritystä
-ThisUserIsNot=Tämä käyttäjä ei ole näköpiirissä, asiakkaan tai toimittajan
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=Shekki
 VATIntraCheckDesc=<b>Linkkiä %s</b> sallii pyytää Euroopan alv checker palveluun. Ulkoisen Internet-palvelimelta vaaditaan tätä palvelua työtä.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -396,7 +396,7 @@ ImportDataset_company_4=Third parties/Sales representatives (Assign sales repres
 PriceLevel=Hintataso
 DeliveryAddress=Toimitusosoite
 AddAddress=Lisää osoite
-SupplierCategory=Toimittajan tuoteryhmä
+SupplierCategory=Vendor category
 JuridicalStatus200=Itsenäinen
 DeleteFile=Poista tiedosto
 ConfirmDeleteFile=Oletko varma, että haluat poistaa tämän tiedoston?
@@ -406,7 +406,7 @@ FiscalYearInformation=Tilivuoden tiedot
 FiscalMonthStart=Tilivuoden aloitus kuukausi
 YouMustAssignUserMailFirst=Tälle käyttäjälle täytyy luoda sähköpostiosoite  jotta sähköpostimuistutukset voidaan ottaa käyttöön
 YouMustCreateContactFirst=Voidaksesi lisätä sähköposti muistutukset, täytyy ensin täyttää yhteystiedot sidosryhmän oikealla sähköpostiosoitteella
-ListSuppliersShort=Luettelo toimittajat
+ListSuppliersShort=List of vendors
 ListProspectsShort=Luettelo prospektit
 ListCustomersShort=Luettelo asiakkaat
 ThirdPartiesArea=Sidosryhmät ja yhteystiedot
@@ -420,7 +420,7 @@ CurrentOutstandingBill=Avoin lasku
 OutstandingBill=Avointen laskujen enimmäismäärä
 OutstandingBillReached=Avointen laskujen enimmäismäärä saavutettu
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Paluu numero on muodossa %syymm-nnnn asiakkaan koodi ja %syymm-nnnn luovuttajalle koodi jos VV on vuosi, mm kuukausi ja nnnn on sarja ilman taukoa eikä palata 0.
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=Asiakas / toimittaja-koodi on maksuton. Tämä koodi voidaan muuttaa milloin tahansa.
 ManagingDirectors=Johtajien nimet (TJ, johtaja, päällikkö...)
 MergeOriginThirdparty=Monista sidosryhmä (sidosryhmä jonka haluat poistaa)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Myyntiedustajan kirjautuminen
 SaleRepresentativeFirstname=Myyntiedustajan etunimi
 SaleRepresentativeLastname=Myyntiedustajan sukunimi
 ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=Uusi asiakkaan tai tavarantoimittajan koodi näyttäisi olevan duplikaatti
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/fi_FI/compta.lang b/htdocs/langs/fi_FI/compta.lang
index dd9fda3ef85..f761ec1d19a 100644
--- a/htdocs/langs/fi_FI/compta.lang
+++ b/htdocs/langs/fi_FI/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=HT maksetaan
 VATToPay=Tax sales
 VATReceived=Vastaanotettu vero
 VATToCollect=Ostojen vero
-VATSummary=Verotase
+VATSummary=Tax monthly
+VATBalance=Verotase
 VATPaid=Maksettu vero
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=Kirjanpito / Treasury alueella
 NewPayment=Uusi maksu
 Payments=Maksut
 PaymentCustomerInvoice=Asiakas laskun maksu
-PaymentSupplierInvoice=Toimittajan laskun maksu
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Social/fiscal veron maksu
 PaymentVat=ALV-maksu
 ListPayment=Luettelo maksut
 ListOfCustomerPayments=Luettelo asiakkaan maksut
-ListOfSupplierPayments=Luettelo toimittaja maksut
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -110,7 +111,7 @@ ShowVatPayment=Näytä arvonlisäveron maksaminen
 TotalToPay=Yhteensä maksaa
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
 CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
 SupplierAccountancyCodeShort=Sup. account. code
 AccountNumber=Tilinumero
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Raportti kolmannen osapuolen IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
 Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
-ByProductsAndServices=By products and services
+ByProductsAndServices=By product and service
 RefExt=External ref
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
 LinkedOrder=Linkki Tilauksiin
@@ -215,7 +218,8 @@ Mode1=Method 1
 Mode2=Method 2
 CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
 CalculationRuleDescSupplier=According to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
@@ -242,3 +246,10 @@ FiscalPeriod=Tilikausi
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/fi_FI/dict.lang b/htdocs/langs/fi_FI/dict.lang
index 1a204340f9b..1090a8676bf 100644
--- a/htdocs/langs/fi_FI/dict.lang
+++ b/htdocs/langs/fi_FI/dict.lang
@@ -5,7 +5,8 @@ CountryIT=Italia
 CountryES=Espanja
 CountryDE=Saksa
 CountryCH=Sveitsi
-CountryGB=Iso-Britannia
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=Yhdistynyt kuningaskunta (UK)
 CountryUK=Yhdistynyt kuningaskunta (UK)
 CountryIE=Irlanti
 CountryCN=Kiina
diff --git a/htdocs/langs/fi_FI/ecm.lang b/htdocs/langs/fi_FI/ecm.lang
index 136d3fb06c2..48bf507d62a 100644
--- a/htdocs/langs/fi_FI/ecm.lang
+++ b/htdocs/langs/fi_FI/ecm.lang
@@ -39,9 +39,10 @@ ShowECMSection=Näytä hakemisto
 DeleteSection=Poista hakemisto
 ConfirmDeleteSection=Voitko vahvistaa hakemiston <b>%s</b> poiston?
 ECMDirectoryForFiles=Tiedostojen suhteellinen hakemisto
-CannotRemoveDirectoryContainsFiles=Poisto ei ole mahdollista, koska se sisältää tiedostoja
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=Tiedostonhallinta
-ECMSelectASection=Valitse hakemisto vasemmasta puusta ...
+ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
diff --git a/htdocs/langs/fi_FI/errors.lang b/htdocs/langs/fi_FI/errors.lang
index 056a8807a86..d593ce66c6f 100644
--- a/htdocs/langs/fi_FI/errors.lang
+++ b/htdocs/langs/fi_FI/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Viivakoodi vaaditaan
 ErrorCustomerCodeAlreadyUsed=Asiakas-koodi on jo käytetty
 ErrorBarCodeAlreadyUsed=Viivakoodi on jo käytössä
 ErrorPrefixRequired=Etunumero tarvitaan
-ErrorBadSupplierCodeSyntax=Bad syntaksi toimittajan koodi
-ErrorSupplierCodeRequired=Toimittaja-koodi tarvitaan
-ErrorSupplierCodeAlreadyUsed=Toimittaja koodi jo käytössä
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Bad parametrit
 ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
 ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
@@ -87,7 +87,7 @@ ErrorsOnXLines=Virheet <b>%s</b> lähde linjat
 ErrorFileIsInfectedWithAVirus=Virustentorjuntaohjelma ei voinut tarkistaa tiedoston (tiedosto saattaa olla tartunnan virus)
 ErrorSpecialCharNotAllowedForField=Erikoismerkkejä ei sallita kentän "%s"
 ErrorNumRefModel=Viittaus olemassa otetaan tietokantaan (%s) ja ei ole yhteensopiva tämän numeroinnin sääntöä. Poista levy tai nimen viittaus aktivoida tämän moduulin.
-ErrorQtyTooLowForThisSupplier=Määrä liian alhainen tämän toimittaja tai ei hinta määritellään tämän tuotteen tavarantoimittaja
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Virhe naamio
 ErrorBadMaskFailedToLocatePosOfSequence=Virhe, maski ilman järjestysnumeroa
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=Tiedoston on oltava formaatissa %s
-ErrorSupplierCountryIsNotDefined=Maa tämä toimittaja ei ole määritelty. Korjata ensin.
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
diff --git a/htdocs/langs/fi_FI/install.lang b/htdocs/langs/fi_FI/install.lang
index 88b0dd14a50..0e1bcf77c61 100644
--- a/htdocs/langs/fi_FI/install.lang
+++ b/htdocs/langs/fi_FI/install.lang
@@ -6,19 +6,20 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=Asetustiedostoa <b>%s</b> ei ole olema
 ConfFileCouldBeCreated=Asetustiedosto <b>%s</b> voitaisiin luoda.
 ConfFileIsNotWritable=Asetustiedosto <b>%s</b> ei ole kirjoitettavissa. Tarkista käyttöoikeudet. Ensimmäistä kertaa asennettaessa, verkkopalvelimesi on annettava kirjoituslupa tämän asetusprosessin aikana asennus ( esimerkiksi "chmod 666"  Unix tyylisisä OSsiessa).
 ConfFileIsWritable=Configuration <b>file %s</b> on kirjoitettavissa.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Uudelleen lataa kaikki tiedot asetustiedostosta.
 PHPSupportSessions=Tämä PHP tukee istuntoja.
 PHPSupportPOSTGETOk=Tämä PHP tukee muuttujat POST ja GET.
 PHPSupportPOSTGETKo=On mahdollista, sinun PHP asennusohjelma ei tue muuttujat POST tai GET. Tarkista parametri <b>variables_order</b> vuonna php.ini.
 PHPSupportGD=Tämä PHP tukea GD graafisia toimintoja.
-PHPSupportCurl=This PHP support Curl.
+PHPSupportCurl=Tämä PHP tukee Curl.
 PHPSupportUTF8=Tämä PHP tukea UTF8 toimintoja.
 PHPMemoryOK=Sinun PHP max istuntojakson muisti on <b>asetettu %s.</b> Tämän pitäisi olla tarpeeksi.
 PHPMemoryTooLow=Sinun PHP max istuntojakson muisti on <b>asetettu %s</b> tavua. Tämä olisi liian alhainen. Change your <b>php.ini</b> asettaa <b>memory_limit</b> parametri <b>vähintään %s</b> tavua.
 Recheck=Click here for a enemmän significative testi
 ErrorPHPDoesNotSupportSessions=Sinun PHP asennus ei tue istunnoissa. Tämä ominaisuus on velvollisuus tehdä Dolibarr toimi. Tarkista PHP-asetukset.
 ErrorPHPDoesNotSupportGD=Sinun PHP asennus ei tue graafisia toiminto GD. N: o kaavio on saatavilla.
-ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
+ErrorPHPDoesNotSupportCurl=Sinun PHP asennuksesi ei tue Curl.
 ErrorPHPDoesNotSupportUTF8=Sinun PHP asennus ei tue UTF8 toimintoja. Dolibarr ei toimi oikein. Ratkaise tämä ennen asennusta Dolibarr.
 ErrorDirDoesNotExists=Hakemiston %s ei ole olemassa.
 ErrorGoBackAndCorrectParameters=Siirry taaksepäin ja korjata väärin parametrit.
@@ -53,7 +54,7 @@ AdminLogin=Kirjautumistunnuksen Dolibarr tietokannan ylläpitäjä. Pidä tyhjä
 PasswordAgain=Kirjoita salasana uudelleen toisen kerran
 AdminPassword=Salasana Dolibarr tietokannan ylläpitäjä. Pidä tyhjä jos kytket nimettömässä
 CreateDatabase=Luo tietokanta
-CreateUser=Create owner or grant him permission on database
+CreateUser=Luo omistaja tai anna hänelle pääsyoikeus tietokantaan
 DatabaseSuperUserAccess=Tietokanta - SuperUser pääsy
 CheckToCreateDatabase=Valintaruutu, jos tietokanta ei ole olemassa, ja ne on luotu. <br> Tässä tapauksessa sinun täytyy täyttää tunnus / salasana SuperUser huomioon alareunassa tällä sivulla.
 CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
@@ -87,12 +88,12 @@ DirectoryRecommendation=On recommanded käyttää hakemiston ulkopuolella teidä
 LoginAlreadyExists=On jo olemassa
 DolibarrAdminLogin=Dolibarr admin login
 AdminLoginAlreadyExists=Dolibarr järjestelmänvalvojan tili <b>' %s'</b> on jo olemassa.
-FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
+FailedToCreateAdminLogin=Dolibarr ylläpitokäyttäjän luominen epäonnistui
 WarningRemoveInstallDir=Varoitus, turvallisuussyistä, kun asennus tai päivitys on valmis, poista <b>asennus hakemistoon tai nimetä sen install.lock välttämiseksi sen ilkivaltaisten käyttöä.</b>
 FunctionNotAvailableInThisPHP=Ei saatavana tämän PHP
 ChoosedMigrateScript=Valittu siirtyä script
-DataMigration=Tietojen siirtäminen
-DatabaseMigration=Rakenne tietokanta muuttoliike
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script käsittely
 ChooseYourSetupMode=Valitse setup-tilaan ja klikkaa "Käynnistä" ...
 FreshInstall=Tuore asentaa
@@ -146,11 +147,11 @@ NothingToDo=Nothing to do
 # upgrade
 MigrationFixData=Korjaus denormalized tiedot
 MigrationOrder=Tietojen siirtäminen asiakkaiden tilauksia
-MigrationSupplierOrder=Tietojen siirtäminen toimittajille tilausten
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Tietojen siirtäminen kaupallisiin ehdotuksia
 MigrationInvoice=Tietojen siirtäminen asiakkaiden laskut
 MigrationContract=Tietojen siirtäminen sopimusten
-MigrationSuccessfullUpdate=Upgrade successfull
+MigrationSuccessfullUpdate=Päivitys onnistui
 MigrationUpdateFailed=Epäonnistui päivitysprosessi
 MigrationRelationshipTables=Tiedot maahanmuuton suhteen taulukot (%s)
 MigrationPaymentsUpdate=Maksu tietojen korjaus
@@ -178,7 +179,7 @@ MigrationReopeningContracts=Avoinna sopimuksen suljettu virhe
 MigrationReopenThisContract=Uudelleen sopimuksen %s
 MigrationReopenedContractsNumber=%s sopimusten muuntamattomat
 MigrationReopeningContractsNothingToUpdate=N: o suljettu sopimuksen auki
-MigrationBankTransfertsUpdate=Update links between bank entry and a bank transfer
+MigrationBankTransfertsUpdate=Päivitä pankkitoimien ja pankkisiirtojen välinen yhteys
 MigrationBankTransfertsNothingToUpdate=Kaikki linkit ovat ajan tasalla
 MigrationShipmentOrderMatching=Sendings vastaanottamisesta päivitys
 MigrationDeliveryOrderMatching=Toimitus vastaanottamisesta päivitys
@@ -196,7 +197,9 @@ MigrationEvents=Migration of events to add event owner into assignement table
 MigrationEventsContact=Migration of events to add event contact into assignement table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
-MigrationReloadModule=Reload module %s
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationReloadModule=Lataa uudelleen moduuli %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 ShowNotAvailableOptions=Näytä ei saatavilla olevat valinnat
 HideNotAvailableOptions=Piilota ei saatavilla olevat valinnat
diff --git a/htdocs/langs/fi_FI/ldap.lang b/htdocs/langs/fi_FI/ldap.lang
index e98c520cc49..430e4b1107c 100644
--- a/htdocs/langs/fi_FI/ldap.lang
+++ b/htdocs/langs/fi_FI/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Salasana verkkotunnuksen
 YouMustChangePassNextLogon=Salasana <b>käyttäjän %s verkkotunnuksen %s</b> on muuttunut.
 UserMustChangePassNextLogon=Käyttäjän on muutettava salasana verkkotunnuksen %s
 LDAPInformationsForThisContact=Tiedot LDAP-tietokannan tämä yhteystieto
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Member type synchronized
 ContactSynchronized=Yhteystiedot synkronoidaan
 ForceSynchronize=Force synkronointi Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Lukeminen epäonnistui LDAP-tietokantaan. Tarkista LDAP-moduulin asennus ja tietokannan saavutettavuus.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/fi_FI/loan.lang b/htdocs/langs/fi_FI/loan.lang
index 5ed211f7457..9a3205b2542 100644
--- a/htdocs/langs/fi_FI/loan.lang
+++ b/htdocs/langs/fi_FI/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=Pääkaupunki
 Insurance=Vakuutus
 Interest=Korko
 Nbterms=Kausien lukumäärä
+Term=Term
 LoanAccountancyCapitalCode=Kirjanpitotili pääoma
 LoanAccountancyInsuranceCode=Kirjanpitotili vakuutukset
 LoanAccountancyInterestCode=Kirjanpitotili korot
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=Vahvista lainan poisto
 LoanDeleted=Laina poistettu onnistuneesti
 ConfirmPayLoan=Vahvista tämän lainan maksu
 LoanPaid=Laina maksettu
-# Calc
-LoanCalc=Pankkilainalaskin
-PurchaseFinanceInfo=Osto & rahoitus tieto
-SalePriceOfAsset=Jälleenmyyntihinta
-PercentageDown=Prosentin lasku
-LengthOfMortgage=Lainan kesto
-AnnualInterestRate=Vuotuinen korko
-ExplainCalculations=Selitä laskelmat
-ShowMeCalculationsAndAmortization=Näytä laskelmat ja jaksotukset
-MortgagePaymentInformation=Mortgage Payment Information
-DownPayment=Down Payment
-DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
-InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
-MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
-MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
-MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
-MonthlyPaymentDesc=The montly payment is figured out using the following formula
-AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
-AmountFinanced=Amount Financed
-AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
-Totalsforyear=Totals for year
-MonthlyPayment=Monthly Payment
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
-GoToInterest=%s will go towards INTEREST
-GoToPrincipal=%s will go towards PRINCIPAL
-YouWillSpend=You will spend %s in year %s
 ListLoanAssociatedProject=Tämän projektin lainat
 AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Korko
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-FinancialCommitment=Financial commitment
 CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/langs/fi_FI/mails.lang b/htdocs/langs/fi_FI/mails.lang
index c11d82bd3d7..d5829fe8b4f 100644
--- a/htdocs/langs/fi_FI/mails.lang
+++ b/htdocs/langs/fi_FI/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Sender
 MailErrorsTo=Virheiden
 MailReply=Vastaa
 MailTo=Vastaanotin (s)
+MailToUsers=To user(s)
 MailCC=Kopioi
+MailToCCUsers=Copy to users(s)
 MailCCC=Välimuistissa jäljennös
 MailTopic=EMail aihe
 MailText=Viesti
@@ -164,4 +166,4 @@ InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang
index 07c98737b2c..cc880fac24e 100644
--- a/htdocs/langs/fi_FI/main.lang
+++ b/htdocs/langs/fi_FI/main.lang
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarrin todennusmoodi on <b> %s
 Administrator=Administrator
 Undefined=Määrittelemätön
 PasswordForgotten=Unohditko salasanasi?
+NoAccount=No account?
 SeeAbove=Katso edellä
 HomeArea=Etusivu alue
 LastConnexion=Viimeisin yhteys
@@ -231,7 +232,7 @@ Limit=Raja
 Limits=Rajat
 Logout=Uloskirjaus
 NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Yhteys
+Connection=Kirjautuminen
 Setup=Asetukset
 Alert=Hälytys
 MenuWarnings=Vahtipalvelu
@@ -402,6 +403,7 @@ DefaultTaxRate=Oletus veroprosentti
 Average=Keskimääräinen
 Sum=Sum
 Delta=Delta
+RemainToPay=Remain to pay
 Module=Moduuli/Applikaatio
 Modules=Moduulit/Applikaatiot
 Option=Vaihtoehto
@@ -414,7 +416,7 @@ Favorite=Suosikki
 ShortInfo=Info.
 Ref=Viite
 ExternalRef=Ulkoinen viite
-RefSupplier=Toimittajan viite
+RefSupplier=Ref. vendor
 RefPayment=Maksun viite
 CommercialProposalsShort=Kaupalliset ehdotukset
 Comment=Kommentti
@@ -493,7 +495,7 @@ Received=Vastaanotetut
 Paid=Maksetut
 Topic=Aihe
 ByCompanies=Sidosryhmittäin
-ByUsers=Käyttäjittäin
+ByUsers=By user
 Links=Linkit
 Link=Linkki
 Rejects=Hylkäykset
@@ -619,9 +621,9 @@ BuildDoc=Rakenna dokumentti
 Entity=Ympäristö
 Entities=Ympäristöt
 CustomerPreview=Asiakkaan esikatselu
-SupplierPreview=Toimittajan esikatselu
+SupplierPreview=Vendor preview
 ShowCustomerPreview=Näytä asiakkaan esikatselu
-ShowSupplierPreview=Näytä toimittajan esikatselu
+ShowSupplierPreview=Show vendor preview
 RefCustomer=Asiakasviite
 Currency=Valuutta
 InfoAdmin=Tietoja järjestelmänvalvojille
@@ -679,7 +681,7 @@ Color=Väri
 Documents=Linkitettyjä tiedostoja
 Documents2=Asiakirjat
 UploadDisabled=Lähetys pois käytöstä
-MenuAccountancy=Kirjanpito
+MenuAccountancy=Accounting
 MenuECM=Asiakirjat
 MenuAWStats=AWStats
 MenuMembers=Jäsenet
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=Tuotteet tai palvelut
 SearchIntoProjects=Projektit
 SearchIntoTasks=Tehtävät
 SearchIntoCustomerInvoices=Asiakkaiden laskut
-SearchIntoSupplierInvoices=Tavarantoimittajan laskut
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Asiakkaan tilaukset
-SearchIntoSupplierOrders=Tavarantoimittajien tilaukset
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=Tarjoukset asiakkaille
-SearchIntoSupplierProposals=Tavarantoimittajan tarjoukset
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Interventions
 SearchIntoContracts=Sopimukset
 SearchIntoCustomerShipments=Asiakas lähetykset
@@ -941,3 +943,5 @@ Remote=Remote
 LocalAndRemote=Local and Remote
 KeyboardShortcut=Keyboard shortcut
 AssignedTo=Vaikuttaa
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/fi_FI/margins.lang b/htdocs/langs/fi_FI/margins.lang
index 14dd9293ae2..d4f7e3dbb23 100644
--- a/htdocs/langs/fi_FI/margins.lang
+++ b/htdocs/langs/fi_FI/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=palveluksi
 UseDiscountOnTotal=välisummasta
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
 MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best supplier price
+MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Cost price
 UnitCharges=Unit charges
 Charges=Charges
diff --git a/htdocs/langs/fi_FI/members.lang b/htdocs/langs/fi_FI/members.lang
index 4d1271f1e00..5819dbdee95 100644
--- a/htdocs/langs/fi_FI/members.lang
+++ b/htdocs/langs/fi_FI/members.lang
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
diff --git a/htdocs/langs/fi_FI/opensurvey.lang b/htdocs/langs/fi_FI/opensurvey.lang
index 8477e936466..f4093d81164 100644
--- a/htdocs/langs/fi_FI/opensurvey.lang
+++ b/htdocs/langs/fi_FI/opensurvey.lang
@@ -58,3 +58,4 @@ MoreChoices=Enter more choices for the voters
 SurveyExpiredInfo=The poll has been closed or voting delay has expired.
 EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
 ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/fi_FI/orders.lang b/htdocs/langs/fi_FI/orders.lang
index 6532c10b04d..89595a90484 100644
--- a/htdocs/langs/fi_FI/orders.lang
+++ b/htdocs/langs/fi_FI/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Asiakkaiden tilausalue
-SuppliersOrdersArea=Tavarantoimittajien tilausalue
+SuppliersOrdersArea=Purchase orders area
 OrderCard=Tilauskortti
 OrderId=Tilausnumero
 Order=Tilaus
@@ -13,18 +13,18 @@ OrderToProcess=Jotta prosessi
 NewOrder=Uusi tilaus
 ToOrder=Tee tilaus
 MakeOrder=Tee tilaus
-SupplierOrder=Tavarantoimittajan tilaus
-SuppliersOrders=Tavarantoimittajien tilaukset
-SuppliersOrdersRunning=Nykyiset tavarantoimittajien tilaukset
-CustomerOrder=Asiakastilaus
-CustomersOrders=Asiakkaan tilaukset
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=Asiakkaan tilauksen
+CustomersOrders=Asiakastilaukset
 CustomersOrdersRunning=Viimeisin asiakkaan tilaus
 CustomersOrdersAndOrdersLines=Asiakkaan tilaukset ja tilauslinjat
 OrdersDeliveredToBill=Customer orders delivered to bill
 OrdersToBill=Toimitetut asiakastilaukset
 OrdersInProcess=Käsittelyssä olevat asiakastilaukset
 OrdersToProcess=Käsittelyä odottavat asiakastilaukset
-SuppliersOrdersToProcess=Käsittelyä odottavat tavarantoimittajan tilaukset
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=Peruutettu
 StatusOrderDraftShort=Vedos
 StatusOrderValidatedShort=Hyväksytty
@@ -75,15 +75,15 @@ ShowOrder=Näytä tilaus
 OrdersOpened=Orders to process
 NoDraftOrders=No draft orders
 NoOrder=No order
-NoSupplierOrder=No supplier order
+NoSupplierOrder=No purchase order
 LastOrders=Viimeisimmät %s asiakastilaukset
 LastCustomerOrders=Viimeisimmät %s asiakastilaukset
-LastSupplierOrders=Latest %s supplier orders
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=Viimeisimmät %s muokatut tilaukset
 AllOrders=Kaikki tilaukset
 NbOfOrders=Tilausten määrä
 OrdersStatistics=Tilausten tilastot
-OrdersStatisticsSuppliers=Tavarantoimittaja tilausten tilastot
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Tilausmäärät kuukausittain
 AmountOfOrdersByMonthHT=Tilausten summa kuukaudessa (net of tax)
 ListOfOrders=Tilausluettelo
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Haluatko varmasti vahvistaa tekemäsi tilauksen <b>%s</b>?
 GenerateBill=Luo lasku
 ClassifyShipped=Luokittele toimitetuksi
 DraftOrders=Tilausluonnokset
-DraftSuppliersOrders=Draft suppliers orders
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=Käsittelyssä olevat tilaukset
 RefOrder=Tilausviite
 RefCustomerOrder=Asiakkaan viite
-RefOrderSupplier=Ref. order for supplier
-RefOrderSupplierShort=Ref. order supplier
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=Lähetä tilaus postitse
 ActionsOnOrder=Tilauksen tapahtumat
 NoArticleOfTypeProduct=Artikkelin tyypi ei ole "tuote" joten sitä ei voida toimittaa tässä tilauksessa
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Haluatko varmasti luoda vastaavan tilauksen <b>%s</b>?
 DispatchSupplierOrder=Tavarantoimittajan tilauksen %s vastaanotto
 FirstApprovalAlreadyDone=First approval already done
 SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=Supplier order %s received %s
-SupplierOrderSubmitedInDolibarr=Supplier order %s submited
-SupplierOrderClassifiedBilled=Supplier order %s set billed
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Muut tilaukset
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Edustaja seuraamaan asiakkaan tilausta
@@ -125,11 +125,11 @@ TypeContact_commande_internal_SHIPPING=Edustaja seuraamaan toimitusta
 TypeContact_commande_external_BILLING=Yhteystiedot asiakkaan laskutukseen
 TypeContact_commande_external_SHIPPING=Yhteystiedot asiakkaan toimitukseen
 TypeContact_commande_external_CUSTOMER=Asiakas ottaa yhteyttä seurantaan, jotta
-TypeContact_order_supplier_internal_SALESREPFOLL=Edustaja seurantaan toimittaja järjestys
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Edustaja toimitus seurantaan
-TypeContact_order_supplier_external_BILLING=Tavarantoimittajan lasku yhteystiedot
-TypeContact_order_supplier_external_SHIPPING=Tavarantoimittajan toimitus yhteystiedot
-TypeContact_order_supplier_external_CUSTOMER=Toimittajan yhteystiedot seurantaan, jotta
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Vakiota COMMANDE_SUPPLIER_ADDON ei ole määritelty
 Error_COMMANDE_ADDON_NotDefined=Vakiota COMMANDE_ADDON ei ole määritelty
 Error_OrderNotChecked=Yhtään tilausta ei ole valittuna laskulle
diff --git a/htdocs/langs/fi_FI/other.lang b/htdocs/langs/fi_FI/other.lang
index 9e326e3e6ac..fc684634f79 100644
--- a/htdocs/langs/fi_FI/other.lang
+++ b/htdocs/langs/fi_FI/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=Files on liian suuri
 PleaseBePatient=Ole kärsivällinen ...
 NewPassword=New password
 ResetPassword=Reset password
-RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
@@ -233,6 +233,8 @@ PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=Vienti alueen
 AvailableFormats=Saatavilla olevat muodot
diff --git a/htdocs/langs/fi_FI/productbatch.lang b/htdocs/langs/fi_FI/productbatch.lang
index af98775e84c..4e163e82e15 100644
--- a/htdocs/langs/fi_FI/productbatch.lang
+++ b/htdocs/langs/fi_FI/productbatch.lang
@@ -1,24 +1,24 @@
 # ProductBATCH language file - en_US - ProductBATCH
-ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot/serial required)
-ProductStatusNotOnBatch=No (lot/serial not used)
+ManageLotSerial=Käytä erää / sarjanumeroa
+ProductStatusOnBatch=Kyllä (erä / sarja käytössä)
+ProductStatusNotOnBatch=Ei (erä / sarja ei ole käytössä)
 ProductStatusOnBatchShort=Kyllä
 ProductStatusNotOnBatchShort=Ei
-Batch=Lot/Serial
+Batch=Erä/Sarjanumero
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
-batch_number=Lot/Serial number
-BatchNumberShort=Lot/Serial
-EatByDate=Eat-by date
-SellByDate=Sell-by date
-DetailBatchNumber=Lot/Serial details
-printBatch=Lot/Serial: %s
-printEatby=Eat-by: %s
-printSellby=Sell-by: %s
-printQty=Qty: %d
+batch_number=Erä / sarjanumero
+BatchNumberShort=Erä / Sarja
+EatByDate=Viimeinen käyttöpäivä
+SellByDate=Viimeinen myyntipäivä
+DetailBatchNumber=Erä / sarjan tiedot
+printBatch=Erä / sarja: %s
+printEatby=Käytettävä ennen: %s
+printSellby=Myyjä: %s
+printQty=Määrä: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic increase/decrease stock mode is forced to shipping validate and manual dispatching for reception and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use lot/serial number
-ProductLotSetup=Setup of module lot/serial
-ShowCurrentStockOfLot=Show current stock for couple product/lot
-ShowLogOfMovementIfLot=Show log of movements for couple product/lot
-StockDetailPerBatch=Stock detail per lot
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
+ProductDoesNotUseBatchSerial=Tämä tuote ei käytä erää / sarjanumeroa
+ProductLotSetup=Moduulin erän / sarjan asetukset
+ShowCurrentStockOfLot=Näytä nykyinen varasto pari tuotetta / erää kohti
+ShowLogOfMovementIfLot=Näytä siirto lokit pari tuotetta / erää kohti
+StockDetailPerBatch=Varastotiedot erää kohden
diff --git a/htdocs/langs/fi_FI/products.lang b/htdocs/langs/fi_FI/products.lang
index 2a07ae4aa83..bcba94e508e 100644
--- a/htdocs/langs/fi_FI/products.lang
+++ b/htdocs/langs/fi_FI/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Myyty määrä
 PurchasedAmount=Ostettu määrä
 NewPrice=Uusi hinta
 MinPrice=Min. myyntihinta
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=Myyntihinta ei saa olla pienempi kuin pienin sallittu tämän tuotteen hinta ( %s ilman veroja)
 ContractStatusClosed=Suljettu
 ErrorProductAlreadyExists=Tuotteen viitaten %s on jo olemassa.
@@ -155,7 +156,7 @@ BuyingPrices=Ostohinnat
 CustomerPrices=Asiakas hinnat
 SuppliersPrices=Tavarantoimittajan hinnat
 SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
-CustomCode=Customs/Commodity/HS code
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=Alkuperä maa
 Nature=Luonto
 ShortLabel=Short label
diff --git a/htdocs/langs/fi_FI/projects.lang b/htdocs/langs/fi_FI/projects.lang
index e394a9ff00a..44aa47f6f7a 100644
--- a/htdocs/langs/fi_FI/projects.lang
+++ b/htdocs/langs/fi_FI/projects.lang
@@ -77,6 +77,7 @@ Time=Aika
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=Luettelot kaupallisen ehdotuksia hankkeeseen liittyvät
 ListOrdersAssociatedProject=List of customer orders associated with the project
@@ -226,4 +227,4 @@ AllowCommentOnProject=Allow user comments on projects
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/fi_FI/stocks.lang b/htdocs/langs/fi_FI/stocks.lang
index 08ffee41d27..17e3c570e70 100644
--- a/htdocs/langs/fi_FI/stocks.lang
+++ b/htdocs/langs/fi_FI/stocks.lang
@@ -203,3 +203,4 @@ RegulateStock=Regulate Stock
 ListInventory=Luettelo
 StockSupportServices=Stock management support services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/fi_FI/stripe.lang b/htdocs/langs/fi_FI/stripe.lang
index 7eef8eb1c01..9a1e5e40c56 100644
--- a/htdocs/langs/fi_FI/stripe.lang
+++ b/htdocs/langs/fi_FI/stripe.lang
@@ -58,8 +58,8 @@ NameOnCard=Name on card
 CardNumber=Card Number
 ExpiryDate=Expiry Date
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/fi_FI/supplier_proposal.lang b/htdocs/langs/fi_FI/supplier_proposal.lang
index 200361bdf7e..2d7f19a4b51 100644
--- a/htdocs/langs/fi_FI/supplier_proposal.lang
+++ b/htdocs/langs/fi_FI/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Supplier commercial proposals
-supplier_proposalDESC=Manage price requests to suppliers
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
 SupplierProposalNew=New price request
 CommRequest=Price request
-CommRequests=Price requests
+CommRequests=Tarjouspyynnöt yhteensä
 SearchRequest=Find a request
 DraftRequests=Draft requests
-SupplierProposalsDraft=Draft supplier proposals
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=Latest %s modified price requests
 RequestsOpened=Open price requests
-SupplierProposalArea=Supplier proposals area
-SupplierProposalShort=Supplier proposal
-SupplierProposals=Tavarantoimittajan tarjoukset
-SupplierProposalsShort=Tavarantoimittajan tarjoukset
+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=Supplier ref
+SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=Toimituspäivää
 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>?
@@ -47,9 +47,9 @@ CommercialAsk=Price request
 DefaultModelSupplierProposalCreate=Oletusmallin luonti
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposals=List of supplier proposal requests
-ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
-SupplierProposalsToClose=Supplier proposals to close
-SupplierProposalsToProcess=Supplier proposals to process
+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
diff --git a/htdocs/langs/fi_FI/suppliers.lang b/htdocs/langs/fi_FI/suppliers.lang
index e1c8a78b1d6..3914a8aa09b 100644
--- a/htdocs/langs/fi_FI/suppliers.lang
+++ b/htdocs/langs/fi_FI/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Tavarantoimittajat
-SuppliersInvoice=Tavarantoimittajan lasku
-ShowSupplierInvoice=Näytä tavarantoimittajan lasku
-NewSupplier=Uusi tavarantoimittaja
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=Historia
-ListOfSuppliers=Tavarantoimittajien luettelo
-ShowSupplier=Näytä tavarantoimittaja
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=Tilauspäivä
 BuyingPriceMin=Alhaisin ostohinta
 BuyingPriceMinShort=Alhaisin ostohinta
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Alatuotteiden myyntihinta yhteensä
 SomeSubProductHaveNoPrices=Joidenkin alatuotteidin hintoja ei ole määritelty
 AddSupplierPrice=Lisää ostohinta
 ChangeSupplierPrice=Muuta ostohintaa
-SupplierPrices=Supplier prices
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Tämä tavarantoimittajan viite on jo liitetty viiteeseen: %s
-NoRecordedSuppliers=Tavarantoimittajia ei ole kirjattu
-SupplierPayment=Tavarantoimittajan maksu
-SuppliersArea=Tavarantoimittaja alue
-RefSupplierShort=Tavarantoimittajan viite
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=Saatavuus
-ExportDataset_fournisseur_1=Lista tavarantoimittajan laskuista ja laskuriveistä
-ExportDataset_fournisseur_2=Tavarantoimittajan laskut ja maksut
-ExportDataset_fournisseur_3=Tavarantoimittajan tilaukset ja tilausrivit
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=Hyväksy tämä tilaus
 ConfirmApproveThisOrder=Haluatko varmasti hyväksyä tilauksen <b>%s</b>?
 DenyingThisOrder=Kiellä tämä tilaus
 ConfirmDenyingThisOrder=Haluatko varmasti kieltää tilauksen <b>%s</b>?
 ConfirmCancelThisOrder=Haluatko varmasti peruuttaa tilauksen <b>%s</b>?
-AddSupplierOrder=Luo tavarantoimittajan tilaus
-AddSupplierInvoice=Luo tavarantoimittajan lasku
-ListOfSupplierProductForSupplier=Luettelo tavarantoimittajan <b>%s</b> tuotteista ja hinnoista
-SentToSuppliers=Lähetetty tavarantoimittajille
-ListOfSupplierOrders=Luettelo tavarantoimittajan tilauksista
-MenuOrdersSupplierToBill=Tavarantoimittajan tilaukset laskulle
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Toimitusviive päivinä
 DescNbDaysToDelivery=Suurin toimitusviive tällä tilauksella
-SupplierReputation=Tavarantoimittajan maine
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Älä tilaa
 NotTheGoodQualitySupplier=Väärä laatu
 ReputationForThisProduct=Maine
 BuyerName=Ostajan nimi
 AllProductServicePrices=Kaikkien tuotteiden / palveluiden hinnat
-AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=Supplier prices
+AllProductReferencesOfSupplier=Kaikkien Tuote / Palvelu tavarantoimittajan viitteet
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/fi_FI/website.lang b/htdocs/langs/fi_FI/website.lang
index 5ef824be8d7..fc43a07e324 100644
--- a/htdocs/langs/fi_FI/website.lang
+++ b/htdocs/langs/fi_FI/website.lang
@@ -73,7 +73,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
diff --git a/htdocs/langs/fi_FI/workflow.lang b/htdocs/langs/fi_FI/workflow.lang
index 05880e740cf..96f272b8f2c 100644
--- a/htdocs/langs/fi_FI/workflow.lang
+++ b/htdocs/langs/fi_FI/workflow.lang
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source custome
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/fr_CA/accountancy.lang b/htdocs/langs/fr_CA/accountancy.lang
index c6426cd5062..4e4b9eab6c4 100644
--- a/htdocs/langs/fr_CA/accountancy.lang
+++ b/htdocs/langs/fr_CA/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - accountancy
+Accounting=Compte
 ACCOUNTING_EXPORT_SEPARATORCSV=Séparateur de colonne pour le fichier export
 ACCOUNTING_EXPORT_DATE=Format de date pour le fichier export
 ACCOUNTING_EXPORT_PIECE=Exporter le nombre de pièces
@@ -18,7 +19,6 @@ AssignDedicatedAccountingAccount=Nouveau compte à attribuer
 InvoiceLabel=Etiquette de facture
 DeleteCptCategory=Supprimer le compte comptable du groupe
 ConfirmDeleteCptCategory=Êtes-vous sûr de vouloir supprimer ce compte comptable du groupe de compte comptable?
-AccountancyArea=Zone de comptabilité
 AccountancyAreaDescActionOnce=Les actions suivantes sont généralement exécutées une seule fois, ou une fois par an ...
 AccountancyAreaDescActionOnceBis=Les étapes suivantes devraient être faites pour vous faire gagner du temps en vous suggérant le bon compte comptable par défaut lors de la journalisation (écriture dans Journals et le grand livre)
 AccountancyAreaDescActionFreq=Les actions suivantes sont généralement exécutées chaque mois, semaine ou jour pour de très grandes entreprises ...
@@ -47,7 +47,6 @@ MenuLoanAccounts=Comptes de prêts
 MenuProductsAccounts=Comptes de produits
 Ventilation=Reliure aux comptes
 CustomersVentilation=Contrat de facture client
-SuppliersVentilation=Reliure de la facture du fournisseur
 ExpenseReportsVentilation=Rapport de dépenses liant
 CreateMvts=Créer une nouvelle transaction
 WriteBookKeeping=Journalize les transactions dans Ledger
@@ -93,15 +92,12 @@ BankAccountNotDefined=Compte pour banque non défini
 NumMvts=Nombre de transactions
 AddCompteFromBK=Ajouter des comptes comptables au groupe
 ReportThirdParty=Liste du compte tiers
-DescThirdPartyReport=Consultez ici la liste des clients et fournisseurs tiers et leurs comptes comptables
 TotalVente=Chiffre d'affaires total avant taxes
 DescVentilCustomer=Consultez ici la liste des lignes de facture client liées (ou non) à un compte comptable produit
 DescVentilMore=Dans la plupart des cas, si vous utilisez des produits ou des services prédéfinis et que vous définissez le numéro de compte sur la carte produit / service, l'application pourra établir toute la liaison entre vos lignes de facturation et le compte comptable de votre plan comptable, juste en Un clic avec le bouton <strong>"%s"</strong>. Si le compte n'a pas été défini sur les cartes produit / service ou si vous avez encore certaines lignes qui ne sont liées à aucun compte, vous devrez effectuer une liaison manuelle à partir du menu "<strong>%s</strong>".
 DescVentilDoneCustomer=Consultez ici la liste des lignes clients des factures et leur compte comptable produit
 DescVentilTodoCustomer=Lier les lignes de facture qui ne sont pas déjà liées avec un compte de comptabilité de produit
 ChangeAccount=Modifiez le compte comptable produit / service pour les lignes sélectionnées avec le compte comptable suivant:
-DescVentilSupplier=Consultez la liste des lignes de facturation fournisseur liées ou non liées à un compte comptable produit
-DescVentilDoneSupplier=Consultez ici la liste des lignes de factures fournisseur et leur compte comptable
 DescVentilTodoExpenseReport=Les lignes de rapport de frais de liaison ne sont pas déjà liées à un compte comptable
 DescVentilExpenseReport=Consultez ici la liste des lignes de rapport de dépenses liées (ou non) à un compte comptable de frais
 DescVentilExpenseReportMore=Si vous configurez un compte comptable sur le type de lignes de rapport de dépenses, l'application sera en mesure d'établir toute la liaison entre vos lignes de rapport de dépenses et le compte comptable de votre plan comptable, en un clic avec le bouton <strong>"%s"</strong>. Si le compte n'a pas été défini sur le dictionnaire des tarifs ou si vous avez encore certaines lignes qui ne sont liées à aucun compte, vous devrez effectuer une liaison manuelle à partir du menu "<strong>%s</strong>".
diff --git a/htdocs/langs/fr_CA/admin.lang b/htdocs/langs/fr_CA/admin.lang
index eac09b7b9d2..4e35b541971 100644
--- a/htdocs/langs/fr_CA/admin.lang
+++ b/htdocs/langs/fr_CA/admin.lang
@@ -54,7 +54,6 @@ CompanyEmail=Courrier électronique de la société
 SubmitTranslation=Si la traduction de cette langue est incomplète ou vous trouvez des erreur , vous pouvez corriger cela en modifiant les fichiers dans le répertoire <b>langs/%s</b> et soumettre votre changement à www.transifex.com/dolibarr-association/dolibarr/
 SubmitTranslationENUS=Si la traduction de cette langue est incomplète ou vous trouvez des erreurs , vous pouvez corriger cela en modifiant les fichiers dans le répertoire <b> langs/%s </b> et soumettre les fichiers modifiés sur dolibarr.org/forum ou pour les développeurs sur github.com/Dolibarr/dolibarr.
 ModulesSetup=Modules / Configuration de l'application
-ModuleFamilySrm=Gestion des relations fournisseurs (GRF)
 ModuleFamilyProducts=Gestion des produits
 ModuleFamilyHr=Gestion des ressources humaines (GRH)
 ModuleFamilyPortal=Site internet et autres applications frontales
@@ -79,7 +78,6 @@ GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> donnera <b>ABC0701-000099</b><br><
 DisableLinkToHelp=Masquer lien vers l'aide en ligne "<b>%s</b>"
 ConfirmPurge=Êtes-vous sûr de vouloir exécuter cette purge? <br> Cela supprimera définitivement tous vos fichiers de données sans pouvoir les restaurer (fichiers ECM, fichiers joints ...).
 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>.
-HideAnyVATInformationOnPDF=Cacher toutes les informations en rapport avec la TPS/TVH sur les PDF générés
 HideDetailsOnPDF=Masquer les détails des lignes de produits sur le PDF généré
 PlaceCustomerAddressToIsoLocation=Utilisez french standard position (La Poste) pour le client position d'adresse
 ButtonHideUnauthorized=Masquer les boutons pour les utilisateurs non administrateurs pour les actions non autorisées au lieu de afficher les boutons désactivés grisés
@@ -122,15 +120,11 @@ Module57Desc=Gestion des ordres de paiement de débit direct. Il comprend la gé
 Module75Name=Notes de frais et déplacements
 Module240Desc=Outil d'exportation de données Dolibarr (avec des assistants)
 Module250Desc=Outil d'importation de données à Dolibarr (avec des assistants)
-Module500Name=Dépenses spéciales (taxes, charges, dividendes)
-Module500Desc=Gestion des dépenses spéciales comme les taxes, charges sociales et dividendes
 Module510Name=Paiement des salaires des employés
 Module510Desc=Enregistrer et suivre le paiement de vos salaires salariés
 Module770Name=Note de frais
-Module1120Name=Propositions commerciales founisseurs
 Module2000Desc=Permet d'éditer une zone de texte à l'aide d'un éditeur avancé (basé sur CKEditor)
 Module2400Name=Evénements / Agenda
-Module2400Desc=Suivez les événements réalisés et à venir. Laissez l'application enregistrer les événements automatiques à des fins de suivi ou enregistrer des événements manuels ou rendez-vous.
 Module2600Name=services API / Web ( serveur SOAP )
 Module2600Desc=Active le serveur de Web Services de Dolibarr
 Module2610Name=services API / Web ( serveur REST )
@@ -201,16 +195,12 @@ Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Tolérance de retard (en jours) avant l'aler
 Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Tolérance de retard (en jours) avant l'alerte sur les commandes des fournisseurs non encore traitées
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolérance de retard (en jours) avant alerte pour les rapports de dépenses à approuver
 SetupDescription1=La zone de configuration est pour les paramètres de configuration initiale avant de commencer à utiliser Dolibarr.
-SetupDescription2=Les deux étapes d'installation obligatoires sont les deux premières dans le menu de configuration à gauche: %s page de configuration et %s page de configuration:
-SetupDescription3=Les paramètres du menu <a href="%s"> %s -> %s </a> sont nécessaires car les données définies sont utilisées sur les écrans Dolibarr et pour personnaliser le comportement par défaut du logiciel (par exemple pour les fonctions liées au pays).
-SetupDescription4=Les paramètres du menu <a href="%s"> %s -> %s </a> sont requis car Dolibarr ERP / CRM est une collection de plusieurs modules / applications, tous plus ou moins indépendants. De nouvelles fonctionnalités seront ajoutées aux menus pour chaque module que vous allez activer.
 InfoDolibarr=À propos de Dolibarr
 InfoBrowser=À propos du navigateur
 InfoWebServer=À propos du serveur Web
 InfoPHP=À propos de PHP
 InfoPerf=À propos des performances
 AreaForAdminOnly=Les paramètres d'installation peuvent être définis par <b> utilisateurs d'administrateur </ b> uniquement.
-CompanyFundationDesc=Modifier sur cette page toutes les informations connues de l'entreprise ou de la fondation que vous devez gérer (Pour cela, cliquez sur le bouton "Modifier" ou "Enregistrer" au bas de la page)
 DictionaryDesc=Insérez toutes les données de référence. Vous pouvez ajouter vos valeurs par défaut.
 ConstDesc=Cette page vous permet de modifier tous les autres paramètres non disponibles dans les pages précédentes. Ce sont principalement des paramètres réservés pour les développeurs ou le dépannage avancé. Pour une liste d'options <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site-opens in new window" target="_blank"> check here </ A>.
 MiscellaneousDesc=Tous les autres paramètres liés à la sécurité sont définis ici.
@@ -236,7 +226,6 @@ DisableForgetPasswordLinkOnLogonPage=Ne pas afficher le lien "Mot de passe oubli
 HRMSetup=Configuration du module de GRH
 NotificationsDesc=La fonction de notification des messages électroniques vous permet d'envoyer automatiquement un courrier automatique pour certains événements Dolibarr. Les cibles des notifications peuvent être définies:
 NotificationsDescUser=* Par utilisateur, un utilisateur à l'heure.
-NotificationsDescContact=* Par les contacts de tiers (clients ou fournisseurs), un contact à l'heure.
 NotificationsDescGlobal=* Ou en définissant des emails de cible globaux dans la page de configuration du module.
 MustBeUnique=Doit être unique?
 MustBeMandatory=Obligatoire de créer des tiers?
@@ -244,14 +233,8 @@ MustBeInvoiceMandatory=Obligatoire de valider les factures?
 PaymentsPDFModules=Modèles de documents de paiement
 PaymentsNumberingModule=Modèles de numérotation des paiements
 SupplierPaymentSetup=Configuration des paiements des fournisseurs
-SupplierProposalSetup=Configuration du module de ​​demande de prix des fournisseurs
-SupplierProposalNumberingModules=Modèles de numérotation des demandes de prix des fournisseurs
-SupplierProposalPDFModules=Modèles des documents des demandes de prix des fournisseurs
-FreeLegalTextOnSupplierProposal=Texte libre sur les demandes de prix fournisseurs
-WatermarkOnDraftSupplierProposal=Filigrane sur le projet de prix demande des fournisseurs (si aucun laisser vide)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Demandez compte bancaire de destination pour les demandes de prix
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Demandez une source d'entrepôt pour l'ordre
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Demandez la destination du compte bancaire de l'ordre fournisseur
 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
@@ -279,6 +262,8 @@ OptionVatDefaultDesc=TPS/TVH sur encaissement, l'exigibilité de la TPS/TVH est:
 OptionVatDebitOptionDesc=TPS/TVH sur débit, l'exigibilité de la TPS/TVH est:<br>- sur livraison pour les biens (en pratique on utilise la date de facturation)<br>- sur facturation (débit) pour les services
 SummaryOfVatExigibilityUsedByDefault=Moment d'exigibilité par défaut de la TPS/TVH pour l'option choisie:
 AGENDA_USE_EVENT_TYPE_DEFAULT=Réglez automatiquement cette valeur par défaut pour le type d'événement dans en événement de lors de la création »
+AGENDA_DEFAULT_FILTER_TYPE=Régler automatiquement ce type d'événement dans le filtre de recherche de la vue agenda
+AGENDA_DEFAULT_FILTER_STATUS=Régler automatiquement le statut d'événement dans le filtre de recherche de la vue agenda
 AGENDA_SHOW_LINKED_OBJECT=Afficher l'objet lié dans la vue d'agenda
 ClickToDialUrlDesc=Url appelle quand un clic sur le picto du téléphone est terminé. Dans l'URL, vous pouvez utiliser des tags sur <b> __ PHONETO __ </ b> qui sera remplacé par le numéro de téléphone de la personne à appeler <b> __ PHONEFROM __ </ b> qui sera remplacé par le numéro de téléphone de l'appel Personne (votre) <br> <b> __ LOGIN __ </ b> qui sera remplacé par login clicktodial (défini sur la carte utilisateur) <br> <b> __ PASS __ </ b> qui sera remplacé par le mot de passe clicktodial (défini sur l'utilisateur carte).
 ClickToDialDesc=Ce module permet de faire des numéros de téléphone cliquable . Un clic sur cette icône fera appel à rendre votre téléphone pour appeler le numéro de téléphone . Cela peut être utilisé pour appeler un système de Dolibarr du centre d'appels qui peut appeler le numéro de téléphone sur un système SIP par exemple.
@@ -309,7 +294,6 @@ GoOntoContactCardToAddMore=Accédez à l'onglet "Notifications" d'un tiers pour
 ConfFileMustContainCustom=L'installation ou la construction d'un module externe à partir de l'application doit sauvegarder les fichiers du module dans le répertoire <strong>%s</strong>. Pour que ce répertoire soit traité par Dolibarr, vous devez configurer votre <strong> conf / conf.php </strong> pour ajouter les 2 lignes de directive: <br><strong> $ dolibarr_main_url_root_alt = '/ custom'; </strong><br><strong> $ dolibarr_main_document_root_alt = '%s / custom'; </strong>
 HighlightLinesOnMouseHover=Mettez en surbrillance les lignes de table lorsque déplacement de la souris passe au-dessus
 HighlightLinesColor=Mettez en surbrillance la couleur de la ligne lorsque la souris passe au-dessus (gardez vide pour ne pas mettre en évidence)
-TextTitleColor=Couleur de la page titre
 PressF5AfterChangingThis=Appuyez sur CTRL + F5 sur le clavier ou effacez votre cache de navigateur après avoir changé cette valeur pour l'avoir efficace
 NotSupportedByAllThemes=Will fonctionne avec des thèmes de base, peut ne pas être pris en charge par des thèmes externes
 TopMenuBackgroundColor=Couleur de fond du menu haut
@@ -334,16 +318,7 @@ FillFixTZOnlyIfRequired=Exemple: +2 (remplir seulement si le problème est connu
 ExpectedChecksum=Somme attendue
 CurrentChecksum=Somme actuel
 ForcedConstants=Valeurs constantes requises
-MailToSendProposal=Envoyer la proposition au client
-MailToSendOrder=Envoyer la commande au client
-MailToSendInvoice=Envoyer la facture au client
-MailToSendShipment=Envoyer l'expédition
-MailToSendIntervention=Envoyer l'intervention
-MailToSendSupplierRequestForQuotation=Pour envoyer demande de devis au fournisseur
-MailToSendSupplierOrder=Envoyer la commande fournisseur
-MailToSendSupplierInvoice=Envoyer la facture fournisseur
-MailToSendContract=Pour envoyer un contrat
-MailToThirdparty=Pour envoyer un courriel à partir d'une page tiers
+MailToMember=Membres
 ByDefaultInList=Afficher par défaut sur la liste vue
 TitleExampleForMajorRelease=Exemple de message que vous pouvez utiliser pour annoncer cette version majeure ( se sentir libre de l'utiliser sur vos sites web )
 TitleExampleForMaintenanceRelease=Exemple de message que vous pouvez utiliser pour annoncer cette version de maintenance ( se sentir libre de l'utiliser sur vos sites web )
diff --git a/htdocs/langs/fr_CA/bills.lang b/htdocs/langs/fr_CA/bills.lang
index 619d5a2161d..b823446a0ea 100644
--- a/htdocs/langs/fr_CA/bills.lang
+++ b/htdocs/langs/fr_CA/bills.lang
@@ -16,7 +16,6 @@ DoPayment=Entrez le paiement
 DoPaymentBack=Saisissez le remboursement
 ConvertExcessReceivedToReduc=Convertir l'excédent reçu en réduction future
 StatusOfGeneratedInvoices=État des factures générées
-BillStatusPaidBackOrConverted=Remboursement de la note de crédit ou converti en réduction
 BillShortStatusPaidBackOrConverted=Remboursement ou conversion
 NoQualifiedRecurringInvoiceTemplateFound=Aucune facture de modèle récurrent qualifié pour la génération.
 FoundXQualifiedRecurringInvoiceTemplate=Modèles de factures récurrentes qualifiées trouvées %s pour la génération
@@ -106,6 +105,7 @@ MarsNumRefModelDesc1=Numéro de retour avec le format %syymm-nnnn pour les factu
 CactusNumRefModelDesc1=Numéro de retour avec le format %syymm-nnnn pour les factures standard, %syymm-nnnn pour les notes de crédit et %syymm-nnnn pour les factures de versement de paiement où yy est l'année, mm est le mois et nnnn est une séquence sans interruption et aucun retour à 0
 SituationAmount=Montant de facture de situation (no tax.)
 NotLastInCycle=Cette facture n'est pas la dernière en cycle et ne doit pas être modifiée.
+situationInvoiceShortcode_S=D
 NoSituations=Pas de point de situation ouvert
 PDFCrevetteSituationInvoiceLineDecompte=Facture de situation - compter
 PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s sur %s
diff --git a/htdocs/langs/fr_CA/companies.lang b/htdocs/langs/fr_CA/companies.lang
index 78a1c1aaead..6047b3d8f71 100644
--- a/htdocs/langs/fr_CA/companies.lang
+++ b/htdocs/langs/fr_CA/companies.lang
@@ -11,7 +11,6 @@ StateShort=États
 PhoneShort=Téléphone
 No_Email=Refuser les envois de masse
 CopyAddressFromSoc=Adresse de remplissage avec adresse de tiers
-ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty ni client ni fournisseur, aucun objet de référence disponible
 PaymentBankAccount=Compte bancaire de paiement
 OverAllOrders=Ordres
 OverAllSupplierProposals=Demande de prix
@@ -20,6 +19,7 @@ LocalTax2IsUsed=Assujeti à une troisième taxe
 ProfId6Short=TVQ
 ProfId6=TVQ
 CompanyHasAbsoluteDiscount=Ce client dispose d'un rabais disponible (notes de crédits ou acomptes) pour <b> %s</b>%s
+CompanyHasNoAbsoluteDiscount=Ce client n'a pas ou plus de remise fixe disponible
 ContactId=ID de contact
 FromContactName=Prénom:
 ContactForOrdersOrShipments=Contact de commandes ou de livraison
@@ -43,4 +43,3 @@ ConfirmMergeThirdparties=Êtes-vous sûr de vouloir fusionner ce tiers avec le p
 SaleRepresentativeLogin=Connexion du représentant des ventes
 SaleRepresentativeFirstname=Prénom du représentant des ventes
 SaleRepresentativeLastname=Nom de représentant commercial
-NewCustomerSupplierCodeProposed=Nouveau code client ou fournisseur suggéré sur le code en double
diff --git a/htdocs/langs/fr_CA/compta.lang b/htdocs/langs/fr_CA/compta.lang
index a78d1ead272..b7119dae022 100644
--- a/htdocs/langs/fr_CA/compta.lang
+++ b/htdocs/langs/fr_CA/compta.lang
@@ -61,7 +61,6 @@ CalculationRuleDesc=Pour calculer le total de TPS/TVH, il existe 2 modes:<br>Le
 CalculationRuleDescSupplier=Selon le fournisseur, choisissez la méthode appropriée pour appliquer la même règle de calcul et obtenez le même résultat attendu par votre fournisseur.
 ACCOUNTING_VAT_PAY_ACCOUNT=Compte comptable par défaut pour payer la TVA
 ACCOUNTING_ACCOUNT_CUSTOMER=Compte comptable utilisé pour les tiers clients
-ACCOUNTING_ACCOUNT_SUPPLIER=Compte comptable utilisé pour les tiers fournisseurs
 CloneTax=Cloner une charge sociale
 ConfirmCloneTax=Confirmer le clonage de la charge sociale
 AddExtraReport=Rapports supplémentaires (ajouter un rapport client étranger et national)
diff --git a/htdocs/langs/fr_CA/dict.lang b/htdocs/langs/fr_CA/dict.lang
index ff5761ddc02..cd37c72da49 100644
--- a/htdocs/langs/fr_CA/dict.lang
+++ b/htdocs/langs/fr_CA/dict.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - dict
 CountryBE=la Belgique
-CountryGB=Grande Bretagne
 CountryUS=États Unis
 CountryTG=Aller
 CountryCI=Côte d'Ivoiry
diff --git a/htdocs/langs/fr_CA/ecm.lang b/htdocs/langs/fr_CA/ecm.lang
index a3e31ffa651..83afa095513 100644
--- a/htdocs/langs/fr_CA/ecm.lang
+++ b/htdocs/langs/fr_CA/ecm.lang
@@ -6,8 +6,6 @@ ECMSectionsManual=Arbre manuel
 ECMSectionsAuto=Arbre automatique
 ECMAddSection=Ajouter un répertoire
 ECMCreationDate=Date création
-ECMArea=Zone EDM
-ECMAreaDesc=La zone EDM (Electronic Document Management) vous permet d'enregistrer, de partager et de rechercher rapidement toutes sortes de documents dans Dolibarr.
 ECMAreaDesc2=* Les répertoires automatiques sont remplis automatiquement lors de l'ajout de documents à partir d'une carte d'un élément. <br> * Les répertoires manuels peuvent être utilisés pour enregistrer des documents non liés à un élément particulier.
 ECMSectionWasRemoved=Le répertoire <b>%s</b> a été supprimé.
 ECMSectionOfDocuments=Répertoires de documents
@@ -26,6 +24,4 @@ ShowECMSection=Afficher le répertoire
 DeleteSection=Supprimer le répertoire
 ConfirmDeleteSection=Pouvez-vous confirmer que vous souhaitez supprimer le répertoire <b>%s</b>?
 ECMDirectoryForFiles=Répertoire relatif des fichiers
-CannotRemoveDirectoryContainsFiles=Supprimé n'est pas possible car il contient certains fichiers
 ECMFileManager=Gestionnaire de fichiers
-ECMSelectASection=Sélectionnez un répertoire sur l'arbre de gauche ...
diff --git a/htdocs/langs/fr_CA/errors.lang b/htdocs/langs/fr_CA/errors.lang
index 8a23ebe69b1..4edfcb3a650 100644
--- a/htdocs/langs/fr_CA/errors.lang
+++ b/htdocs/langs/fr_CA/errors.lang
@@ -25,8 +25,6 @@ ErrorCustomerCodeRequired=Code client requis
 ErrorBarCodeRequired=Code de barre requis
 ErrorBarCodeAlreadyUsed=Code à barres déjà utilisé
 ErrorPrefixRequired=Préfixe requis
-ErrorBadSupplierCodeSyntax=Mauvaise syntaxe pour le code fournisseur
-ErrorSupplierCodeRequired=Code du fournisseur requis
 ErrorBadParameters=Mauvais paramètres
 ErrorBadValueForParameter=Valeur incorrecte '%s' pour le paramètre '%s'
 ErrorBadImageFormat=Le format de votre fichier image n'est pas supporté (Votre logiciel PHP ne supporte pas les fonctions de conversion d'images de ce format)
@@ -74,7 +72,6 @@ ErrorFieldRefNotIn=Valeur incorrecte pour le numéro de champ <b>%s</b> (valeur
 ErrorFileIsInfectedWithAVirus=Le programme antivirus n'a pas pu valider le fichier (le fichier peut être infecté par un virus)
 ErrorSpecialCharNotAllowedForField=Les caractères spéciaux ne sont pas autorisés pour le champ "%s"
 ErrorNumRefModel=Une référence existe dans la base de données (%s) et n'est pas compatible avec cette règle de numérotation. Supprimez l'enregistrement ou la renommée référence pour activer ce module.
-ErrorQtyTooLowForThisSupplier=Quantité trop faible pour ce fournisseur ou pas de prix défini sur ce produit pour ce fournisseur
 ErrorModuleSetupNotComplete=La configuration du module semble être inachevée. Allez sur Accueil - Configuration - Modules à compléter.
 ErrorBadMaskBadRazMonth=Erreur, mauvaise valeur de réinitialisation
 ErrorMaxNumberReachForThisMask=Nombre maxi pour ce masque
@@ -143,7 +140,6 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Définition incorrecte de la mat
 ErrorSavingChanges=Une erreur s'est produite lors de l'enregistrement des modifications
 ErrorWarehouseRequiredIntoShipmentLine=Un entrepôt est requis sur la ligne à expédier
 ErrorFileMustHaveFormat=Le fichier doit avoir un format %s
-ErrorSupplierCountryIsNotDefined=Le pays pour ce fournisseur n'est pas défini. Veuillez premièrement corriger cet élément.
 ErrorsThirdpartyMerge=Impossible de fusionner les deux enregistrements. Demande annulée.
 ErrorStockIsNotEnoughToAddProductOnOrder=Le stock n'est pas suffisant pour le produit %s pour l'ajouter à une nouvelle commande.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Le stock n'est pas suffisant pour le produit %s pour l'ajouter à une nouvelle facture.
diff --git a/htdocs/langs/fr_CA/ldap.lang b/htdocs/langs/fr_CA/ldap.lang
index 19fb06a3b0c..3341066c83e 100644
--- a/htdocs/langs/fr_CA/ldap.lang
+++ b/htdocs/langs/fr_CA/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Mot de passe pour le domaine
 YouMustChangePassNextLogon=Le mot de passe pour l'utilisateur <b>%s</b> sur le domaine <b>%s</b> doit être modifié.
 UserMustChangePassNextLogon=L'utilisateur doit modifier le mot de passe sur le domaine %s
 LDAPInformationsForThisContact=Information dans la base de données LDAP pour ce contact
diff --git a/htdocs/langs/fr_CA/loan.lang b/htdocs/langs/fr_CA/loan.lang
index 6d1ecb50f4a..64738b543c6 100644
--- a/htdocs/langs/fr_CA/loan.lang
+++ b/htdocs/langs/fr_CA/loan.lang
@@ -12,28 +12,6 @@ ConfirmDeleteLoan=Confirmer la suppression de ce prêt
 LoanDeleted=Prêt supprimé avec succès
 ConfirmPayLoan=Confirmer classer payé ce prêt
 LoanPaid=Prêt payé
-LoanCalc=Calculatrice de prêts bancaires
-PurchaseFinanceInfo=Informations sur l'achat et le financement
-SalePriceOfAsset=Prix ​​de vente de l'actif
-PercentageDown=Pourcentage en baisse
-AnnualInterestRate=Taux d'intérêt annuel
-ExplainCalculations=Expliquer les calculs
-ShowMeCalculationsAndAmortization=Montrez-moi les calculs et l'amortissement
-MortgagePaymentInformation=Information sur le paiement hypothécaire
-DownPaymentDesc=Le paiement <b> </ b> = Le prix de la maison multiplié par le pourcentage réduit divisé par 100 (pour 5% inférieur devient 5/100 ou 0.05)
-InterestRateDesc=Le taux d'intérêt <b> </ b> = Le pourcentage d'intérêt annuel divisé par 100
-MonthlyFactorDesc=<B> facteur mensuel </ b> = Le résultat de la formule suivante
-MonthlyInterestRateDesc=Le taux d'intérêt mensuel <b> </ b> = Le taux d'intérêt annuel divisé par 12 (pour les 12 mois par an)
-MonthTermDesc=Le terme <b> mois </ b> du prêt en mois = Le nombre d'années où vous avez pris le prêt pour les périodes 12
-MonthlyPaymentDesc=Le paiement mensuel est calculé en utilisant la formule suivante
-AmortizationPaymentDesc=La <a href="#amortization"> amortissement </a> décompose la quantité de votre paiement mensuel vers l'intérêt de la banque, et combien coûte le remboursement du capital de votre prêt.
-AmountFinanced=Montant Financé
-AmortizationMonthlyPaymentOverYears=Amortissement pour paiement mensuel: <b>%s</b> sur %s années
-Totalsforyear=Totaux pour l'année
-LoanCalcDesc=Ce <b> calculateur d'hypothèque </ b> peut être utilisé pour calculer les paiements mensuels d'un prêt, en fonction du montant emprunté, de la durée du prêt souhaité et du taux d'intérêt. <br> Ce calculateur comprend également PMI (Private Mortgage Assurance) pour les prêts dont moins de 20%% est mis en paiement. Les taxes sur la propriété de la ville et leurs effets sur le paiement mensuel total de l'hypothèque sont également pris en considération.
-GoToInterest=%s ira vers INTÉRÊT
-GoToPrincipal=%s ira vers PRINCIPAL
-YouWillSpend=Vous passerez %s en année %s
 AddLoan=Créer un prêt
 ConfigLoan=Configuration du prêt du module
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Capital de comptabilité par défaut
diff --git a/htdocs/langs/fr_CA/main.lang b/htdocs/langs/fr_CA/main.lang
index 2a7c8653c0d..25d94a95349 100644
--- a/htdocs/langs/fr_CA/main.lang
+++ b/htdocs/langs/fr_CA/main.lang
@@ -114,6 +114,7 @@ CompleteOrNoMoreReceptionExpected=Complète ou rien de plus attendu
 YouCanChangeValuesForThisListFromDictionarySetup=Vous pouvez modifier les valeurs de cette liste dans le menu Configuration - Dictionnaires
 YouCanChangeValuesForThisListFrom=Vous pouvez modifier les valeurs de cette liste dans le menu %s
 YouCanSetDefaultValueInModuleSetup=Vous pouvez configurer la valeur par défaut utilisée lors de la création d'un nouvel enregistrement dans la configuration du module
+MenuAccountancy=Compte
 Layout=Disposition
 Screen=Écran
 Merge=Fusion
@@ -161,9 +162,7 @@ Select2LoadingMoreResults=Chargement de plus de résultats ...
 Select2SearchInProgress=Recherche en cours ...
 SearchIntoMembers=Membres
 SearchIntoTasks=les tâches
-SearchIntoSupplierOrders=Commandes de fournisseur
 SearchIntoCustomerProposals=Propositions de clients
-SearchIntoSupplierProposals=Propositions de fournisseurs
 SearchIntoCustomerShipments=Envois clients
 SearchIntoExpenseReports=Note de frais
 SearchIntoLeaves=Feuilles
diff --git a/htdocs/langs/fr_CA/margins.lang b/htdocs/langs/fr_CA/margins.lang
index a4418708f74..b32e70a5949 100644
--- a/htdocs/langs/fr_CA/margins.lang
+++ b/htdocs/langs/fr_CA/margins.lang
@@ -21,7 +21,6 @@ MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Définit si une remise globale est traitée
 MARGIN_TYPE=Prix ​​d'achat / coût suggéré par défaut pour le calcul de la marge
 MargeType2=Marge sur le prix moyen pondéré (WAP)
 MargeType3=Marge sur prix coûté
-MarginTypeDesc=* Marge sur le meilleur prix d'achat = Prix de vente - Meilleur prix fournisseur défini sur la carte du produit <br> * Marge sur le prix moyen pondéré (WAP) = Prix de vente - Prix moyen pondéré du produit (WAP) ou meilleur prix fournisseur si WAP n'est pas encore défini < Br> * Marge sur prix de coût = Prix de vente - Prix de coût défini sur la carte de produit ou WAP si le prix de revient n'est pas défini ou le meilleur prix de fournisseur si WAP n'est pas encore défini
 CostPrice=Prix ​​de revient
 UnitCharges=Frais unitaires
 Charges=Des charges
diff --git a/htdocs/langs/fr_CA/orders.lang b/htdocs/langs/fr_CA/orders.lang
index b888e06a930..e1c7b313129 100644
--- a/htdocs/langs/fr_CA/orders.lang
+++ b/htdocs/langs/fr_CA/orders.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Zone de commandes clients
-SuppliersOrdersArea=Zone de commandes des fournisseurs
 OrderCard=Carte de commande
 OrderId=Numéro de commande
 Orders=Ordres
@@ -8,17 +7,12 @@ OrderToProcess=Commander pour traiter
 NewOrder=nouvel ordre
 ToOrder=Faire une commande
 MakeOrder=Faire une commande
-SupplierOrder=Commande du fournisseur
-SuppliersOrders=Commandes des fournisseurs
-SuppliersOrdersRunning=Commandes actuelles des fournisseurs
-CustomerOrder=Commande du client
 CustomersOrdersRunning=Commandes clients actuelles
 CustomersOrdersAndOrdersLines=Commandes client et lignes de commande
 OrdersDeliveredToBill=Ordres des clients livrés à la facture
 OrdersToBill=Commandes du client livrées
 OrdersInProcess=Commandes clients en cours
 OrdersToProcess=Ordres clients à traiter
-SuppliersOrdersToProcess=Ordres fournisseurs à traiter
 StatusOrderCanceledShort=Annulé
 StatusOrderProcessedShort=Traité
 StatusOrderDelivered=Livré
@@ -53,14 +47,11 @@ AddOrder=Créer un ordre
 AddToDraftOrders=Ajouter au projet d'ordre
 ShowOrder=Afficher l'ordre
 NoDraftOrders=Aucun projet de commande
-NoSupplierOrder=Pas de fournisseur
 LastOrders=Derniers %s commandes client
 LastCustomerOrders=Derniers %s commandes client
-LastSupplierOrders=Dernières commandes du fournisseur %s
 LastModifiedOrders=Derniers %s commandes modifiées
 AllOrders=Tous les ordres
 OrdersStatistics=Statistiques de la commande
-OrdersStatisticsSuppliers=Statistiques de la commande du fournisseur
 AmountOfOrdersByMonthHT=Montant des commandes par mois (net d'impôt)
 CloseOrder=Fermer l'ordre
 ConfirmCloseOrder=Êtes-vous sûr de vouloir régler cette commande? Une fois la commande livrée, elle peut être configurée comme facturée.
@@ -72,11 +63,8 @@ ConfirmMakeOrder=Êtes-vous sûr de vouloir confirmer que vous avez effectué ce
 GenerateBill=Générer une facture
 ClassifyShipped=Classifier livré
 DraftOrders=Projet de commandes
-DraftSuppliersOrders=Ordres des fournisseurs de projets
 OnProcessOrders=Commandes en cours
 RefCustomerOrder=Réf. Commande pour client
-RefOrderSupplier=Réf. Commande pour fournisseur
-RefOrderSupplierShort=Réf. Fournisseur de commande
 SendOrderByMail=Envoyer la commande par mail
 ActionsOnOrder=Événements sur commande
 NoArticleOfTypeProduct=Aucun article de type 'produit' donc aucun article expédié pour cet ordre
@@ -88,19 +76,12 @@ ConfirmCloneOrder=Êtes-vous sûr de vouloir cloner cette commande <b>%s</b>?
 DispatchSupplierOrder=Commande de fournisseur de réception %s
 FirstApprovalAlreadyDone=Première approbation déjà terminée
 SecondApprovalAlreadyDone=Deuxième approbation déjà terminée
-SupplierOrderReceivedInDolibarr=Commande fournisseur %s reçu %s
-SupplierOrderSubmitedInDolibarr=Commande du fournisseur %s soumise
-SupplierOrderClassifiedBilled=Commande du fournisseur %s set facturé
 TypeContact_commande_internal_SALESREPFOLL=Ordre de suivi du client représentatif
 TypeContact_commande_internal_SHIPPING=Expédition complémentaire représentative
 TypeContact_commande_external_BILLING=Contact client facturation
 TypeContact_commande_external_SHIPPING=Contact client livraison
 TypeContact_commande_external_CUSTOMER=Ordre de suivi du contact client
-TypeContact_order_supplier_internal_SALESREPFOLL=Ordonnance de fournisseur adjointe représentative
 TypeContact_order_supplier_internal_SHIPPING=Expédition complémentaire représentative
-TypeContact_order_supplier_external_BILLING=Contact fournisseur facturation
-TypeContact_order_supplier_external_SHIPPING=Contact fournisseur livraison
-TypeContact_order_supplier_external_CUSTOMER=Ordre de suivi du contact fournisseur
 Error_OrderNotChecked=Aucun ordre de facturation sélectionné
 OrderByFax=Télécopie
 PDFEinsteinDescription=Un modèle de commande complet (logo ...)
diff --git a/htdocs/langs/fr_CA/other.lang b/htdocs/langs/fr_CA/other.lang
index 344334657f7..b4d27a0a27a 100644
--- a/htdocs/langs/fr_CA/other.lang
+++ b/htdocs/langs/fr_CA/other.lang
@@ -131,7 +131,6 @@ StartUpload=Commence le téléchargement
 CancelUpload=Annuler le chargement
 FileIsTooBig=Les fichiers sont trop gros
 PleaseBePatient=Merci de patienter…
-RequestToResetPasswordReceived=Une requête pour changer votre mot de passe Dolibarr a été reçue
 NewKeyIs=Voici vos nouvelles clés pour vous connecter
 NewKeyWillBe=Votre nouvelle clé de connexion au logiciel sera
 ClickHereToGoTo=Cliquez ici pour aller à %s
diff --git a/htdocs/langs/fr_CA/productbatch.lang b/htdocs/langs/fr_CA/productbatch.lang
index fd0ed7d0e8d..84804506aca 100644
--- a/htdocs/langs/fr_CA/productbatch.lang
+++ b/htdocs/langs/fr_CA/productbatch.lang
@@ -11,7 +11,6 @@ DetailBatchNumber=Détails du lot / série
 printBatch=Lot / série: %s
 printSellby=Vendre par: %s
 AddDispatchBatchLine=Ajouter une ligne pour l'expédition de la durée de conservation
-WhenProductBatchModuleOnOptionAreForced=Lorsque le module Lot / Serial est activé, le mode de mise à l'arrêt / diminution automatique est obligé de valider l'expédition et d'envoyer manuellement pour la réception et ne peut pas être modifié. D'autres options peuvent être définies comme vous le souhaitez.
 ProductDoesNotUseBatchSerial=Ce produit n'utilise pas de lot / numéro de série
 ProductLotSetup=Configuration du module lot / série
 ShowCurrentStockOfLot=Afficher le stock actuel pour un produit / lot partiel
diff --git a/htdocs/langs/fr_CA/projects.lang b/htdocs/langs/fr_CA/projects.lang
index 354e3f0274a..803c80994c3 100644
--- a/htdocs/langs/fr_CA/projects.lang
+++ b/htdocs/langs/fr_CA/projects.lang
@@ -138,4 +138,3 @@ OpportunityTotalAmount=Possibilité montant total
 OpportunityPonderatedAmountDesc=Montant des opportunités pondéré avec probabilité
 OppStatusPENDING=Créance
 OppStatusWON=A gagné
-SendProjectRef=About project %s
diff --git a/htdocs/langs/fr_CA/supplier_proposal.lang b/htdocs/langs/fr_CA/supplier_proposal.lang
index 6c32d719fc9..6098072e006 100644
--- a/htdocs/langs/fr_CA/supplier_proposal.lang
+++ b/htdocs/langs/fr_CA/supplier_proposal.lang
@@ -1,18 +1,10 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Propositions commerciales fournisseurs
-supplier_proposalDESC=Gérer les demandes de prix aux fournisseurs
 CommRequests=Demande de prix
 SearchRequest=Trouver une demande
 DraftRequests=Requêtes préliminaires
-SupplierProposalsDraft=Projet de propositions de fournisseurs
 LastModifiedRequests=Dernières %s demandes de prix modifiées
 RequestsOpened=Demandes de prix ouverts
-SupplierProposalArea=Zone de propositions de fournisseurs
-SupplierProposalShort=Proposition de fournisseur
-SupplierProposals=Propositions de fournisseurs
-SupplierProposalsShort=Propositions de fournisseurs
 ShowSupplierProposal=Afficher la demande de prix
-SupplierProposalRefFourn=Réf fournisseur
 SupplierProposalRefFournNotice=Avant de passer à "Accepté", pensez à saisir les références des fournisseurs.
 ConfirmValidateAsk=Êtes-vous sûr de vouloir valider cette demande de prix sous le nom <b> %s</b>?
 DeleteAsk=Supprimer la demande
@@ -34,9 +26,5 @@ 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)
-ListOfSupplierProposals=Liste des demandes de proposition de fournisseur
-ListSupplierProposalsAssociatedProject=Liste des propositions de fournisseurs associées au projet
-SupplierProposalsToClose=Propositions de fournisseurs à clôturer
-SupplierProposalsToProcess=Propositions de fournisseurs à traiter
 LastSupplierProposals=Dernières demandes de prix %s
 AllPriceRequests=Toutes les demandes
diff --git a/htdocs/langs/fr_CA/suppliers.lang b/htdocs/langs/fr_CA/suppliers.lang
index e0f84ac3812..70dab4e61d8 100644
--- a/htdocs/langs/fr_CA/suppliers.lang
+++ b/htdocs/langs/fr_CA/suppliers.lang
@@ -1,27 +1,14 @@
 # Dolibarr language file - Source file is en_US - suppliers
-SuppliersInvoice=Factures fournisseurs
-ShowSupplierInvoice=Afficher une facture fournisseur
-ListOfSuppliers=Liste fournisseurs
 TotalBuyingPriceMinShort=Total de sous-produits par prix d'achat
 SomeSubProductHaveNoPrices=Certains sous-produits n'ont pas de prix défini
 ChangeSupplierPrice=Changer le prix d'achat
-SupplierPrices=Prix ​​des fournisseurs
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Ce fournisseur de référence est déjà associé à une référence : %s
-NoRecordedSuppliers=Aucun fournisseurs enregistrés
-SupplierPayment=Règlement fournisseur
 Availability=Disponible
-ExportDataset_fournisseur_1=Liste des factures des fournisseurs et des lignes de facturation
-ExportDataset_fournisseur_2=Factures des fournisseurs et paiements
-ExportDataset_fournisseur_3=Commandes fournisseurs et les lignes de commande
 ApproveThisOrder=Approuver cette commande
 ConfirmApproveThisOrder=Êtes-vous sûr de vouloir approuver la commande <b> %s</b>?
 ConfirmDenyingThisOrder=Êtes-vous sûr de vouloir refuser cette commande <b> %s</b>?
 ConfirmCancelThisOrder=Êtes-vous sûr de vouloir annuler cette commande <b> %s</b>?
-ListOfSupplierProductForSupplier=Liste des produits et des prix pour le fournisseur <b>%s</b>
-SentToSuppliers=Envoyer aux fournisseurs
-MenuOrdersSupplierToBill=Commandes de fournisseur à facturer
 DescNbDaysToDelivery=Délai de livraison maximum pour les produits de cette commande
 DoNotOrderThisProductToThisSupplier=Ne commandez pas
 NotTheGoodQualitySupplier=Qualité incorrecte
 AllProductServicePrices=Tous les prix des produits / services
-BuyingPriceNumShort=Prix ​​des fournisseurs
diff --git a/htdocs/langs/fr_CA/trips.lang b/htdocs/langs/fr_CA/trips.lang
index 30ff8d6e6ed..3265cfe3577 100644
--- a/htdocs/langs/fr_CA/trips.lang
+++ b/htdocs/langs/fr_CA/trips.lang
@@ -9,6 +9,8 @@ ListOfFees=Liste des frais
 TypeFees=Types de frais
 ShowTrip=Afficher le rapport de dépenses
 NewTrip=Nouveau rapport de dépenses
+AllExpenseReports=Tous les rapports de dépenses
+CompanyVisited=Compagnie/organisation visitée
 DeleteTrip=Supprimer le rapport de dépenses
 ConfirmDeleteTrip=Êtes-vous sûr de vouloir supprimer ce rapport de dépenses?
 ListTripsAndExpenses=Liste des rapports de dépenses
@@ -30,6 +32,9 @@ ExpenseReportLine=Ligne de rapport de dépenses
 TF_LUNCH=Le déjeuner
 TF_BUS=Autobus
 TF_HOTEL=Un hôtel
+EX_KME=coûts de kilométrage
+EX_SUO=Fournitures de bureau
+EX_GUM=Exemple avec 1d1 =5
 ErrorDoubleDeclaration=Vous avez déclaré un autre rapport de dépenses dans une fourchette de dates similaire.
 AucuneLigne=Il n'y a pas encore de rapport de dépenses déclaré
 VALIDATOR=Responsable de l'approbation
@@ -58,4 +63,15 @@ ExpenseReportsToApprove=Rapports de dépenses à approuver
 ExpenseReportsToPay=Rapports de dépenses à payer
 CloneExpenseReport=Rapport de dépenses de clones
 ConfirmCloneExpenseReport=Êtes-vous sûr de vouloir cloner ce rapport de dépenses?
+expenseReportRangeMoreThan=plus que 1%d
+expenseReportCoefUndefined=(Valeur non définie)
 ExpenseReportDateEnd=Date de fin
+ExpenseReportLimitAmount=Montant de la limite
+byEX_DAY=par jour (limite à 1%s)
+byEX_MON=par mois (limite à 1%s)
+byEX_YEA=par année (limite à 1%s)
+byEX_EXP=par ligne (limite à 1%s)
+nolimitbyEX_DAY=par jour (pas de limite)
+nolimitbyEX_MON=par mois (pas de limite)
+nolimitbyEX_YEA=par année (pas de limite)
+nolimitbyEX_EXP=par ligne (pas de limite)
diff --git a/htdocs/langs/fr_CA/website.lang b/htdocs/langs/fr_CA/website.lang
index 6e6f13d9a87..33ef372b6e6 100644
--- a/htdocs/langs/fr_CA/website.lang
+++ b/htdocs/langs/fr_CA/website.lang
@@ -11,4 +11,3 @@ PreviewOfSiteNotYetAvailable=Aperçu de votre site web <strong>%s</strong> n'est
 ViewSiteInNewTab=Afficher le site dans un nouvel onglet
 ViewPageInNewTab=Afficher la page dans un nouvel onglet
 ViewWebsiteInProduction=Afficher le site Web à l'aide d'URL d'accueil
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang
index 2ff8dc59dd9..6186690ec8d 100644
--- a/htdocs/langs/fr_FR/accountancy.lang
+++ b/htdocs/langs/fr_FR/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Comptabilité
 ACCOUNTING_EXPORT_SEPARATORCSV=Séparateur de colonnes pour le fichier exporté
 ACCOUNTING_EXPORT_DATE=Format de date pour le fichier d'exportation
 ACCOUNTING_EXPORT_PIECE=Exporter la référence de la pièce ?
@@ -133,10 +134,10 @@ BANK_DISABLE_DIRECT_INPUT=Désactiver la saisie directe de transactions en banqu
 
 ACCOUNTING_SELL_JOURNAL=Journal des ventes
 ACCOUNTING_PURCHASE_JOURNAL=Journal des achats
-ACCOUNTING_MISCELLANEOUS_JOURNAL=Journal des ops. diverses
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Journal des opérations diverses
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Journal des notes de frais
 ACCOUNTING_SOCIAL_JOURNAL=Journal de paie
-ACCOUNTING_HAS_NEW_JOURNAL=Journal d'ouverture
+ACCOUNTING_HAS_NEW_JOURNAL=Journal des A nouveaux
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Compte comptable de tranfert
 ACCOUNTING_ACCOUNT_SUSPENSE=Compte comptable d'attente
@@ -191,6 +192,7 @@ ListAccounts=Liste des comptes comptables
 UnknownAccountForThirdparty=Compte de tiers inconnu. %s sera utilisé
 UnknownAccountForThirdpartyBlocking=Compte de tiers inconnu. Erreur bloquante.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Compte tiers inconnu et compte d'attente non défini. Erreur blocante.
+PaymentsNotLinkedToProduct=Paiement non lié à un produit / service
 
 Pcgtype=Groupe de comptes comptables
 Pcgsubtype=Sous-groupe de comptes comptables
@@ -205,7 +207,7 @@ DescVentilDoneCustomer=Consultez ici la liste des lignes de factures clients et
 DescVentilTodoCustomer=Lier les lignes de factures non déjà liées à un compte comptable produits
 ChangeAccount=Modifier le compte comptable produit/service pour les lignes sélectionnées avec le compte comptable suivant:
 Vide=-
-DescVentilSupplier=Consultez ici la liste des lignes de factures fournisseurs liées ou pas encore liées à un compte comptable produit
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
 DescVentilDoneSupplier=Consultez ici la liste des lignes de factures fournisseurs et leur compte comptable
 DescVentilTodoExpenseReport=Lier les lignes de note de frais par encore liées à un compte comptable
 DescVentilExpenseReport=Consultez ici la liste des lignes de notes de frais liées (ou non) à un compte comptable
@@ -216,7 +218,7 @@ ValidateHistory=Lier automatiquement
 AutomaticBindingDone=Liaison automatique faite
 
 ErrorAccountancyCodeIsAlreadyUse=Erreur, vous ne pouvez pas détruire de compte comptable car il est utilisé
-MvtNotCorrectlyBalanced=Mouvement non équilibré. Crédit = %s. Débit = %s
+MvtNotCorrectlyBalanced=Mouvement non équilibré. Débit = %s| Crébit = %s
 FicheVentilation=Fiche lien
 GeneralLedgerIsWritten=Les transactions sont enregistrées dans le grand livre
 GeneralLedgerSomeRecordWasNotRecorded=Certaines des opérations n'ont pu être journalisées. S'il n'y a pas d'autres messages, c'est probablement car elles sont déjà comptabilisées.
@@ -294,5 +296,9 @@ Binded=Lignes liées
 ToBind=Lignes à lier
 UseMenuToSetBindindManualy=L'autodection n'est pas possible, utilisez le menu <a href="%s"> %s </a> pour effectuer la liaison manuellement
 
+## Import
+ImportAccountingEntries=Écritures comptables
+
 WarningReportNotReliable=Attention : ce rapport n'est pas basé sur le grand livre et ne contient donc pas les écritures manuelles qui lui ont été ajoutées. Si votre journalisation est à jour, la vue depuis le grand livre sera plus précise.
-InventoryJournal=Journal d'inventaire
+ExpenseReportJournal=Journal des dépenses
+InventoryJournal=Journal de l'inventaire
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 49a80dabe7a..4b8633f0ee8 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=Nom d'hôte ou adresse IP du serveur SMTP/SMTPS (Par défa
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Port du serveur SMTP/SMTPS (Non défini dans le PHP sur les systèmes de type Unix)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Nom d'hôte ou adresse IP du serveur SMTP/SMTPS (Non défini dans le PHP sur les systèmes de type Unix)
 MAIN_MAIL_EMAIL_FROM=Adresse email de l'émetteur pour l'envoi d'emails automatiques (Par défaut dans php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=E-mail utilisé comme champ "Errors-To" dans les e-mails envoyés
+MAIN_MAIL_ERRORS_TO=E-mail utilisé les retours d'erreur (champ "Errors-To" dans les e-mails envoyés)
 MAIN_MAIL_AUTOCOPY_TO= Envoyer systématiquement une copie cachée des emails envoyés à
 MAIN_DISABLE_ALL_MAILS=Désactiver globalement tout envoi d'emails (pour mode test ou démos)
 MAIN_MAIL_FORCE_SENDTO=Envoyer tous les emails à (au lieu des vrais destinataires, à des fins de test)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=Méthode d'envoi des emails
 MAIN_MAIL_SMTPS_ID=Identifiant d'authentification SMTP si authentification SMTP requise
 MAIN_MAIL_SMTPS_PW=Mot de passe d'authentification SMTP si authentification SMTP requise
@@ -291,7 +292,7 @@ ModuleSetup=Configuration du module
 ModulesSetup=Configuration Modules/Application
 ModuleFamilyBase=Système
 ModuleFamilyCrm=Gestion de la relation client (GRC)
-ModuleFamilySrm=Gestion de la relation fournisseur (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Gestion des Produits/Services (PM)
 ModuleFamilyHr=Gestion des Ressources Humaines (RH)
 ModuleFamilyProjects=Projets/Travail collaboratif
@@ -373,7 +374,8 @@ NoSmsEngine=Aucun gestionnaire d'envoi de SMS n'est disponible. Les gestionnaire
 PDF=PDF
 PDFDesc=Vous pouvez définir ici des options globales sur la génération des PDF
 PDFAddressForging=Règles de fabrication des zones adresses
-HideAnyVATInformationOnPDF=Cacher toutes les informations en rapport avec la TVA sur les PDF générés
+HideAnyVATInformationOnPDF=Masquer toutes les informations relatives à la Taxe de vente / TVA sur les PDF générés
+PDFRulesForSalesTax=Règles pour la taxe de vente / TVA
 PDFLocaltax=Règles pour %s
 HideLocalTaxOnPDF=Cacher le taux de %s dans la colonne taxe
 HideDescOnPDF=Cacher la description des produits sur les PDF générés
@@ -445,7 +447,8 @@ DisplayCompanyInfo=Afficher l'adresse de la société
 DisplayCompanyManagers=Afficher le nom des responsables
 DisplayCompanyInfoAndManagers=Afficher l'adresse du tiers et le nom de son responsable
 EnableAndSetupModuleCron=Si vous voulez avoir cette facture récurrente générée automatiquement, le module *%s* doit être activé et correctement configuré. Dans le cas contraire, la génération des factures doit être effectuée manuellement à partir de ce modèle avec le bouton *Créer*. Notez que même si vous avez activé la génération automatique, vous pouvez toujours lancer en toute sécurité la génération manuelle. La génération en double sur une même période n'est pas possibles.
-ModuleCompanyCodeAquarium=Renvoie un code comptable composé de :<br>%s suivi du code tiers fournisseur pour le code compta fournisseur,<br>%s suivi du code tiers client pour le code compta client.
+ModuleCompanyCodeCustomerAquarium=%s suivi d'un code client tiers pour un code comptable client
+ModuleCompanyCodeSupplierAquarium=%s suivi du code d'un fournisseur tiers pour un code comptable fournisseur
 ModuleCompanyCodePanicum=Retourne un code comptable vide
 ModuleCompanyCodeDigitaria=Renvoie un code comptable composé suivant le code tiers. Le code est composé du caractère 'C' en première position suivi des 5 premiers caractères du code tiers.
 Use3StepsApproval=Par défaut, les commandes fournisseurs nécessitent d'être créées et approuvées en deux étapes/utilisateurs (une étape/utilisateur pour créer et une étape/utilisateur pour approuver. Si un utilisateur à les deux permissions, ces deux actions sont effectuées en une seule fois). Cette option ajoute la nécessité d'une approbation par une troisième étape/utilisateur, si le montant de la commande est supérieur au montant d'une valeur définie (soit 3 étapes nécessaire: 1 =Validation, 2=Première approbation et 3=seconde approbation si le montant l'exige).<br>Laissez le champ vide si une seule approbation (2 étapes) sont suffisantes, placez une valeur très faibe (0.1) si une deuxième approbation (3 étapes) est toujours exigée.
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Définissez cette valeur sur 1 si vous souhaitez joindre
 FilesAttachedToEmail=Joindre le fichier
 SendEmailsReminders=Envoyer des alertes agenda par e-mails
 davDescription=Ajout un composant pour devenir un serveur DAV
+DAVSetup=Configuration du module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=Utilisateurs & groupes
 Module0Desc=Gestion des utilisateurs / employés et groupes
@@ -479,7 +485,7 @@ Module1Desc=Gestion des tiers (sociétés, particuliers) et contacts
 Module2Name=Commercial
 Module2Desc=Gestion commerciale
 Module10Name=Comptabilité
-Module10Desc=Activation de rapports simplistes de comptabilité (chiffre d'affaires, journaux) basé sur les données en base. Pas de ventilation.
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=Propositions commerciales
 Module20Desc=Gestion des devis/propositions commerciales
 Module22Name=Emailing
@@ -546,8 +552,8 @@ Module400Name=Projets/Opportunités/Affaires
 Module400Desc=Gestion des projets, opportunités/affaires et/ou tâches. Vous pouvez aussi assigner tous les autres éléments (facture, commande, proposition, intervention, ...) à ces projets et avoir une vue transverse depuis la vue projet.
 Module410Name=Webcalendar
 Module410Desc=Interface avec le calendrier Webcalendar
-Module500Name=Dépenses spéciales
-Module500Desc=Dépenses spéciales (taxes, charges fiscales ou sociales, dividendes)
+Module500Name=Taxes et dépenses spéciales
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Règlement des salaires
 Module510Desc=Enregistrer et suivre le paiement des salaires des employés
 Module520Name=Emprunt
@@ -562,7 +568,7 @@ Module700Desc=Gestion des dons
 Module770Name=Notes de frais
 Module770Desc=Gestion et déclaration des notes de frais (transports, repas, ...)
 Module1120Name=Propositions commerciales fournisseurs
-Module1120Desc=Demander des devis et tarifs aux fournisseurs
+Module1120Desc=Demande de proposition commerciale et prix fournisseur
 Module1200Name=Mantis
 Module1200Desc=Interface avec le bug tracker Mantis
 Module1520Name=Génération de document
@@ -576,7 +582,7 @@ Module2200Desc=Active l'usage d'expressions mathématiques
 Module2300Name=Travaux planifiés
 Module2300Desc=Gestion des travaux planifiées (alias cron ou table chrono)
 Module2400Name=Événements/Agenda
-Module2400Desc=Gestion des événements réalisés ou à venir. Enregistrer manuellement des événements ou rendez-vous dans l'agenda ou laisser l'application enregistrer automatiquement des événements à des fins de suivi.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=GED
 Module2500Desc=Gestion de documents (GED). Stockage automatic des documents générés ou stockés. Fonction de partage.
 Module2600Name=API/Web services (serveur SOAP)
@@ -602,7 +608,7 @@ Module6000Name=Workflow
 Module6000Desc=Gérer le Workflow
 Module10000Name=Sites internet
 Module10000Desc=Créer des sites internet publics avec un éditeur WYSIWYG. Indiquer à votre serveur web (Apache, Nginx, ...) le chemin d'accès au à dossier pour mettre votre site en ligne avec votre propre nom de domaine.
-Module20000Name=Gestion des demandes de congés
+Module20000Name=Demandes de congés
 Module20000Desc=Déclaration et suivi des congés des employés
 Module39000Name=Numéros de Lot/Série
 Module39000Desc=Gestion des lots et numéro de série, et date de péremption ou consommation sur les produits
@@ -613,7 +619,7 @@ Module50100Desc=Module Caisse enregistreuse - Point de vente (POS)
 Module50200Name=Paypal
 Module50200Desc=Module permettant d'offrir une page de paiement en ligne par carte de crédit avec Paypal. Ceci peut être utilisé par les clients pour faire des paiements de montants libre ou pour des paiements d'un objet particulier de Dolibarr (facture, commande, ...)
 Module50400Name=Comptabilité (avancée)
-Module50400Desc=Gestion de la comptabilité (double partie, comptes généraux et auxiliaires)
+Module50400Desc=Gestion de la comptabilité (double partie, comptabilité général et auxiliaire). Export du grand livre dans différent formats de logiciels comptables.
 Module54000Name=PrintIPP
 Module54000Desc=Impression directe (sans ouvrir les documents) en utilisant l'interface Cups IPP (l'imprimante doit être visible depuis le serveur, et CUPS doit être installé sur le serveur).
 Module55000Name=Sondage ou Vote
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolérance de retard avant alerte (en jours) sur cotis
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolérance de retard avant alerte (en jours) sur chèques à déposer
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolérance de retard avant alerte (en jours) sur les notes de frais à approuver
 SetupDescription1=L'espace configuration permet de réaliser le paramétrage afin de pouvoir commencer à utiliser l'application
-SetupDescription2=Les deux étapes obligatoires sont les deux étapes dans le menu de gauche. La page de configuration %s et la page de configuration %s :
-SetupDescription3=Les paramètres dans le menu <a href="%s">%s -> %s</a> sont requis car les données définies sont utilisées dans l'affichage Dolibarr et pour personnaliser le comportement par défaut du logiciel (pour les fonctionnalités liées à un pays par exemple).
-SetupDescription4=Les paramètres dans le menu <a href="%s">%s -> %s</a> sont requis car l'ERP/CRM Dolibarr est un ensemble de plusieurs modules/applications, tous plus ou moins indépendants les uns des autres. De nouvelles fonctionnalités seront ajoutées aux différents menus à chaque fois que vous activerez un nouveau module.
+SetupDescription2=Les deux étapes obligatoires sont les deux étapes suivantes (les 2 premières entrées dans le menu de configuration gauche)
+SetupDescription3=Les paramètres dans le menu <a href="%s">%s -> %s</a>. Cette étape est requise car elle définie des données utilisées dans les écrans Dolibarr pour personnaliser le comportement par défaut du logiciel (pour les fonctionnalités liées à un pays par exemple).
+SetupDescription4=Les paramètres dans le menu <a href="%s"> %s -> %s </a>. Cette étape est requise car Dolibarr ERP/CRM est un ensemble de plusieurs modules/applications, tous plus ou moins indépendants. Les fonctionnalités sont ajoutées aux menus pour chaque module que vous activez.
 SetupDescription5=Les autres entrées de configuration gèrent des paramètres facultatifs.
 LogEvents=Événements d'audit de sécurité
 Audit=Audit
@@ -1054,8 +1060,9 @@ LogEventDesc=Vous pouvez activer ici, la journalisation des événements d'audit
 AreaForAdminOnly=Les paramètres d'installation ne peuvent être remplis que par les <b>utilisateurs administrateurs</b> uniquement.
 SystemInfoDesc=Les informations systèmes sont des informations techniques diverses accessibles en lecture seule aux administrateurs uniquement.
 SystemAreaForAdminOnly=Cet espace n'est accessible qu'aux utilisateurs de type administrateur. Aucune permission Dolibarr ne permet d'étendre le cercle des utilisateurs autorisés à cet espace.
-CompanyFundationDesc=Éditez sur cette page toutes les informations connues de la société ou de l'association que vous souhaitez gérer (Pour cela, cliquez sur les boutons "Modifier" ou "Sauvegarder" en bas de page)
+CompanyFundationDesc=Éditez sur cette page toutes les informations connues de la société ou de l'association que vous souhaitez gérer (Pour cela, cliquez sur les boutons "%s" ou "%s" en bas de page)
 AccountantDesc=Renseignez sur cette page toutes les informations connues sur votre comptable
+AccountantFileNumber=Numéro de fichier
 DisplayDesc=Vous pouvez choisir ici tous les paramètres liés à l'apparence de Dolibarr
 AvailableModules=Modules/applications installés
 ToActivateModule=Pour activer des modules, aller dans l'espace Configuration (Accueil->Configuration->Modules).
@@ -1169,7 +1176,6 @@ BrowserIsKO=Vous utilisez le navigateur %s. Ce navigateur est déconseillé pour
 XDebugInstalled=XDebug est chargé.
 XCacheInstalled=XCache est chargé.
 AddRefInList=Afficher les références client/fournisseur dans les listes (listes déroulantes ou à autocomplétion) et les libellés des liens clicables. Les tiers apparaîtront alors sous la forme "CC12345 - SC45678 - La big company coorp", au lieu de "La big company coorp".
-OnSearchAndListGoOnCustomerOrSupplierCard = A la recherche, ou sur une liste, aller directement sur la fiche client ou fournisseur (si le tiers est client ou fournisseur)
 AskForPreferredShippingMethod=Demander la méthode d'expédition préférée pour les tiers.
 FieldEdition=Édition du champ %s
 FillThisOnlyIfRequired=Exemple: +2 (ne remplir que si un décalage d'heure est constaté dans l'export)
@@ -1189,8 +1195,8 @@ UserMailRequired=Email requis pour créer un nouvel utilisateur
 HRMSetup=Configuration du module GRH
 ##### Company setup #####
 CompanySetup=Configuration du module Tiers
-CompanyCodeChecker=Modèle de génération et contrôle des codes tiers (clients/fournisseurs)
-AccountCodeManager=Module de génération de comptes comptables (client et fournisseur)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=Les notifications activent l'envoi d'e-mails automatiques pour certains événements de Dolibarr. L'envoi de ces e-mails automatiques est défini selon :
 NotificationsDescUser=* par utilisateurs, utilisateur par utilisateur.
 NotificationsDescContact=* par tiers de contacts (clients ou fournisseur), contact par contact.
@@ -1204,6 +1210,9 @@ MustBeUnique=Doit être unique ?
 MustBeMandatory=Obligatoire pour créer des tiers ?
 MustBeInvoiceMandatory=Obligatoire pour valider des factures ?
 TechnicalServicesProvided=Services techniques fournis
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=URL du serveur %s: %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Un lien d'exportation du calendrier au format <b>%s</b> sera disponible à l'url :<br>%s
 ##### Invoices #####
@@ -1516,7 +1525,7 @@ OSCommerceTestOk=La connexion au serveur '%s' sur la base '%s' par l'utilisateur
 OSCommerceTestKo1=La connexion au serveur '%s' a réussi mais la base '%s' n'a pu être atteinte.
 OSCommerceTestKo2=La connexion au serveur '%s' par l'utilisateur '%s' à échoué.
 ##### Stock #####
-StockSetup=Configuration du module Entrepôt
+StockSetup=Configuration du module Stock / Entrepôt
 IfYouUsePointOfSaleCheckModule=Si vous utilisez un module Point de Vente (module POS fourni par défaut ou un autre module externe), cette configuration peut être ignoré par votre module point de vente. La plupart de modules Point de Vente sont conçus pour créer immédiatement une facture et de réduire les stocks par défaut quelles que soient les options ici. Donc, si vous avez besoin ou non d'avoir une diminution du stock lors de l'enregistrement d'une vente dans votre Point de Vente, vérifiez également la configuration de votre module POS.
 ##### Menu #####
 MenuDeleted=Menu supprimé
@@ -1573,8 +1582,8 @@ PasswordTogetVCalExport=Clé pour autoriser le lien d'exportation
 PastDelayVCalExport=Ne pas exporter les événements de plus de
 AGENDA_USE_EVENT_TYPE=Utilisez les types d'événements (gérés dans le menu Configuration -> Dictionnaires -> Type d'événements agenda)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Configurez automatiquement cette valeur par défaut pour un type d'événement dans un formulaire de création d'événement.
-AGENDA_DEFAULT_FILTER_TYPE=Régler automatiquement ce type d'événement dans le filtre de recherche de la vue agenda
-AGENDA_DEFAULT_FILTER_STATUS=Régler automatiquement le statut d'événement dans le filtre de recherche de la vue 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_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). Remarque: Le module <strong> %s </strong> doit être activé et configuré correctement pour que le rappel soit envoyé à la bonne fréquence.
 AGENDA_REMINDER_BROWSER=Activer la notification d'événement <b>dans le navigateur de l'utilisateur</b> (lorsque la date de l'événement est atteinte, chaque utilisateur peut refuser ceci au moment de la question de confirmation posée par le navigateur)
@@ -1666,7 +1675,7 @@ NoAmbiCaracAutoGeneration=Ne pas utiliser des caractères ambigus ("1","l","i","
 SalariesSetup=Configuration du module salaires
 SortOrder=Ordre de tri
 Format=Format
-TypePaymentDesc=0:Type de paiement client, 1:Type de paiement fournisseur, 2:Paiement de type client et fournisseur
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Chemin Include (défini dans la variable %s)
 ExpenseReportsSetup=Configuration du module Notes de frais
 TemplatePDFExpenseReports=Modèles de documents pour générer les document de Notes de frais
@@ -1688,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=L'installation de module externe depui
 ConfFileMustContainCustom=Installer ou créer un module externe à partir de l'application nécessite de sauvegarder les fichiers du module dans le répertoire <strong>%s</strong>. Pour que ce répertoire soit reconnu par Dolibarr, vous devez paramétrer le fichier de configuration <strong>conf/conf.php</strong> en ajoutant les 2 lignes suivantes :<br><strong>$dolibarr_main_url_root_alt='/custom'</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Mettre en surbrillance les lignes de la table lorsque la souris passe au-dessus
 HighlightLinesColor=Couleur de la ligne de surbrillance lorsque la souris passe au-dessus (laisser vide pour ne pas mettre en surbrillance)
-TextTitleColor=Couleur du titre des pages
+TextTitleColor=Couleur du texte du titre de la page
 LinkColor=Couleur des liens
 PressF5AfterChangingThis=Appuyez sur la touche CTRL+F5 ou videz le cache de votre navigateur après avoir modifié cette valeur pour que le changement soit effectif
 NotSupportedByAllThemes=Fonctionne avec les thèmes natifs. Non garanti avec d'autres
@@ -1697,6 +1706,7 @@ TopMenuBackgroundColor=Couleur de fond pour le menu Haut
 TopMenuDisableImages=Cacher les images du menu principal
 LeftMenuBackgroundColor=Couleur de fond pour le menu Gauche
 BackgroundTableTitleColor=Couleur de fond pour la ligne de titres des liste/tableaux
+BackgroundTableTitleTextColor=Couleur du texte pour la ligne de titre des tableaux
 BackgroundTableLineOddColor=Couleur de fond pour les lignes impaires des tables
 BackgroundTableLineEvenColor=Couleur de fond pour les lignes paires des tales
 MinimumNoticePeriod=Période de préavis minimum (Votre demande de congé doit être faite avant ce délai)
@@ -1719,19 +1729,19 @@ FillFixTZOnlyIfRequired=Exemple : +2 (ne renseigner que si vous rencontrez des p
 ExpectedChecksum=Somme de contrôle attendue
 CurrentChecksum=Somme de contrôle actuelle
 ForcedConstants=Valeurs de paramètres imposés
-MailToSendProposal=Pour l'envoi de proposition commerciale client
-MailToSendOrder=Pour l'envoi de commande client
-MailToSendInvoice=Pour l'envoi de facture client
-MailToSendShipment=Pour l'envoi de bon de livraison
-MailToSendIntervention=Pour l'envoi de fiche intervention
-MailToSendSupplierRequestForQuotation=Pour l'envoi de demande de prix fournisseur
-MailToSendSupplierOrder=Pour l'envoi de commande fournisseur
-MailToSendSupplierInvoice=Pour l'envoi de facture fournisseur
-MailToSendContract=Pour l'envoie depuis un contrat
-MailToThirdparty=Pour l'envoi depuis la fiche Tiers
-MailToMember=Pour l'envoi depuis la fiche d'un adhérent
-MailToUser=Pour l'envoi depuis la page utilisateur
-MailToProject= Pour envoyer un e-mail depuis la fiche projet
+MailToSendProposal=Propositions/devis
+MailToSendOrder=Commandes clients
+MailToSendInvoice=Factures clients
+MailToSendShipment=Expéditions
+MailToSendIntervention=Interventions
+MailToSendSupplierRequestForQuotation=Demande de devis
+MailToSendSupplierOrder=Commandes fournisseurs
+MailToSendSupplierInvoice=Factures fournisseur
+MailToSendContract=Contrats
+MailToThirdparty=Tiers
+MailToMember=Adhérents
+MailToUser=Utilisateurs
+MailToProject=Fiche projets
 ByDefaultInList=Afficher par défaut sur les vues listes
 YouUseLastStableVersion=Vous utilisez la dernière version stable
 TitleExampleForMajorRelease=Exemple de message que vous pouvez utiliser pour annonce une nouvelle version majeure (n'hésitez pas à l'utilisez pour vos propres news)
@@ -1781,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=Marge bas sur les PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Réglez ceci sur Oui si ce groupe est un calcul d'autres groupes
 EnterCalculationRuleIfPreviousFieldIsYes=Entrez la règle de calcul si le champ précédent a été défini sur Oui (par exemple, 'CODEGRP1 + CODEGRP2')
 SeveralLangugeVariatFound=Plusieurs variantes de langue trouvées
-WebDavServer=URL du serveur %s: %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Supprimer les caractères spéciaux
+COMPANY_AQUARIUM_CLEAN_REGEX=Filtre Regex pour nettoyer la valeur (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=Contact RGPD
+GDPRContactDesc=Si vous stockez des données sur des entreprises / citoyens européens, vous pouvez stocker ici le contact responsable du RGPD.
 ##### Resource ####
 ResourceSetup=Configuration du module Ressource
 UseSearchToSelectResource=Utilisez un champ avec auto-complétion pour choisir les ressources (plutôt qu'une liste déroulante).
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index bdf18b987e2..dd9f6e54412 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -11,7 +11,7 @@ BillsSuppliersUnpaidForCompany=Factures fournisseur impayées pour %s
 BillsLate=Retards de paiement
 BillsStatistics=Statistiques factures clients
 BillsStatisticsSuppliers=Statistiques factures fournisseurs
-DisabledBecauseDispatchedInBookkeeping=Action désactivée car facture transférée dans le grand livre
+DisabledBecauseDispatchedInBookkeeping=Action désactivée car facture comptabilisée dans le grand livre
 DisabledBecauseNotLastInvoice=Action désactivée car facture non supprimable. Des factures ont été créées après cet facture et cela va créer un trou dans la numérotation des factures.
 DisabledBecauseNotErasable=Désactivé car non supprimable
 InvoiceStandard=Facture standard
@@ -109,7 +109,7 @@ CancelBill=Annuler une facture
 SendRemindByMail=Envoyer rappel
 DoPayment=Saisir règlement
 DoPaymentBack=Saisir remboursement 
-ConvertToReduc=Convertir en réduction future
+ConvertToReduc=Marquer comme crédit disponible
 ConvertExcessReceivedToReduc=Convertir le trop-perçu en réduction future
 ConvertExcessPaidToReduc=Convertir le trop-perçu en réduction future
 EnterPaymentReceivedFromCustomer=Saisie d'un règlement reçu du client
@@ -120,7 +120,7 @@ BillStatus=État de la facture
 StatusOfGeneratedInvoices=Statut des factures générées
 BillStatusDraft=Brouillon (à valider)
 BillStatusPaid=Payée
-BillStatusPaidBackOrConverted=Facture d'avoir remboursée ou convertie en réduction
+BillStatusPaidBackOrConverted=Facture d'avoir remboursée ou marqué comme crédit disponible
 BillStatusConverted=Payée (prêt pour consommation dans une facture finale)
 BillStatusCanceled=Abandonnée
 BillStatusValidated=Validée (à payer)
@@ -286,8 +286,8 @@ Deposit=Acompte
 Deposits=Acomptes
 DiscountFromCreditNote=Remise issue de l'avoir %s
 DiscountFromDeposit=Acomptes issus de la facture %s
-DiscountFromExcessReceived=Payments in excess of invoice %s
-DiscountFromExcessPaid=Payments in excess of invoice %s
+DiscountFromExcessReceived=Trop-perçu sur la facture %s
+DiscountFromExcessPaid=Trop-perçu sur la facture %s
 AbsoluteDiscountUse=Ce type de crédit ne peut s'utiliser que sur une facture non validée
 CreditNoteDepositUse=La facture doit être validée pour pouvoir utiliser ce type de crédit
 NewGlobalDiscount=Nouvelle ligne de déduction
@@ -296,10 +296,10 @@ DiscountType=Type de remise
 NoteReason=Note/Motif
 ReasonDiscount=Motif
 DiscountOfferedBy=Accordé par
-DiscountStillRemaining=Réductions disponibles
-DiscountAlreadyCounted=Réductions déjà consommées
+DiscountStillRemaining=Réductions ou crédits disponibles
+DiscountAlreadyCounted=Réductions ou crédits déjà consommés
 CustomerDiscounts=Remises client
-SupplierDiscounts=Remises fournisseur
+SupplierDiscounts=Remises vendeurs
 BillAddress=Adresse de facturation
 HelpEscompte=Un <b>escompte</b> est une remise accordée, sur une facture donnée, à un client car ce dernier a réalisé son règlement bien avant l'échéance.
 HelpAbandonBadCustomer=Ce montant a été abandonné (client jugé mauvais payeur) et est considéré comme une perte exceptionnelle.
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Autoriser le règlement de différents tiers de la
 PaymentNote=Note du paiement
 ListOfPreviousSituationInvoices=Liste des factures de situation précédentes
 ListOfNextSituationInvoices=Liste des factures de situation suivantes
+ListOfSituationInvoices=Liste des factures de situation
+CurrentSituationTotal=Situation actuelle totale
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Supprimer cette facture du cycle
+ConfirmRemoveSituationFromCycle=Retirer cette facture %s du cycle?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Tous les %s jour(s)
 FrequencyPer_m=Tous les %s mois
 FrequencyPer_y=Tout les %s an(s)
@@ -348,10 +354,10 @@ NextDateToExecution=Date pour la prochaine génération de facture
 NextDateToExecutionShort=Date de prochaine génération
 DateLastGeneration=Date de la dernière génération
 DateLastGenerationShort=Date de dernière génération
-MaxPeriodNumber=Max number of invoice generation
-NbOfGenerationDone=Number of invoice generation already done
-NbOfGenerationDoneShort=Number of generation done
-MaxGenerationReached=Maximum number of generations reached
+MaxPeriodNumber=Nombre maximum de génération
+NbOfGenerationDone=Nombre de génération de facture déjà réalisées
+NbOfGenerationDoneShort=Nb de générations réalisée
+MaxGenerationReached=Nombre maximum de générations atteint
 InvoiceAutoValidate=Valider les factures automatiquement
 GeneratedFromRecurringInvoice=Généré depuis la facture modèle récurrente %s
 DateIsNotEnough=Date pas encore atteinte
@@ -505,9 +511,14 @@ SituationAmount=Montant de facture de situation (HT)
 SituationDeduction=Différence de situation
 ModifyAllLines=Modifier toutes les lignes
 CreateNextSituationInvoice=Créer prochaine situation
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=Cette facture n'est pas la dernière dans le cycle et ne doit pas être modifiée
 DisabledBecauseNotLastInCycle=Une facture de situation suivante existe
 DisabledBecauseFinal=Cette situation est la dernière
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=S
 CantBeLessThanMinPercent=La progression ne peut être inférieure à la valeur de progression du point de situation précédent
 NoSituations=Pas de situations ouvertes
 InvoiceSituationLast=Dernière facture
@@ -532,3 +543,4 @@ AutoFillDateFrom=Définir la date de début de la ligne de service avec la date
 AutoFillDateFromShort=Définir la date de début
 AutoFillDateTo=Définir la date de fin de la ligne de service avec la date de la prochaine facture
 AutoFillDateToShort=Définir la date de fin
+MaxNumberOfGenerationReached=Nb maximum de gén. atteint
diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang
index 10ab0fd65e4..adecb7604c8 100644
--- a/htdocs/langs/fr_FR/categories.lang
+++ b/htdocs/langs/fr_FR/categories.lang
@@ -85,3 +85,4 @@ CategorieRecursivHelp=Si activé : quand un élément est ajouté dans une cat
 AddProductServiceIntoCategory=Ajouter le produit/service suivant
 ShowCategory=Afficher tag/catégorie
 ByDefaultInList=Par défaut dans la liste
+ChooseCategory=Choisissez une catégorie
diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang
index 867f0b7197f..83b8cf6aa0c 100644
--- a/htdocs/langs/fr_FR/companies.lang
+++ b/htdocs/langs/fr_FR/companies.lang
@@ -77,11 +77,11 @@ Web=Web
 Poste= Poste
 DefaultLang=Langue par défaut
 VATIsUsed=Assujetti à la TVA
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Non assujetti à la TVA
 CopyAddressFromSoc=Remplir avec l'adresse du tiers
-ThirdpartyNotCustomerNotSupplierSoNoRef=Ce tiers n'est ni client ni fournisseur. il n'y a pas d'objet référent.
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Compte bancaire paiements
 OverAllProposals=Propositions commerciales
 OverAllOrders=Commandes
@@ -267,25 +267,25 @@ Prospect=Prospect
 CustomerCard=Fiche client
 Customer=Client
 CustomerRelativeDiscount=Remise client relative
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Remise relative fournisseur
 CustomerRelativeDiscountShort=Remise relative
 CustomerAbsoluteDiscountShort=Remise fixe
 CompanyHasRelativeDiscount=Ce client a une remise par défaut de <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Ce client n'a pas de remise relative par défaut
-HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
-HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
-CompanyHasAbsoluteDiscount=Ce client dispose de remises disponibles (avoirs ou acomptes) pour un montant de <b>%s</b> %s
+HasRelativeDiscountFromSupplier=Vous avez une réduction par défaut de <b> %s%% </b> chez ce fournisseur
+HasNoRelativeDiscountFromSupplier=Vous n'avez pas de remise relative par défaut chez ce fournisseur
+CompanyHasAbsoluteDiscount=Ce client dispose de crédits disponibles (avoirs ou acomptes) pour un montant de <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=Ce client a une réduction disponible (commercial, acompte) pour <b>%s</b>%s
 CompanyHasCreditNote=Ce client a <b>%s</b> %s d'avoirs disponibles
-HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
-HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
-HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
-HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
-CompanyHasNoAbsoluteDiscount=Ce client n'a pas ou plus de remise fixe disponible
+HasNoAbsoluteDiscountFromSupplier=Vous n'avez aucun crédit de réduction disponible auprès de ce fournisseur
+HasAbsoluteDiscountFromSupplier=Vous avez des crédits disponibles (avoirs ou acomptes) pour <b> %s </b> %s chez ce fournisseur
+HasDownPaymentOrCommercialDiscountFromSupplier=Vous avez des crédits disponibles (bon de réductions, acomptes) pour <b> %s </b> %s chez ce fournisseur
+HasCreditNoteFromSupplier=Vous avez des avoirs pour <b> %s </b> %s chez ce fournisseur
+CompanyHasNoAbsoluteDiscount=Ce client n'a pas ou plus de crédit disponible
 CustomerAbsoluteDiscountAllUsers=Remises client fixes en cours (accordées par tout utilisateur)
 CustomerAbsoluteDiscountMy=Remises client fixes en cours (accordées personnellement)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=Aucune
 Supplier=Fournisseur
 AddContact=Créer contact
@@ -310,7 +310,7 @@ SupplierCodeShort=Code fournisseur
 CustomerCodeDesc=Code client unique pour chaque client
 SupplierCodeDesc=Code fournisseur unique pour chaque fournisseur
 RequiredIfCustomer=Requis si le tiers est un client ou un prospect
-RequiredIfSupplier=Requis si le tiers est un fournisseur
+RequiredIfSupplier=Requis si un tiers est un fournisseur
 ValidityControledByModule=Validité contrôlée par le module
 ThisIsModuleRules=Voici les règles de ce module
 ProspectToContact=Prospect à contacter
@@ -406,7 +406,7 @@ FiscalYearInformation=Information sur l'année fiscale
 FiscalMonthStart=Mois de début d'exercice
 YouMustAssignUserMailFirst=Une adresse e-mail est nécessaire pour l'envoi de notifications à cet utilisateur
 YouMustCreateContactFirst=Pour pouvoir ajouter une notifications par mail,vous devez déjà définir des contacts valides pour le tiers  
-ListSuppliersShort=Liste fournisseurs
+ListSuppliersShort=Liste des fournisseurs
 ListProspectsShort=Liste prospects
 ListCustomersShort=Liste clients
 ThirdPartiesArea=Espace tiers et contacts
@@ -430,5 +430,5 @@ ThirdpartiesMergeSuccess=Les tiers ont été fusionnés
 SaleRepresentativeLogin=Login du commercial
 SaleRepresentativeFirstname=Prénom du commercial
 SaleRepresentativeLastname=Nom du commercial
-ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
+ErrorThirdpartiesMerge=Une erreur est survenue lors de la suppression de ce tiers. Consultez les log. La modification a été annulée.
 NewCustomerSupplierCodeProposed=Nouveau code client ou fournisseur proposé en cas de doublon de code
diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang
index a5711142a70..8da39046918 100644
--- a/htdocs/langs/fr_FR/compta.lang
+++ b/htdocs/langs/fr_FR/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=HT payé
 VATToPay=TVA ventes
 VATReceived=TVA collectée
 VATToCollect=TVA achats
-VATSummary=Balance de TVA
+VATSummary=TVA mensuelle
+VATBalance=Balance de TVA
 VATPaid=TVA payée
 LT1Summary=Résumé taxe 2
 LT2Summary=Résumé taxe 3
@@ -103,7 +104,7 @@ LT2PaymentsES=Règlements IRPF
 VATPayment=Règlement TVA
 VATPayments=Règlements TVA
 VATRefund=Remboursement TVA
-NewVATPayment=New sales tax payment
+NewVATPayment=Nouveau paiement de TVA
 Refund=Rembourser
 SocialContributionsPayments=Paiements de charges fiscales/sociales
 ShowVatPayment=Affiche paiement TVA
@@ -158,24 +159,26 @@ RulesResultDue=- Il comprend les factures impayées, les dépenses, la TVA, les
 RulesResultInOut=- Il comprend les paiements réels effectués sur les factures, les dépenses, la TVA et les salaires. <br> - Il est basé sur les dates de paiement des factures, les dépenses, la TVA et les salaires. La date du don pour le don.
 RulesCADue=- Il comprend les factures dues par le client si elles sont payées ou non. <br> - Il est basé sur la date de validation de ces factures. <br>
 RulesCAIn=- Il inclut les règlements effectivement reçus des factures clients.<br>- Il se base sur la date de règlement de ces factures<br>
-RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
+RulesCATotalSaleJournal=Il comprend toutes les lignes du journal de vente.
 RulesAmountOnInOutBookkeepingRecord=Cela inclut les enregistrements dans votre Grand Livre ayant les comptes de comptabilité qui ont le groupe "EXPENSE" ou "INCOME"
 RulesResultBookkeepingPredefined=Cela inclut les enregistrements dans votre Grand Livre ayant les comptes de comptabilité qui ont le groupe "EXPENSE" ou "INCOME"
 RulesResultBookkeepingPersonalized=Cela inclut les enregistrements dans votre Grand Livre ayant les comptes de comptabilité <b>regroupés par les groupes personnalisés</b>
 SeePageForSetup=Voir le menu <a href="%s"> %s </a> pour la configuration
 DepositsAreNotIncluded=- Les factures d'acomptes ne sont pas incluses
 DepositsAreIncluded=- Les factures d'acomptes sont incluses
-LT1ReportByCustomers=Report tax 2 by third party
-LT2ReportByCustomers=Report tax 3 by third party
+LT1ReportByCustomers=Rapport Tax 2 par Tiers
+LT2ReportByCustomers=Rapport Tax 3 par Tiers
 LT1ReportByCustomersES=Rapport par tiers des RE
 LT2ReportByCustomersES=Rapport par client des IRPF
 VATReport=Rapport TVA
 VATReportByPeriods=Rapport de TVA par période
-VATReportByCustomers=Sale tax report by customer
+VATReportByRates=Rapport TVA par taux
+VATReportByThirdParties=Rapport TVA par Tiers
+VATReportByCustomers=Rapport par client
 VATReportByCustomersInInputOutputMode=Rapport par client des TVA collectées et payées
 VATReportByQuartersInInputOutputMode=Rapport par taux des TVA collectées et payées
-LT1ReportByQuarters=Report tax 2 by rate
-LT2ReportByQuarters=Report tax 3 by rate
+LT1ReportByQuarters=Rapport Tax 2 par Taux
+LT2ReportByQuarters=Rapport Tax 3 par Taux
 LT1ReportByQuartersES=Rapport par taux de RE
 LT2ReportByQuartersES=Rapport par taux de IRPF
 SeeVATReportInInputOutputMode=Cliquer sur <b>%sTVA encaissement%s</b> pour mode de calcul standard
@@ -207,7 +210,7 @@ Pcg_version=Modèle de plan de compte
 Pcg_type=Classe de compte
 Pcg_subtype=Sous classe de compte
 InvoiceLinesToDispatch=Lignes de factures à ventiler
-ByProductsAndServices=Par produits et services
+ByProductsAndServices=Par produit et service
 RefExt=Référence externe
 ToCreateAPredefinedInvoice=Pour créer une facture modèle, créez d'abord une facture standard, puis, avant la validation, cliquez sur le bouton %s.
 LinkedOrder=Lier à une commande
@@ -216,14 +219,15 @@ Mode2=Mode 2
 CalculationRuleDesc=Pour calculer le total de TVA, il existe 2 modes:<br>Le mode 1 consiste à arrondir la tva de chaque ligne et à sommer cet arrondi.<br>Le mode 2 consiste à sommer la tva de chaque ligne puis à l'arrondir.<br>Les résultats peuvent différer de quelques centimes. Le mode par défaut est le mode <b>%s</b>.
 CalculationRuleDescSupplier=Selon le fournisseur, choisissez le mode approprié afin d'appliquer la même règle que celle du fournisseur et obtenir ainsi le même résultat que celui du fournisseur.
 TurnoverPerProductInCommitmentAccountingNotRelevant=Le chiffre d'affaires par produit, dans une comptabilité en mode <b>comptabilité de caisse</b> n'est pas définissable. Ce rapport n'est disponible qu'en mode de comptabilité dit <b>comptabilité d'engagement</b> (voir la configuration du module de comptabilité).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=Le rapport de chiffre d'affaires par Taux de TVA, lorsque vous utilisez le mode <b> comptabilité de caisse </b> n'est pas pertinent. Ce rapport n'est disponible que lorsque vous utilisez le mode <b> comptabilité des engagements </b> (voir configuration du module de comptabilité).
 CalculationMode=Mode de calcul
 AccountancyJournal=Code journal comptable
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
+ACCOUNTING_VAT_SOLD_ACCOUNT=Compte comptable par défaut pour la TVA - TVA sur les ventes (utilisé si non défini au niveau de la configuration du dictionnaire de TVA)
+ACCOUNTING_VAT_BUY_ACCOUNT=Compte comptable par défaut pour la TVA - TVA sur les achats (utilisé si non défini au niveau de la configuration du dictionnaire de TVA)
 ACCOUNTING_VAT_PAY_ACCOUNT=Compte comptable par défaut pour le paiement de la TVA
 ACCOUNTING_ACCOUNT_CUSTOMER=Compte comptable utilisé pour le tiers client
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Le compte comptable dédié défini sur la fiche tiers sera utilisé pour l'affectation du compte auxiliaire uniquement. Celui-ci sera utilisé pour la comptabilité générale et comme valeur par défaut de la comptabilité auxiliaire si le compte comptable client dédié du ties n'est pas défini. 
-ACCOUNTING_ACCOUNT_SUPPLIER=Compte comptable utilisé pour le tiers fournisseur
+ACCOUNTING_ACCOUNT_SUPPLIER=Compte comptable utilisé pour les tiers fournisseur
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Le compte comptable dédié défini sur la carte tierce sera utilisé pour l'affectation du compte secondaire uniquement. Celui-ci sera utilisé pour le grand livre général et comme valeur par défaut de la comptabilité du sous-compte rendu si le compte d'affectation spécialisé du fournisseur sur un tiers n'est pas défini.
 CloneTax=Cloner une charge sociale/fiscale
 ConfirmCloneTax=Confirmez le clone du paiement de charge sociale/fiscale
@@ -241,4 +245,11 @@ ErrorBankAccountNotFound=Erreur: compte banque non trouvé
 FiscalPeriod=Période fiscale
 ListSocialContributionAssociatedProject=Liste des charges sociales liées au projet
 DeleteFromCat=Supprimer du groupe comptable
-AccountingAffectation=Accounting assignement
+AccountingAffectation=Compte affecté
+LastDayTaxIsRelatedTo=Dernier jour de la période pour laquelle la taxe est due
+VATDue=TVA réclamée
+ClaimedForThisPeriod=Réclamé pour la période
+PaidDuringThisPeriod=Payé durant la période
+ByVatRate=Par taux de TVA
+TurnoverbyVatrate=Chiffre d'affaire par taux de TVA
+PurchasebyVatrate=Achat par taux de TVA
diff --git a/htdocs/langs/fr_FR/dict.lang b/htdocs/langs/fr_FR/dict.lang
index 06c67cf97dd..eba530a3970 100644
--- a/htdocs/langs/fr_FR/dict.lang
+++ b/htdocs/langs/fr_FR/dict.lang
@@ -5,7 +5,8 @@ CountryIT=Italie
 CountryES=Espagne
 CountryDE=Allemagne
 CountryCH=Suisse
-CountryGB=Grande-Bretagne
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=Royaume-Uni
 CountryUK=Royaume-Uni
 CountryIE=Irlande
 CountryCN=Chine
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index c3c3f55deb4..02e2a677c8e 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -32,7 +32,7 @@ ErrorBarCodeRequired=Code-barre requis
 ErrorCustomerCodeAlreadyUsed=Code client déjà utilisé
 ErrorBarCodeAlreadyUsed=Code-barre déjà utilisé
 ErrorPrefixRequired=Préfix obligatoire
-ErrorBadSupplierCodeSyntax=La syntaxe du code fournisseur est incorrecte
+ErrorBadSupplierCodeSyntax=Mauvaise syntaxe pour le code fournisseur
 ErrorSupplierCodeRequired=Code fournisseur obligatoire
 ErrorSupplierCodeAlreadyUsed=Code fournisseur déjà utilisé
 ErrorBadParameters=Paramètres incorrects
@@ -208,7 +208,6 @@ ErrorFileNotFoundWithSharedLink=Fichier non trouvé. Peut que la clé de partage
 ErrorProductBarCodeAlreadyExists=Le code-barre du produit %s existe déjà sur une autre référence de produit
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Notez également que l'utilisation d'un produit virtuel pour augmenter ou réduire automatiquement les sous-produits n'est pas possible lorsqu'au moins un sous-produit (ou sous-produit de sous-produits) a besoin d'un numéro de série/lot.
 ErrorDescRequiredForFreeProductLines=La description est obligatoire pour les lignes avec un produit non prédéfini
-ErrorObjectMustHaveStatusValidToBeCanceled=L'objet %s doit être au statut 'Validé' pour être annulé
 
 # Warnings
 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.
diff --git a/htdocs/langs/fr_FR/install.lang b/htdocs/langs/fr_FR/install.lang
index c83288b2a3d..16bcb6357ce 100644
--- a/htdocs/langs/fr_FR/install.lang
+++ b/htdocs/langs/fr_FR/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=Le fichier de configuration <b>%s</b>
 ConfFileCouldBeCreated=Le fichier de configuration <b>%s</b> a pu être créé.
 ConfFileIsNotWritable=Le fichier <b>%s</b> n'est pas modifiable. Pour une première installation, modifiez ses permissions. Le serveur Web doit avoir le droit d'écrire dans ce fichier le temps de la configuration ("chmod 666" par exemple sur un OS compatible Unix).
 ConfFileIsWritable=Le fichier <b>%s</b> est modifiable.
+ConfFileMustBeAFileNotADir=Le fichier de configuration <b> %s </b> doit être un fichier, pas un répertoire.
 ConfFileReload=Rechargement des informations depuis le fichier de configuration.
 PHPSupportSessions=Ce PHP prend en charge les sessions.
 PHPSupportPOSTGETOk=Ce PHP prend bien en charge les variables POST et GET.
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Echec de la création du compte administrateur Dolibarr
 WarningRemoveInstallDir=Attention, pour des raisons de sécurité, afin de bloquer une nouvelle utilisation des outils d'installation/migration, une fois l'installation terminée, il est conseillé de placer dans le répertoire document de Dolibarr un fichier nommé <b>install.lock</b> en lecture seule.
 FunctionNotAvailableInThisPHP=Non disponible sur ce PHP
 ChoosedMigrateScript=Choix du script de migration
-DataMigration=Migration des données
-DatabaseMigration=Migration de la base de données (structure + données)
+DataMigration=Migration de la base (données)
+DatabaseMigration=Migration de la base de données (structure + certaines données)
 ProcessMigrateScript=Exécution du script
 ChooseYourSetupMode=Choisissez votre mode d'installation et cliquez sur "Démarrer"…
 FreshInstall=Première installation
diff --git a/htdocs/langs/fr_FR/ldap.lang b/htdocs/langs/fr_FR/ldap.lang
index 5041be4b300..7f89075fba7 100644
--- a/htdocs/langs/fr_FR/ldap.lang
+++ b/htdocs/langs/fr_FR/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Mot de passe du domaine
 YouMustChangePassNextLogon=Le mot de passe de <b>%s</b> sur le domaine <b>%s</b> doit être modifié.
 UserMustChangePassNextLogon=L'utilisateur doit modifier son mot de passe sur le domaine %s
 LDAPInformationsForThisContact=Informations en base LDAP pour ce contact
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Type d'adhérent synchronisé
 ContactSynchronized=Contact synchronisé
 ForceSynchronize=Forcer synchro Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Échec de la lecture de l'annuaire LDAP. Vérifier la configuration du module LDAP et l'accessibilité de l'annuaire.
+PasswordOfUserInLDAP=Mot de passe utilisateur dans LDAP
diff --git a/htdocs/langs/fr_FR/loan.lang b/htdocs/langs/fr_FR/loan.lang
index e8dcbfa13b4..931ab8f76fb 100644
--- a/htdocs/langs/fr_FR/loan.lang
+++ b/htdocs/langs/fr_FR/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=Capital
 Insurance=Assurance
 Interest=Intérêt
 Nbterms=Nombre de termes
+Term=Terme
 LoanAccountancyCapitalCode=Compte comptable capital
 LoanAccountancyInsuranceCode=Compte comptable assurance
 LoanAccountancyInterestCode=Compte comptable intérêts
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=Confirmer la suppression de cet emprunt ?
 LoanDeleted=Emprunt supprimé avec succès
 ConfirmPayLoan=Classer cet emprunt comme payé
 LoanPaid=Emprunt payé
-# Calc
-LoanCalc=Calculateur d'Emprunt Bancaire
-PurchaseFinanceInfo=Information de Financement et d'Achat
-SalePriceOfAsset=Prix de vente du Bien
-PercentageDown=Réduction Pourcentage
-LengthOfMortgage=Durée du prêt
-AnnualInterestRate=Taux d'Intérêts Annuel
-ExplainCalculations=Expliquer les Calculs
-ShowMeCalculationsAndAmortization=Montrer les calculs et l'ammortissement
-MortgagePaymentInformation=Information de Paiement de l'Hypothèque
-DownPayment=Acompte
-DownPaymentDesc=L'<b>acompte</b> = Le prix de la maison multiplié par le pourcentage divisé par 100 (5% devient 5/100 ou 0,05)
-InterestRateDesc=Le  <b>taux d'intérêt</b> = Le pourcentage annuel d'intérêt divisé par 100.
-MonthlyFactorDesc=<b> facteur mensuel </b> = le résultat de la formule suivant
-MonthlyInterestRateDesc=Le  <b>taux d'intérêt mensuel</b> = Le taux annuel d'intérêt divisé par 12 (pour les 12 mois de l'année)
-MonthTermDesc=Le <b>terme en mois</b> du prêt en mois = Le nombre d'années que vous avez pris pour le prêt multiplié par 12
-MonthlyPaymentDesc=Le paiement mensuel est déterminé en utilisant la formule suivante
-AmortizationPaymentDesc=L' <a href="#amortization">amortissement</a> décompose votre paiement mensuel entre l'intérêt de la banque et le remboursement du principal de votre prêt.
-AmountFinanced=Montant financé
-AmortizationMonthlyPaymentOverYears=Amortissement pour paiement mensuel : <b>%s</b> sur %s ans
-Totalsforyear=Total pour l'année
-MonthlyPayment=Paiement mensuel
-LoanCalcDesc=Cette <b>simulation de prêt</b> peut être utilisée pour comprendre les paiements mensuels d'un emprunt, basé sur le montant emprunté, le terme du prêt désiré et l'intérêt.<br> Cette simulation inclut aussi PMI (l'Assurance Hypothécaire Privée) pour des prêts où moins de 20 %% est mis comme un acompte. Sont pris en considération les impôts fonciers de ville et leur effet sur le paiement total mensuel.<br>
-GoToInterest=%s remboursera les intérêts
-GoToPrincipal=%s remboursera le principal (capital)
-YouWillSpend=Vous allez dépenser %s pour l'année %s
 ListLoanAssociatedProject=Liste des prêts associés au projet
 AddLoan=Créer prêt
+FinancialCommitment=Echéancier
+InterestAmount=Intérêt
+CapitalRemain=Capital restant
 # Admin
 ConfigLoan=Configuration du module Emprunt
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Compte comptable remboursement capital d'un emprunt par défaut
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Compte comptable paiement d'intérêt d'un emprunt par défaut
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Compte comptable paiement de l'assurance d'un emprunt par défaut
-FinancialCommitment=Echéancier
 CreateCalcSchedule=Créer / Modifier échéancier de prêt
-InterestAmount=Montant des intérêts
diff --git a/htdocs/langs/fr_FR/mails.lang b/htdocs/langs/fr_FR/mails.lang
index b4454b00234..d9e0e2b8cde 100644
--- a/htdocs/langs/fr_FR/mails.lang
+++ b/htdocs/langs/fr_FR/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Émetteur
 MailErrorsTo=Erreurs à
 MailReply=Réponse à
 MailTo=Destinataire(s)
+MailToUsers=Aux utilisateurs
 MailCC=Copie à
+MailToCCUsers=Copie aux utilisateurs
 MailCCC=Copie cachée à
 MailTopic=Objet
 MailText=Message
@@ -164,4 +166,4 @@ InGoingEmailSetup=Configuration email entrant
 OutGoingEmailSetupForEmailing=Configuration des e-mail sortant (pour les e-mails de masse)
 DefaultOutgoingEmailSetup=Configuration des emails sortant
 Information=Information
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index 6fba224525e..1d20a38f1e1 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr est configuré en mode au
 Administrator=Administrateur
 Undefined=Non défini
 PasswordForgotten=Mot de passe oublié ?
+NoAccount=Pas de compte ?
 SeeAbove=Voir ci-dessus
 HomeArea=Espace accueil
 LastConnexion=Dernière connexion
@@ -231,7 +232,7 @@ Limit=Limite
 Limits=Limites
 Logout=Déconnexion
 NoLogoutProcessWithAuthMode=Pas de fonctionnalité de déconnexion applicative avec le mode d'authentification <b>%s</b>
-Connection=Connexion
+Connection=Identifiant
 Setup=Configuration
 Alert=Alerte
 MenuWarnings=Alertes
@@ -402,6 +403,7 @@ DefaultTaxRate=Taux de taxe par défaut
 Average=Moyenne
 Sum=Somme
 Delta=Écart
+RemainToPay=Reste à payer
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
@@ -915,7 +917,7 @@ SearchIntoProductsOrServices=Produits ou services
 SearchIntoProjects=Projets
 SearchIntoTasks=Tâches
 SearchIntoCustomerInvoices=Factures clients
-SearchIntoSupplierInvoices=Factures fournisseurs
+SearchIntoSupplierInvoices=Factures fournisseur
 SearchIntoCustomerOrders=Commandes clients
 SearchIntoSupplierOrders=Commandes fournisseurs
 SearchIntoCustomerProposals=Propositions/devis
@@ -942,4 +944,4 @@ LocalAndRemote=Local et distant
 KeyboardShortcut=Raccourci clavier
 AssignedTo=Assigné à
 Deletedraft=Supprimer brouillon
-ConfirmMassDraftDeletion=Confirmation de suppression brouillons en masse
+ConfirmMassDraftDeletion=Confirmation de suppression de brouillon en bloc
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index 247aaaaa36a..aca67bab9c7 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -107,32 +107,32 @@ SubscriptionNotRecorded=Adhésion non enregistrée
 AddSubscription=Créer cotisation
 ShowSubscription=Afficher adhésion
 # Label of email templates
-SendingAnEMailToMember=Sending information email to member
-SendingEmailOnAutoSubscription=Sending email on auto registration
-SendingEmailOnMemberValidation=Sending email on new member validation
-SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
-SendingEmailOnCancelation=Sending email on cancelation
+SendingAnEMailToMember=Envoi d'informations par e-mail à un adhérent
+SendingEmailOnAutoSubscription=Envoi d'email lors de l'auto-inscription
+SendingEmailOnMemberValidation=Envoie d'email à la validation d'un nouvel adhérent
+SendingEmailOnNewSubscription=Envoyer un email sur un nouvel abonnement
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
+SendingEmailOnCancelation=Envoie d'email à l'annulation
 # Topic of email templates
 YourMembershipRequestWasReceived=Votre demande d'adhésion a été reçue.
 YourMembershipWasValidated=Votre adhésion a été enregistrée
-YourSubscriptionWasRecorded=Your new subscription was recorded
+YourSubscriptionWasRecorded=Votre nouvel adhésion a été enregistrée
 SubscriptionReminderEmail=Rappel de cotisation
-YourMembershipWasCanceled=Your membership was canceled
+YourMembershipWasCanceled=Votre adhésion a été annulée
 CardContent=Contenu de votre fiche adhérent
 # Text of email templates
 ThisIsContentOfYourMembershipRequestWasReceived=Nous vous informons que votre demande d'adhésion a bien été reçue. <br> <br>
-ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
-ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
+ThisIsContentOfYourMembershipWasValidated=Nous vous informons que votre adhésion a été validé avec les informations suivantes:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=Nous vous informons que votre nouvelle cotisation a été enregistrée.<br><br>
 ThisIsContentOfSubscriptionReminderEmail=We want to let you know thet your subscription is about to expire. We hope you can make a renewal of it.<br><br>
 ThisIsContentOfYourCard=Ceci est un rappel des informations que nous avons vos concernant. N'hésitez pas à nous contacter en cas d'erreur.<br><br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Sujet de l'email reçu en cas d'auto-inscription d'un invité
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Email reçu en cas d'auto-inscription d'un invité
 DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Modèle Email à utiliser pour envoyer un email à un adhérent sur auto-adhésion de l'adhérent
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Template Email to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Template Email to use to send email remind when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template Email to use to send email to a member on member cancelation
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Template EMail à utiliser pour envoyer un email à un membre sur la validation d'un membre
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Modèle E-mail à utiliser pour envoyer un e-mail à un membre lors de l'enregistrement d'un nouvel abonnement
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Modèle Email à utiliser pour envoyer un e-mail pour rappeler quand l'abonnement est sur le point d'expirer
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Template utilisé pour envoyer un email à un adhérent lors de l'annulation d'adhésion
 DescADHERENT_MAIL_FROM=Email émetteur pour les mails automatiques
 DescADHERENT_ETIQUETTE_TYPE=Format pages étiquettes
 DescADHERENT_ETIQUETTE_TEXT=Texte imprimé sur les planches d'adresses adhérent
@@ -193,6 +193,6 @@ ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produit/Service utilisé pour la ligne de
 NameOrCompany=Nom ou société
 SubscriptionRecorded=Adhésion enregistré
 NoEmailSentToMember=Aucun e-mail envoyé à l'adhérent
-EmailSentToMember=Email sent to member at %s
-SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind)
+EmailSentToMember=Email envoyé à l'adhérent à %s
+SendReminderForExpiredSubscriptionTitle=Envoyer une relance par mail pour les cotisations expirées
+SendReminderForExpiredSubscription=Envoyer un rappel par e-mail aux membres lorsque l'abonnement est sur le point d'expirer (le paramètre est le nombre de jours avant la fin de l'abonnement pour envoyer le rappel)
diff --git a/htdocs/langs/fr_FR/opensurvey.lang b/htdocs/langs/fr_FR/opensurvey.lang
index bd4b51b1d6a..0cf70c90257 100644
--- a/htdocs/langs/fr_FR/opensurvey.lang
+++ b/htdocs/langs/fr_FR/opensurvey.lang
@@ -58,3 +58,4 @@ MoreChoices=Entrez plus de choix pour les votants
 SurveyExpiredInfo=Le sondage a été fermé ou le délai de vote est expiré
 EmailSomeoneVoted=%s a rempli une ligne.\nVous pouvez trouver le sondage via le lien:\n%s
 ShowSurvey=Afficher le sondage
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang
index e36977947d2..8122c893722 100644
--- a/htdocs/langs/fr_FR/orders.lang
+++ b/htdocs/langs/fr_FR/orders.lang
@@ -16,7 +16,7 @@ MakeOrder=Passer commande
 SupplierOrder=Commande fournisseur
 SuppliersOrders=Commandes fournisseurs
 SuppliersOrdersRunning=Commandes fournisseurs en cours
-CustomerOrder=Commande client
+CustomerOrder=Opposition sur compte
 CustomersOrders=Commandes clients
 CustomersOrdersRunning=Commandes clients en cours
 CustomersOrdersAndOrdersLines=Commandes clients et ligne de commandes
@@ -127,7 +127,7 @@ TypeContact_commande_external_SHIPPING=Contact client livraison commande
 TypeContact_commande_external_CUSTOMER=Contact client suivi commande
 TypeContact_order_supplier_internal_SALESREPFOLL=Responsable suivi commande fournisseur
 TypeContact_order_supplier_internal_SHIPPING=Responsable réception commande fournisseur
-TypeContact_order_supplier_external_BILLING=Contact fournisseur facturation commande
+TypeContact_order_supplier_external_BILLING=Contact fournisseur facture
 TypeContact_order_supplier_external_SHIPPING=Contact fournisseur livraison commande
 TypeContact_order_supplier_external_CUSTOMER=Contact fournisseur suivi commande
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constante COMMANDE_SUPPLIER_ADDON non définie
diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
index b39175a16c3..01d768261f9 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__,\nCeci est un mail de test envoyé à __EMAIL__.\
 PredefinedMailTestHtml=__(Hello)__\nCeci est un message de <b>test</b> (le mot test doit être en gras).<br>Les 2 lignes sont séparées par un retour à la ligne.<br><br>__SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nVous trouverez ci-joint la facture __REF__\n\nVoici le lien pour effectuer votre paiement en ligne si elle n'est pas déjà été payée:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nNous souhaitons vous prévenir que la facture __REF__ ne semble pas avoir été payée. Voici donc la facture en pièce jointe, à titre de rappel.\n\nVoici le lien pour effectuer votre paiement en ligne:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nVeuillez trouver, ci-joint, la proposition commerciale __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nVeuillez trouver, ci-joint, une demande de prix avec la référence __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nVeuillez trouver, ci-joint, la commande __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nVeuillez trouver, ci-joint, notre commande __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -233,6 +233,8 @@ PermissionsDelete=Permissions retirées
 YourPasswordMustHaveAtLeastXChars=Votre mot de passe doit avoir au moins <strong> %s </strong> caractères
 YourPasswordHasBeenReset=Votre mot de passe a été réinitialisé avec succès
 ApplicantIpAddress=Adresse IP du demandeur
+SMSSentTo=SMS envoyé à %s
+
 ##### Export #####
 ExportsArea=Espace exports
 AvailableFormats=Formats disponibles
diff --git a/htdocs/langs/fr_FR/productbatch.lang b/htdocs/langs/fr_FR/productbatch.lang
index e9bb86ac121..162af66827c 100644
--- a/htdocs/langs/fr_FR/productbatch.lang
+++ b/htdocs/langs/fr_FR/productbatch.lang
@@ -16,7 +16,7 @@ printEatby=DMD/DLUO: %s
 printSellby=DLC: %s
 printQty=Qté: %d
 AddDispatchBatchLine=Ajouter une ligne pour la répartition par durée de conservation
-WhenProductBatchModuleOnOptionAreForced=Quand le module Lot/Série est activé, le mode incrémentation/décrémentation des stocks est forcé sur le dernier choix et ne peut pas être édité. D'autres options peuvent être définies comme vous le voulez.
+WhenProductBatchModuleOnOptionAreForced=Quand le module Lot/Série est activé, le mode de décrémentation automatique des stocks est forcé sur 'Décrémenter les stocks réel sur validation d'expédition' et le mode d'incrémentation automatique de stocks est forcé sur 'Incrémenter les stocks réels sur ventilation manuels dans les entrepôts' et ne peut pas être édité. Les autres options peuvent être définies comme vous le voulez.
 ProductDoesNotUseBatchSerial=Ce produit n'utilise pas les numéros de lot/série
 ProductLotSetup=Configuration du module lot/série
 ShowCurrentStockOfLot=Afficher le stock actuel pour le couple produit / lot
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index 78cc8cead40..fd797b29524 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Solde
 PurchasedAmount=Montant des achats
 NewPrice=Nouveau prix
 MinPrice=Prix de vente min.
+EditSellingPriceLabel=Modifier le libellé du prix de vente
 CantBeLessThanMinPrice=Le prix de vente ne doit pas être inférieur au minimum pour ce produit (%s HT). Ce message peut aussi être provoqué par une remise trop importante.
 ContractStatusClosed=Clôturé
 ErrorProductAlreadyExists=Un produit avec la référence %s existe déjà.
diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang
index 986bf806d70..de8da715e19 100644
--- a/htdocs/langs/fr_FR/projects.lang
+++ b/htdocs/langs/fr_FR/projects.lang
@@ -77,6 +77,7 @@ Time=Temps
 ListOfTasks=Liste de tâches
 GoToListOfTimeConsumed=Aller à la liste des temps consommés
 GoToListOfTasks=Aller à la liste des tâches
+GoToGanttView=Aller à la vue Gantt
 GanttView=Vue Gantt
 ListProposalsAssociatedProject=Liste des propositions commerciales associées au projet
 ListOrdersAssociatedProject=Liste des commandes clients associées au projet
diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang
index 065e6e28af1..5898f7384e5 100644
--- a/htdocs/langs/fr_FR/stocks.lang
+++ b/htdocs/langs/fr_FR/stocks.lang
@@ -203,3 +203,4 @@ RegulateStock=Réguler le stock
 ListInventory=Liste
 StockSupportServices=La gestion des stock s'applique aussi aux services
 StockSupportServicesDesc=Par défaut, seul les produits/services de type "produit" peuvent bénéficier d'une gestion de stock. En activant ce paramètre, et si le module Services est activé, la gestion de stock pourra être appliquée aux articles de type "service".
+ReceiveProducts=Recevoir produits
diff --git a/htdocs/langs/fr_FR/stripe.lang b/htdocs/langs/fr_FR/stripe.lang
index 24991a94246..ee86210f92d 100644
--- a/htdocs/langs/fr_FR/stripe.lang
+++ b/htdocs/langs/fr_FR/stripe.lang
@@ -35,31 +35,31 @@ NewStripePaymentReceived=Nouveau paiement Stripe reçu
 NewStripePaymentFailed=Nouveau paiement Stripe tenté mais en échec
 STRIPE_TEST_SECRET_KEY=Clé secrète de test 
 STRIPE_TEST_PUBLISHABLE_KEY=Clé plublique de test
-STRIPE_TEST_WEBHOOK_KEY=Webhook test key
+STRIPE_TEST_WEBHOOK_KEY=Clé test des Webhooks
 STRIPE_LIVE_SECRET_KEY=Clé secrète live
 STRIPE_LIVE_PUBLISHABLE_KEY=Clé plublique live
-STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
-ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
+STRIPE_LIVE_WEBHOOK_KEY=Clé live des Webhooks
+ONLINE_PAYMENT_WAREHOUSE=Stock à utiliser pour diminuer le stock lorsque le paiement en ligne est effectué <br> (TODO Quand l'option de réduction de stock est effectuée sur une action sur facture et que le paiement en ligne génère lui-même la facture?)
 StripeLiveEnabled=Mode live activé (sinon mode test/bac a sable)
-StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s (valid), %s (error CVC), %s (expired), %s (charge fails)
+StripeImportPayment=Importer paiements Stripe
+ExampleOfTestCreditCard=Exemple de carte de crédit pour le test: %s (valide), %s (erreur CVC), %s (expiré), %s (paiement en échec)
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect ID client (ca _...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect ID client (ca _...)
-BankAccountForBankTransfer=Bank account for fund payouts
-StripeAccount=Stripe account
-StripeChargeList=List of Stripe charges
-StripeTransactionList=List of Stripe transactions
-StripeCustomerId=Stripe customer id
-StripePaymentModes=Stripe payment modes
-LocalID=Local ID
+BankAccountForBankTransfer=Compte bancaire pour les paiements de fonds
+StripeAccount=Compte Stripe
+StripeChargeList=Liste des paiements Stripe
+StripeTransactionList=Liste des transactions Stripe
+StripeCustomerId=Identifiant client Stripe
+StripePaymentModes=Modes de paiement Stripe
+LocalID=ID local
 StripeID=Stripe ID
-NameOnCard=Name on card
-CardNumber=Card Number
-ExpiryDate=Expiry Date
+NameOnCard=Nom sur la carte
+CardNumber=Numéro de carte
+ExpiryDate=Date d'expiration
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
-CreateCustomerOnStripe=Create customer on Stripe
-CreateCardOnStripe=Create card on Stripe
-ShowInStripe=Show in Stripe
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
+CreateCustomerOnStripe=Créer client sur Stripe
+CreateCardOnStripe=Créer carte sur Stripe
+ShowInStripe=Afficher dans Stripe
diff --git a/htdocs/langs/fr_FR/trips.lang b/htdocs/langs/fr_FR/trips.lang
index 92d6f44dd8d..424cd1a7579 100644
--- a/htdocs/langs/fr_FR/trips.lang
+++ b/htdocs/langs/fr_FR/trips.lang
@@ -21,9 +21,9 @@ ListToApprove=En attente d'approbation
 ExpensesArea=Espace notes de frais
 ClassifyRefunded=Classer 'Remboursé'
 ExpenseReportWaitingForApproval=Une nouvelle note de frais a été soumise pour approbation
-ExpenseReportWaitingForApprovalMessage=Une nouvelle note de frais a été soumis et attend d'être approuvé. <br> - Utilisateur: %s <br> - Période: %s <br> Cliquez ici pour valider: %s
+ExpenseReportWaitingForApprovalMessage=Une nouvelle note de frais a été soumise et attend d'être approuvée. <br> - Utilisateur: %s <br> - Période: %s <br> Cliquez ici pour valider: %s
 ExpenseReportWaitingForReApproval=Une note de frais a été resoumise pour approbation
-ExpenseReportWaitingForReApprovalMessage=Une note de frais a été enregistrée et est en attente à nouveau d'approbation.<br>Le %s, vous avez refusé d'approuver la note de frais pour la raison suivante: %s<br>Une nouvelle version a été soumise et attend d'être approuvé.<br> Utilisateur : %s<br>- Période : %s<br>Cliquez ici pour valider la note de frais %s
+ExpenseReportWaitingForReApprovalMessage=Une note de frais a été enregistrée et est en attente à nouveau d'approbation.<br>Le %s, vous avez refusé d'approuver la note de frais pour la raison suivante: %s<br>Une nouvelle version a été soumise et attend d'être approuvée.<br> Utilisateur : %s<br>- Période : %s<br>Cliquez ici pour valider la note de frais %s
 ExpenseReportApproved=Une note de frais a été approuvée
 ExpenseReportApprovedMessage=La note de frais %s a été approuvée.<br>- Utilisateur : %s<br>- Approuvée par : %s<br>Cliquez ici pour afficher la note de frais %s
 ExpenseReportRefused=Une note de frais a été refusée
diff --git a/htdocs/langs/fr_FR/website.lang b/htdocs/langs/fr_FR/website.lang
index cdcf638b84a..5bb1dde86a0 100644
--- a/htdocs/langs/fr_FR/website.lang
+++ b/htdocs/langs/fr_FR/website.lang
@@ -39,7 +39,7 @@ ViewWebsiteInProduction=Pré-visualiser le site web en utilisant l'URL de la pag
 SetHereVirtualHost=Si vous pouvez créer, sur votre serveur web (Apache, Nginx, ...), un hôte virtuel dédié avec PHP activé et un répertoire racine sur <br> <strong> %s </strong><br> , alors entrez ici le nom de cet hôte virtuel que vous avez créé, de sorte que l'aperçu puisse également être fait en utilisant l'accès direct au serveur Web, et non seulement en utilisant le serveur Dolibarr.
 YouCanAlsoTestWithPHPS=Sur un environnement de développement, vous pouvez préférer tester le site avec le serveur web PHP intégré (PHP 5.5 requis) en exécutant <br><strong> php -S 0.0.0.0:8080 -t %s </strong>
 CheckVirtualHostPerms=Vérifiez également que le virtual host a la permission <strong> %s </strong> sur les fichiers dans <strong> %s </strong>
-ReadPerm=Lu
+ReadPerm=Lire
 WritePerm=Écrire
 PreviewSiteServedByWebServer=<u>Prévisualiser %s dans un nouvel onglet.</u><br><br>. Le %s sera servi par un serveur web externe (comme Apache, Nginx, IIS). Vous pouvez installer et configurer ce serveur auparavant pour pointer sur le répertoire : <br><strong>%s</strong><br> URL servie par un serveur externe: <br><strong>%s</strong>
 PreviewSiteServedByDolibarr=<u>Aperçu %s dans un nouvel onglet.</u><br><br>Le %s sera servi par le serveur Dolibarr donc aucun serveur Web supplémentaire (comme Apache, Nginx, IIS) n'est nécessaire.<br>L'inconvénient est que l'URL des pages ne sont pas sexy et commencent par un chemin de votre Dolibarr.<br>URL servie par Dolibarr:<br><strong>%s</strong><br><br>Pour utiliser votre propre serveur web externe pour servir ce site web, créez un virtual host sur vote serveur web qui pointe sur le répertoire<br><strong>%s</strong><br> ensuite entrez le nom de ce virtual host et cliquer sur le bouton d'affichage de l'aperçu.
@@ -73,7 +73,7 @@ AnotherContainer=Un autre conteneur
 WEBSITE_USE_WEBSITE_ACCOUNTS=Activer la table des comptes du site Web
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Activer la table pour stocker les comptes de site Web (login/pass) pour chaque site / tiers
 YouMustDefineTheHomePage=Vous devez d'abord définir la page d'accueil par défaut
-OnlyEditionOfSourceForGrabbedContentFuture=Note: seule l'édition de source HTML sera possible lorsqu'un contenu de page est initiliasé par aspiration d'une page externe (l'éditeur de WYSIWYG ne sera pas disponible)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: seule l'édition de source HTML sera possible lorsqu'un contenu de page est initiliasé par aspiration d'une page externe (l'éditeur WYSIWYG ne sera pas disponible)
 OnlyEditionOfSourceForGrabbedContent=Seule l'édition de source HTML est possible lorsque le contenu a été aspiré depuis un site externe
 GrabImagesInto=Aspirer aussi les images trouvées dans les css et la page.
 ImagesShouldBeSavedInto=Les images doivent être sauvegardées dans le répertoire
diff --git a/htdocs/langs/he_IL/accountancy.lang b/htdocs/langs/he_IL/accountancy.lang
index c37db78c215..daa15928096 100644
--- a/htdocs/langs/he_IL/accountancy.lang
+++ b/htdocs/langs/he_IL/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Accounting
 ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
 ACCOUNTING_EXPORT_DATE=Date format for export file
 ACCOUNTING_EXPORT_PIECE=Export the number of piece
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Accounts with non zero values
 ListOfAccounts=List of accounts
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers 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
 
-AccountancyArea=Accountancy area
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
 AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
@@ -89,7 +90,7 @@ MenuProductsAccounts=Product accounts
 ProductsBinding=Products accounts
 Ventilation=Binding to accounts
 CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Supplier invoice binding
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
 ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
@@ -185,11 +187,12 @@ ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
-DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Group of account
 Pcgsubtype=Subgroup of account
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
 ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
 DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report 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 fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -293,4 +296,9 @@ Binded=Lines bound
 ToBind=Lines to bind
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang
index d896b96efb5..1ffb6e16da3 100644
--- a/htdocs/langs/he_IL/admin.lang
+++ b/htdocs/langs/he_IL/admin.lang
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=SMTP / SMTPS מארח (כברירת מחדל ב php.ini: <
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP / SMTPS נמל (לא מוגדר לתוך PHP על מערכות יוניקס כמו)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPS מארח (לא מוגדר לתוך PHP על מערכות יוניקס כמו)
 MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= שלח שיטתי מוסתר פחמן עותק של כל הודעות הדוא&quot;ל שנשלחו
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=שיטה להשתמש כדי לשלוח מיילים
 MAIN_MAIL_SMTPS_ID=SMTP מזהה אם נדרש אימות
 MAIN_MAIL_SMTPS_PW=SMTP סיסמא אם נדרש אימות
@@ -291,7 +292,7 @@ ModuleSetup=מודול ההתקנה
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=מערכת
 ModuleFamilyCrm=קשרי לקוחות (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=פרויקטים / עבודה שיתופית
@@ -373,7 +374,8 @@ NoSmsEngine=לא מנהל השולח SMS זמין. מנהל SMS השולח אי
 PDF=PDF
 PDFDesc=אתה יכול להגדיר כל אפשרויות גלובליות הקשורות לדור PDF
 PDFAddressForging=חוקי לזייף תיבות כתובת
-HideAnyVATInformationOnPDF=הסתר כל מידע הקשור מע&quot;מ על PDF שנוצר
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=Hide products description on generated PDF
@@ -445,7 +447,8 @@ DisplayCompanyInfo=Display company address
 DisplayCompanyManagers=Display manager names
 DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party 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.
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Set this to 1 if you want to attach main document to emai
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=משתמשים להקות
 Module0Desc=Users / Employees and Groups management
@@ -479,7 +485,7 @@ Module1Desc=חברות ניהול של איש הקשר
 Module2Name=מסחרי
 Module2Desc=מסחרי וניהול
 Module10Name=חשבונאות
-Module10Desc=חשבונאות וניהול פשוט (חשבונית ותשלום שיגור)
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=הצעות
 Module20Desc=ההצעה המסחרית של ההנהלה
 Module22Name=Mass E-דיוור
@@ -546,8 +552,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=לוח השנה
 Module410Desc=שילוב לוח השנה
-Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Payment of employee wages
 Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
@@ -561,14 +567,14 @@ Module700Name=תרומות
 Module700Desc=התרומה של ההנהלה
 Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=גמל שלמה
 Module1200Desc=גמל שלמה אינטגרציה
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
 Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=עורך WYSIWYG
 Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
 Module2200Name=Dynamic Prices
@@ -576,7 +582,7 @@ Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Scheduled jobs
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API/Web services (SOAP server)
@@ -613,7 +619,7 @@ Module50100Desc=Point of sales module (POS).
 Module50200Name=Paypal
 Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Poll, Survey or Vote
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=עיכוב סובלנות (בימים) לפני התר
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=עיכוב סובלנות (בימים) לפני התראה על הפקדת המחאות לעשות
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=ערכים אחרים לנהל את התפריט פרמטרים אופציונליים.
 LogEvents=ביקורת אבטחה אירועים
 Audit=ביקורת
@@ -1054,8 +1060,9 @@ LogEventDesc=ניתן להפעיל כאן בכניסה לאירועים Dolibarr
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=מערכת מידע הוא מידע טכני שונות נכנסת למצב קריאה בלבד ונראה לעין עבור מנהלי בלבד.
 SystemAreaForAdminOnly=אזור זה זמין עבור המשתמשים מנהל בלבד. אף אחד הרשאות Dolibarr יכול להפחית את המגבלה.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=אתה יכול לבחור בכל פרמטר הקשור מבט Dolibarr ולהרגיש כאן
 AvailableModules=Available app/modules
 ToActivateModule=כדי להפעיל מודולים, ללכת על שטח ההתקנה (ראשי-> התקנה-> Modules).
@@ -1188,11 +1195,11 @@ UserMailRequired=דוא&quot;ל נדרש ליצור משתמש חדש
 HRMSetup=HRM module setup
 ##### Company setup #####
 CompanySetup=חברות מודול ההתקנה
-CompanyCodeChecker=מודול לדור הצדדים 3 קוד ובדיקת (הלקוח או הספק)
-AccountCodeManager=Module for accounting code generation (customer or supplier)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
 NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
 ModelModules=תבניות מסמכים
 DocumentModelOdt=צור מסמכים מתבניות OpenDocuments (. ODT קבצים של אופן אופיס, KOffice, TextEdit, ...)
@@ -1203,6 +1210,9 @@ MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
 TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=הקישור ייצוא לפורמט <b>%s</b> זמין בקישור הבא: %s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=טקסט חופשי על הצעות מסחריות
 WatermarkOnDraftProposal=סימן מים על הצעות טיוטה מסחריים (כל אם ריק)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
 ##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=התקנה וניהול של סדר
 OrdersNumberingModules=הזמנות מספור מודולים
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=חיבור &quot;%s של שרת&quot; %s &quot;מסד נתונ
 OSCommerceTestKo1=חיבור &quot;%s&quot; שרת להצליח אבל &quot;%s&quot; מסד נתונים לא ניתן היה להשיג.
 OSCommerceTestKo2=חיבור &quot;%s של שרת עם&quot; %s &quot;המשתמש נכשל.
 ##### Stock #####
-StockSetup=Warehouse module setup
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
 ##### Menu #####
 MenuDeleted=תפריט נמחק
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
 MultiCompanySetup=רב החברה מודול ההתקנה
 ##### Suppliers #####
 SuppliersSetup=מודול הספק ההתקנה
-SuppliersCommandModel=תבנית שלמה של הסדר הספק (logo. ..)
-SuppliersInvoiceModel=תבנית שלמה של חשבונית הספק (logo. ..)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","
 SalariesSetup=Setup of module salaries
 SortOrder=Sort order
 Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Install of external module from applic
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
-TextTitleColor=Color of page title
+TextTitleColor=Text color of Page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=Background color for Top menu
 TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
 ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-MailToMember=To send email from member page
-MailToUser=To send email from user page
-MailToProject= To send email from project page
+MailToSendProposal=Customer proposals
+MailToSendOrder=Customer orders
+MailToSendInvoice=Customer invoices
+MailToSendShipment=משלוחים
+MailToSendIntervention=התערבויות
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=חוזים
+MailToThirdparty=צדדים שלישיים
+MailToMember=משתמשים
+MailToUser=משתמשים
+MailToProject=Projects page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1780,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/he_IL/bills.lang b/htdocs/langs/he_IL/bills.lang
index e9cbd8488b9..ca06b1106a3 100644
--- a/htdocs/langs/he_IL/bills.lang
+++ b/htdocs/langs/he_IL/bills.lang
@@ -109,7 +109,7 @@ CancelBill=Cancel an invoice
 SendRemindByMail=Send reminder by EMail
 DoPayment=Enter payment
 DoPaymentBack=Enter refund
-ConvertToReduc=Convert into future discount
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
@@ -120,7 +120,7 @@ BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
 BillStatusPaid=Paid
-BillStatusPaidBackOrConverted=Credit note refund or converted into discount
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Abandoned
 BillStatusValidated=Validated (needs to be paid)
@@ -296,10 +296,10 @@ DiscountType=Discount type
 NoteReason=Note/Reason
 ReasonDiscount=Reason
 DiscountOfferedBy=Granted by
-DiscountStillRemaining=Discounts available
-DiscountAlreadyCounted=Discounts already consumed
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+SupplierDiscounts=Vendors discounts
 BillAddress=Bill address
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Every %s days
 FrequencyPer_m=Every %s months
 FrequencyPer_y=Every %s years
@@ -505,9 +511,14 @@ SituationAmount=Situation invoice amount(net)
 SituationDeduction=Situation subtraction
 ModifyAllLines=Modify all lines
 CreateNextSituationInvoice=Create next situation
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=S
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
 NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
@@ -532,3 +543,4 @@ AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/he_IL/categories.lang b/htdocs/langs/he_IL/categories.lang
index 794e5f2c486..c8b8e5e4641 100644
--- a/htdocs/langs/he_IL/categories.lang
+++ b/htdocs/langs/he_IL/categories.lang
@@ -16,7 +16,7 @@ MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
-SubCats=Subcategories
+SubCats=Sub-categories
 CatList=List of tags/categories
 NewCategory=New tag/category
 ModifCat=Modify tag/category
@@ -85,3 +85,4 @@ CategorieRecursivHelp=If activated, product will also linked to parent category
 AddProductServiceIntoCategory=Add the following product/service
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
+ChooseCategory=Choose category
diff --git a/htdocs/langs/he_IL/commercial.lang b/htdocs/langs/he_IL/commercial.lang
index d747881f689..3aa0aaa392c 100644
--- a/htdocs/langs/he_IL/commercial.lang
+++ b/htdocs/langs/he_IL/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=Close
 ActionAC_EMAILING=Send mass email
 ActionAC_COM=Send customer order by mail
 ActionAC_SHIP=Send shipping by mail
-ActionAC_SUP_ORD=Send supplier order by mail
-ActionAC_SUP_INV=Send supplier invoice by mail
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=אחר
 ActionAC_OTH_AUTO=Automatically inserted events
 ActionAC_MANUAL=Manually inserted events
diff --git a/htdocs/langs/he_IL/companies.lang b/htdocs/langs/he_IL/companies.lang
index 8cceada84d2..36ab3b01faf 100644
--- a/htdocs/langs/he_IL/companies.lang
+++ b/htdocs/langs/he_IL/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Are you sure you want to delete this contact and all inheri
 MenuNewThirdParty=New third party
 MenuNewCustomer=New customer
 MenuNewProspect=New prospect
-MenuNewSupplier=New supplier
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=New private individual
-NewCompany=New company (prospect, customer, supplier)
-NewThirdParty=New third party (prospect, customer, supplier)
-CreateDolibarrThirdPartySupplier=Create a third party (supplier)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=Create third party
 CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Prospection area
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=לקוחות פוטנציאלים
 ThirdPartyCustomers=לקוחות
 ThirdPartyCustomersStats=לקוחות
 ThirdPartyCustomersWithIdProf12=Customers with %s or %s
-ThirdPartySuppliers=ספקים
+ThirdPartySuppliers=Vendors
 ThirdPartyType=Third party type
 Individual=Private individual
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
@@ -77,11 +77,11 @@ Web=Web
 Poste= Position
 DefaultLang=Language by default
 VATIsUsed=Sales tax is used
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
-ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=הצעות
 OverAllOrders=Orders
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=RE Type
 TypeLocaltax2ES=IRPF Type
 WrongCustomerCode=Customer code invalid
-WrongSupplierCode=Supplier code invalid
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Customer code model
-SupplierCodeModel=Supplier code model
+SupplierCodeModel=Vendor code model
 Gencod=Bar code
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
@@ -267,7 +267,7 @@ Prospect=לקוח פוטנציאל
 CustomerCard=Customer Card
 Customer=לקוח
 CustomerRelativeDiscount=Relative customer discount
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=Relative discount
 CustomerAbsoluteDiscountShort=Absolute discount
 CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this suppl
 CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
 CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
 CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=None
 Supplier=Supplier
 AddContact=Create contact
@@ -304,13 +304,13 @@ DeleteACompany=Delete a company
 PersonalInformations=Personal data
 AccountancyCode=Accounting account
 CustomerCode=Customer code
-SupplierCode=Supplier code
+SupplierCode=Vendor code
 CustomerCodeShort=Customer code
-SupplierCodeShort=Supplier code
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=Customer code, unique for all customers
-SupplierCodeDesc=Supplier code, unique for all suppliers
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=Required if third party is a customer or prospect
-RequiredIfSupplier=Required if third party is a supplier
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=Validity controled by module
 ThisIsModuleRules=This is rules for this module
 ProspectToContact=Prospect to contact
@@ -338,7 +338,7 @@ MyContacts=My contacts
 Capital=Capital
 CapitalOf=Capital of %s
 EditCompany=Edit company
-ThisUserIsNot=This user is not a prospect, customer nor supplier
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=Check
 VATIntraCheckDesc=The link <b>%s</b> allows to ask the european VAT checker service. An external internet access from server is required for this service to work.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -396,7 +396,7 @@ ImportDataset_company_4=Third parties/Sales representatives (Assign sales repres
 PriceLevel=Price level
 DeliveryAddress=Delivery address
 AddAddress=Add address
-SupplierCategory=Supplier category
+SupplierCategory=Vendor category
 JuridicalStatus200=Independent
 DeleteFile=Delete file
 ConfirmDeleteFile=Are you sure you want to delete this file?
@@ -406,7 +406,7 @@ FiscalYearInformation=Information on the fiscal year
 FiscalMonthStart=Starting month of the fiscal year
 YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
 YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
-ListSuppliersShort=List of suppliers
+ListSuppliersShort=List of vendors
 ListProspectsShort=רשימת לקוחות פוטנציאלים
 ListCustomersShort=רשימת לקוחות
 ThirdPartiesArea=Third parties and contact area
@@ -420,7 +420,7 @@ CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/he_IL/compta.lang b/htdocs/langs/he_IL/compta.lang
index eaac9f843df..959d0bd94f7 100644
--- a/htdocs/langs/he_IL/compta.lang
+++ b/htdocs/langs/he_IL/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=Net paid
 VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
-VATSummary=Tax Balance
+VATSummary=Tax monthly
+VATBalance=Tax Balance
 VATPaid=Tax paid
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=Accountancy/Treasury area
 NewPayment=New payment
 Payments=Payments
 PaymentCustomerInvoice=Customer invoice payment
-PaymentSupplierInvoice=Supplier invoice payment
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
-ListOfSupplierPayments=List of supplier payments
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -110,7 +111,7 @@ ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
 CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
 SupplierAccountancyCodeShort=Sup. account. code
 AccountNumber=Account number
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
 Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
-ByProductsAndServices=By products and services
+ByProductsAndServices=By product and service
 RefExt=External ref
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
 LinkedOrder=Link to order
@@ -215,7 +218,8 @@ Mode1=Method 1
 Mode2=Method 2
 CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
 CalculationRuleDescSupplier=According to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
@@ -242,3 +246,10 @@ FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/he_IL/dict.lang b/htdocs/langs/he_IL/dict.lang
index ca0c61a9cbc..61a7237f472 100644
--- a/htdocs/langs/he_IL/dict.lang
+++ b/htdocs/langs/he_IL/dict.lang
@@ -5,7 +5,8 @@ CountryIT=Italy
 CountryES=Spain
 CountryDE=Germany
 CountryCH=Switzerland
-CountryGB=Great Britain
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=United Kingdom
 CountryUK=United Kingdom
 CountryIE=Ireland
 CountryCN=China
diff --git a/htdocs/langs/he_IL/ecm.lang b/htdocs/langs/he_IL/ecm.lang
index b20ab40de73..76271d76df0 100644
--- a/htdocs/langs/he_IL/ecm.lang
+++ b/htdocs/langs/he_IL/ecm.lang
@@ -39,9 +39,10 @@ ShowECMSection=Show directory
 DeleteSection=Remove directory
 ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
 ECMDirectoryForFiles=Relative directory for files
-CannotRemoveDirectoryContainsFiles=Removed not possible because it contains some files
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=File manager
-ECMSelectASection=Select a directory on left tree...
+ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
diff --git a/htdocs/langs/he_IL/errors.lang b/htdocs/langs/he_IL/errors.lang
index ec036b28bc5..0ca7488b8cb 100644
--- a/htdocs/langs/he_IL/errors.lang
+++ b/htdocs/langs/he_IL/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Bar code required
 ErrorCustomerCodeAlreadyUsed=Customer code already used
 ErrorBarCodeAlreadyUsed=Bar code already used
 ErrorPrefixRequired=Prefix required
-ErrorBadSupplierCodeSyntax=Bad syntax for supplier code
-ErrorSupplierCodeRequired=Supplier code required
-ErrorSupplierCodeAlreadyUsed=Supplier code already used
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Bad parameters
 ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
 ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
@@ -87,7 +87,7 @@ ErrorsOnXLines=Errors on <b>%s</b> source record(s)
 ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
 ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s"
 ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
-ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Error on mask
 ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
-ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
diff --git a/htdocs/langs/he_IL/install.lang b/htdocs/langs/he_IL/install.lang
index e2f9a806269..15f29a52ddd 100644
--- a/htdocs/langs/he_IL/install.lang
+++ b/htdocs/langs/he_IL/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not
 ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
 ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be granted to be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reload all information from configuration file.
 PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
 WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called <b>install.lock</b> into Dolibarr document directory, in order to avoid malicious use of it.
 FunctionNotAvailableInThisPHP=Not available on this PHP
 ChoosedMigrateScript=Choose migration script
-DataMigration=Data migration
-DatabaseMigration=Structure database migration
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script processing
 ChooseYourSetupMode=Choose your setup mode and click "Start"...
 FreshInstall=Fresh install
@@ -146,7 +147,7 @@ NothingToDo=Nothing to do
 # upgrade
 MigrationFixData=Fix for denormalized data
 MigrationOrder=Data migration for customer's orders
-MigrationSupplierOrder=Data migration for supplier's orders
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Data migration for commercial proposals
 MigrationInvoice=Data migration for customer's invoices
 MigrationContract=Data migration for contracts
@@ -196,6 +197,8 @@ MigrationEvents=Migration of events to add event owner into assignement table
 MigrationEventsContact=Migration of events to add event contact into assignement table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 ShowNotAvailableOptions=Show not available options
diff --git a/htdocs/langs/he_IL/ldap.lang b/htdocs/langs/he_IL/ldap.lang
index d6360f3e540..abe11602147 100644
--- a/htdocs/langs/he_IL/ldap.lang
+++ b/htdocs/langs/he_IL/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Password for domain
 YouMustChangePassNextLogon=Password for user <b>%s</b> on the domain <b>%s</b> must be changed.
 UserMustChangePassNextLogon=User must change password on the domain %s
 LDAPInformationsForThisContact=Information in LDAP database for this contact
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Member type synchronized
 ContactSynchronized=Contact synchronized
 ForceSynchronize=Force synchronizing Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Failed to read LDAP database. Check LDAP module setup and database accessibility.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/he_IL/loan.lang b/htdocs/langs/he_IL/loan.lang
index 9aae3869cc3..534dee08867 100644
--- a/htdocs/langs/he_IL/loan.lang
+++ b/htdocs/langs/he_IL/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=Capital
 Insurance=Insurance
 Interest=Interest
 Nbterms=Number of terms
+Term=Term
 LoanAccountancyCapitalCode=Accounting account capital
 LoanAccountancyInsuranceCode=Accounting account insurance
 LoanAccountancyInterestCode=Accounting account interest
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=Confirm deleting this loan
 LoanDeleted=Loan Deleted Successfully
 ConfirmPayLoan=Confirm classify paid this loan
 LoanPaid=Loan Paid
-# Calc
-LoanCalc=Bank Loans Calculator
-PurchaseFinanceInfo=Purchase & Financing Information
-SalePriceOfAsset=Sale Price of Asset
-PercentageDown=Percentage Down
-LengthOfMortgage=Duration of loan
-AnnualInterestRate=Annual Interest Rate
-ExplainCalculations=Explain Calculations
-ShowMeCalculationsAndAmortization=Show me the calculations and amortization
-MortgagePaymentInformation=Mortgage Payment Information
-DownPayment=Down Payment
-DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
-InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
-MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
-MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
-MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
-MonthlyPaymentDesc=The montly payment is figured out using the following formula
-AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
-AmountFinanced=Amount Financed
-AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
-Totalsforyear=Totals for year
-MonthlyPayment=Monthly Payment
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
-GoToInterest=%s will go towards INTEREST
-GoToPrincipal=%s will go towards PRINCIPAL
-YouWillSpend=You will spend %s in year %s
 ListLoanAssociatedProject=List of loan associated with the project
 AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Interest
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-FinancialCommitment=Financial commitment
 CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/langs/he_IL/mails.lang b/htdocs/langs/he_IL/mails.lang
index 8b7dc0a80dd..5ebee439f47 100644
--- a/htdocs/langs/he_IL/mails.lang
+++ b/htdocs/langs/he_IL/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Sender
 MailErrorsTo=Errors to
 MailReply=Reply to
 MailTo=Receiver(s)
+MailToUsers=To user(s)
 MailCC=Copy to
+MailToCCUsers=Copy to users(s)
 MailCCC=Cached copy to
 MailTopic=EMail topic
 MailText=Message
@@ -164,4 +166,4 @@ InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/he_IL/main.lang b/htdocs/langs/he_IL/main.lang
index 16f15894aaa..61229fca58e 100644
--- a/htdocs/langs/he_IL/main.lang
+++ b/htdocs/langs/he_IL/main.lang
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is se
 Administrator=Administrator
 Undefined=Undefined
 PasswordForgotten=Password forgotten?
+NoAccount=No account?
 SeeAbove=See above
 HomeArea=Home area
 LastConnexion=Latest connection
@@ -231,7 +232,7 @@ Limit=Limit
 Limits=Limits
 Logout=Logout
 NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Connection
+Connection=Login
 Setup=הגדרת
 Alert=Alert
 MenuWarnings=התראות
@@ -402,6 +403,7 @@ DefaultTaxRate=Default tax rate
 Average=Average
 Sum=Sum
 Delta=Delta
+RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
@@ -414,7 +416,7 @@ Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
 ExternalRef=Ref. extern
-RefSupplier=Ref. supplier
+RefSupplier=Ref. vendor
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
 Comment=Comment
@@ -493,7 +495,7 @@ Received=Received
 Paid=Paid
 Topic=Subject
 ByCompanies=By third parties
-ByUsers=By users
+ByUsers=By user
 Links=Links
 Link=קשר
 Rejects=Rejects
@@ -619,9 +621,9 @@ BuildDoc=Build Doc
 Entity=Environment
 Entities=Entities
 CustomerPreview=Customer preview
-SupplierPreview=Supplier preview
+SupplierPreview=Vendor preview
 ShowCustomerPreview=Show customer preview
-ShowSupplierPreview=Show supplier preview
+ShowSupplierPreview=Show vendor preview
 RefCustomer=Ref. customer
 Currency=Currency
 InfoAdmin=Information for administrators
@@ -679,7 +681,7 @@ Color=Color
 Documents=Linked files
 Documents2=Documents
 UploadDisabled=Upload disabled
-MenuAccountancy=Accountancy
+MenuAccountancy=Accounting
 MenuECM=Documents
 MenuAWStats=AWStats
 MenuMembers=משתמשים
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=Products or services
 SearchIntoProjects=פרוייקטים
 SearchIntoTasks=Tasks
 SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=התערבויות
 SearchIntoContracts=חוזים
 SearchIntoCustomerShipments=Customer shipments
@@ -941,3 +943,5 @@ Remote=Remote
 LocalAndRemote=Local and Remote
 KeyboardShortcut=Keyboard shortcut
 AssignedTo=Assigned to
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/he_IL/margins.lang b/htdocs/langs/he_IL/margins.lang
index 9f590ef3718..b9d52dcfdc6 100644
--- a/htdocs/langs/he_IL/margins.lang
+++ b/htdocs/langs/he_IL/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=As a service
 UseDiscountOnTotal=On subtotal
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
 MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best supplier price
+MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Cost price
 UnitCharges=Unit charges
 Charges=Charges
diff --git a/htdocs/langs/he_IL/members.lang b/htdocs/langs/he_IL/members.lang
index 950a254ee12..5f06c51746e 100644
--- a/htdocs/langs/he_IL/members.lang
+++ b/htdocs/langs/he_IL/members.lang
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
diff --git a/htdocs/langs/he_IL/opensurvey.lang b/htdocs/langs/he_IL/opensurvey.lang
index 87e6a74913a..76684955e56 100644
--- a/htdocs/langs/he_IL/opensurvey.lang
+++ b/htdocs/langs/he_IL/opensurvey.lang
@@ -58,3 +58,4 @@ MoreChoices=Enter more choices for the voters
 SurveyExpiredInfo=The poll has been closed or voting delay has expired.
 EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
 ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/he_IL/orders.lang b/htdocs/langs/he_IL/orders.lang
index 39f81037030..cd386f70174 100644
--- a/htdocs/langs/he_IL/orders.lang
+++ b/htdocs/langs/he_IL/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Customers orders area
-SuppliersOrdersArea=Suppliers orders area
+SuppliersOrdersArea=Purchase orders area
 OrderCard=Order card
 OrderId=Order Id
 Order=סדר
@@ -13,18 +13,18 @@ OrderToProcess=Order to process
 NewOrder=New order
 ToOrder=Make order
 MakeOrder=Make order
-SupplierOrder=Supplier order
-SuppliersOrders=Suppliers orders
-SuppliersOrdersRunning=Current suppliers orders
-CustomerOrder=Customer order
-CustomersOrders=Customer orders
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=Customer Order
+CustomersOrders=הזמנות של לקוחות
 CustomersOrdersRunning=Current customer orders
 CustomersOrdersAndOrdersLines=Customer orders and order lines
 OrdersDeliveredToBill=Customer orders delivered to bill
 OrdersToBill=Customer orders delivered
 OrdersInProcess=Customer orders in process
 OrdersToProcess=Customer orders to process
-SuppliersOrdersToProcess=Supplier orders to process
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=Canceled
 StatusOrderDraftShort=Draft
 StatusOrderValidatedShort=Validated
@@ -75,15 +75,15 @@ ShowOrder=Show order
 OrdersOpened=Orders to process
 NoDraftOrders=No draft orders
 NoOrder=No order
-NoSupplierOrder=No supplier order
+NoSupplierOrder=No purchase order
 LastOrders=Latest %s customer orders
 LastCustomerOrders=Latest %s customer orders
-LastSupplierOrders=Latest %s supplier orders
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=Latest %s modified orders
 AllOrders=All orders
 NbOfOrders=Number of orders
 OrdersStatistics=Order's statistics
-OrdersStatisticsSuppliers=Supplier order's statistics
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Number of orders by month
 AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
 ListOfOrders=List of orders
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</
 GenerateBill=Generate invoice
 ClassifyShipped=Classify delivered
 DraftOrders=Draft orders
-DraftSuppliersOrders=Draft suppliers orders
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=In process orders
 RefOrder=Ref. order
 RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for supplier
-RefOrderSupplierShort=Ref. order supplier
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=Send order by mail
 ActionsOnOrder=Events on order
 NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
 DispatchSupplierOrder=Receiving supplier order %s
 FirstApprovalAlreadyDone=First approval already done
 SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=Supplier order %s received %s
-SupplierOrderSubmitedInDolibarr=Supplier order %s submited
-SupplierOrderClassifiedBilled=Supplier order %s set billed
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Other orders
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
@@ -125,11 +125,11 @@ TypeContact_commande_internal_SHIPPING=Representative following-up shipping
 TypeContact_commande_external_BILLING=Customer invoice contact
 TypeContact_commande_external_SHIPPING=Customer shipping contact
 TypeContact_commande_external_CUSTOMER=Customer contact following-up order
-TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
-TypeContact_order_supplier_external_BILLING=Supplier invoice contact
-TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact
-TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
 Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
 Error_OrderNotChecked=No orders to invoice selected
diff --git a/htdocs/langs/he_IL/other.lang b/htdocs/langs/he_IL/other.lang
index a4a24bd15c4..e09d8d94700 100644
--- a/htdocs/langs/he_IL/other.lang
+++ b/htdocs/langs/he_IL/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=Files is too big
 PleaseBePatient=Please be patient...
 NewPassword=New password
 ResetPassword=Reset password
-RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
@@ -233,6 +233,8 @@ PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=Exports area
 AvailableFormats=Available formats
diff --git a/htdocs/langs/he_IL/productbatch.lang b/htdocs/langs/he_IL/productbatch.lang
index 653c08dc98e..88effdec06a 100644
--- a/htdocs/langs/he_IL/productbatch.lang
+++ b/htdocs/langs/he_IL/productbatch.lang
@@ -16,7 +16,7 @@ printEatby=Eat-by: %s
 printSellby=Sell-by: %s
 printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic increase/decrease stock mode is forced to shipping validate and manual dispatching for reception and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
 ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
diff --git a/htdocs/langs/he_IL/products.lang b/htdocs/langs/he_IL/products.lang
index c1d70eac85d..55eb051bc8a 100644
--- a/htdocs/langs/he_IL/products.lang
+++ b/htdocs/langs/he_IL/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
 MinPrice=Min. selling price
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
 ContractStatusClosed=Closed
 ErrorProductAlreadyExists=A product with reference %s already exists.
@@ -155,7 +156,7 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Supplier prices
 SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
-CustomCode=Customs/Commodity/HS code
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
 Nature=Nature
 ShortLabel=Short label
diff --git a/htdocs/langs/he_IL/projects.lang b/htdocs/langs/he_IL/projects.lang
index 0546fbe0642..7ec44dba97f 100644
--- a/htdocs/langs/he_IL/projects.lang
+++ b/htdocs/langs/he_IL/projects.lang
@@ -77,6 +77,7 @@ Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer orders associated with the project
@@ -226,4 +227,4 @@ AllowCommentOnProject=Allow user comments on projects
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/he_IL/stocks.lang b/htdocs/langs/he_IL/stocks.lang
index fc48523ce6a..ab2cff1d9bb 100644
--- a/htdocs/langs/he_IL/stocks.lang
+++ b/htdocs/langs/he_IL/stocks.lang
@@ -203,3 +203,4 @@ RegulateStock=Regulate Stock
 ListInventory=List
 StockSupportServices=Stock management support services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/he_IL/stripe.lang b/htdocs/langs/he_IL/stripe.lang
index 9fb2fa45113..6fa072b4c9a 100644
--- a/htdocs/langs/he_IL/stripe.lang
+++ b/htdocs/langs/he_IL/stripe.lang
@@ -58,8 +58,8 @@ NameOnCard=Name on card
 CardNumber=Card Number
 ExpiryDate=Expiry Date
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/he_IL/supplier_proposal.lang b/htdocs/langs/he_IL/supplier_proposal.lang
index d5b51978920..ef2e7242e31 100644
--- a/htdocs/langs/he_IL/supplier_proposal.lang
+++ b/htdocs/langs/he_IL/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Supplier commercial proposals
-supplier_proposalDESC=Manage price requests to suppliers
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
 SupplierProposalNew=New price request
 CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
-SupplierProposalsDraft=Draft supplier proposals
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=Latest %s modified price requests
 RequestsOpened=Open price requests
-SupplierProposalArea=Supplier proposals area
-SupplierProposalShort=Supplier proposal
-SupplierProposals=Supplier proposals
-SupplierProposalsShort=Supplier proposals
+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=Supplier ref
+SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=Delivery date
 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>?
@@ -47,9 +47,9 @@ CommercialAsk=Price request
 DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposals=List of supplier proposal requests
-ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
-SupplierProposalsToClose=Supplier proposals to close
-SupplierProposalsToProcess=Supplier proposals to process
+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
diff --git a/htdocs/langs/he_IL/suppliers.lang b/htdocs/langs/he_IL/suppliers.lang
index 24ae15ba58f..d0cf540d3eb 100644
--- a/htdocs/langs/he_IL/suppliers.lang
+++ b/htdocs/langs/he_IL/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=ספקים
-SuppliersInvoice=Suppliers invoice
-ShowSupplierInvoice=Show Supplier Invoice
-NewSupplier=New supplier
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=History
-ListOfSuppliers=List of suppliers
-ShowSupplier=Show supplier
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=Order date
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
-SupplierPrices=Supplier prices
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
-NoRecordedSuppliers=No suppliers recorded
-SupplierPayment=Supplier payment
-SuppliersArea=Suppliers area
-RefSupplierShort=Ref. supplier
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=Availability
-ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
-ExportDataset_fournisseur_2=Supplier invoices and payments
-ExportDataset_fournisseur_3=Supplier orders and order lines
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=Approve this order
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
 ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
 ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
-AddSupplierOrder=Create supplier order
-AddSupplierInvoice=Create supplier invoice
-ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
-SentToSuppliers=Sent to suppliers
-ListOfSupplierOrders=List of supplier orders
-MenuOrdersSupplierToBill=Supplier orders to invoice
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-SupplierReputation=Supplier reputation
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
 AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=Supplier prices
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/he_IL/website.lang b/htdocs/langs/he_IL/website.lang
index 0350da13f8f..0f0673e3716 100644
--- a/htdocs/langs/he_IL/website.lang
+++ b/htdocs/langs/he_IL/website.lang
@@ -73,7 +73,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
diff --git a/htdocs/langs/he_IL/workflow.lang b/htdocs/langs/he_IL/workflow.lang
index a50bd91595b..783373ad66d 100644
--- a/htdocs/langs/he_IL/workflow.lang
+++ b/htdocs/langs/he_IL/workflow.lang
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source custome
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/hr_HR/accountancy.lang b/htdocs/langs/hr_HR/accountancy.lang
index 87b7fc3b839..7ccb28a5b0d 100644
--- a/htdocs/langs/hr_HR/accountancy.lang
+++ b/htdocs/langs/hr_HR/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Računovodstvo
 ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
 ACCOUNTING_EXPORT_DATE=Date format for export file
 ACCOUNTING_EXPORT_PIECE=Export the number of piece
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Accounts with non zero values
 ListOfAccounts=List of accounts
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers 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
 
-AccountancyArea=Accountancy area
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
 AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
@@ -89,7 +90,7 @@ MenuProductsAccounts=Product accounts
 ProductsBinding=Products accounts
 Ventilation=Binding to accounts
 CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Supplier invoice binding
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
 ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
@@ -185,11 +187,12 @@ ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
-DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=Popis obračunskih računa
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Group of account
 Pcgsubtype=Subgroup of account
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
 ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
 DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report 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 fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Greška, ne možete obrisati obračunski račun jer je u upotrebi
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -293,4 +296,9 @@ Binded=Lines bound
 ToBind=Lines to bind
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang
index 445e546f208..52f0cdbc9da 100644
--- a/htdocs/langs/hr_HR/admin.lang
+++ b/htdocs/langs/hr_HR/admin.lang
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (predefiniran u php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Nije definiran u PHP-u niti na Unix-u)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Nije definiran u PHP-u niti na Unix-u)
 MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= Sustavno pošalji skriveno CC sve poslane poruke e-pošte
 MAIN_DISABLE_ALL_MAILS=Onemogući slanje svih poruka e-poštom (samo za testiranje i demo)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=Način slanja e-pošte
 MAIN_MAIL_SMTPS_ID=SMTP ID potrebna prijava
 MAIN_MAIL_SMTPS_PW=SMTP Lozinka ako je potrebna prijava
@@ -291,7 +292,7 @@ ModuleSetup=Podešavanje modula
 ModulesSetup=Podešavanje modula/aplikacija
 ModuleFamilyBase=Sistem
 ModuleFamilyCrm=Upravljanje odnosima sa kupcima (CRM)
-ModuleFamilySrm=Upravljanje odnosima dobavljača (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Upravljanje proizvodima (PM)
 ModuleFamilyHr=Upravljanje ljudskim resursima (HR)
 ModuleFamilyProjects=Projekti/zajednički rad
@@ -373,7 +374,8 @@ NoSmsEngine=No SMS sender manager available. SMS sender manager are not installe
 PDF=PDF
 PDFDesc=You can set each global options related to the PDF generation
 PDFAddressForging=Pravila za kopiranje adresnih blokova
-HideAnyVATInformationOnPDF=Sakrij sve informacije vezane za PDV na generiranim PDF
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=Sakrij opis proizvoda na generiranim PDF
@@ -445,7 +447,8 @@ DisplayCompanyInfo=Prikaži adresu tvrtke
 DisplayCompanyManagers=Prikaz upravitelja imenima
 DisplayCompanyInfoAndManagers=Prikaži adresu tvrtke i ime menadžera
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party 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.
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Set this to 1 if you want to attach main document to emai
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=Korisnici i grupe
 Module0Desc=Upravljanje korisnicima/zaposlenicima i grupama
@@ -479,7 +485,7 @@ Module1Desc=Upravljanje tvrtkama i kontaktima (kupci, potencijalni kupci, ...)
 Module2Name=Komercijala
 Module2Desc=Upravljanje komercijalom
 Module10Name=Računovodstvo
-Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching.
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=Ponude
 Module20Desc=Upravljanje ponudama
 Module22Name=Masovno slanje e-pošte
@@ -546,8 +552,8 @@ Module400Name=Projekti/Mogućnosti/Vodiči
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Web kalendar
 Module410Desc=Integracija web kalendara
-Module500Name=Specijalni troškovi
-Module500Desc=Upravljanje specijalnim troškovima (porezi, društveni ili fiskalni porezi, dividende)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Payment of employee wages
 Module510Desc=Record and follow payment of your employee wages
 Module520Name=Kredit
@@ -561,14 +567,14 @@ Module700Name=Donacije
 Module700Desc=Upravljanje donacijama
 Module770Name=Izvještaji troška
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Ponuda dobavljača
-Module1120Desc=Zahtjev za ponudom dobavljača s cijenama
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Integracija Mantisa
 Module1520Name=Generiranje dokumenta
 Module1520Desc=Mass mail document generation
 Module1780Name=Kategorije
-Module1780Desc=Kreiraj kategoriju (proizvodi, kupci, dobavljači, kontakti ili članovi)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Dozvoljava uređivanje nekog tekstualnog područja u naprednom editoru (bazirano na CKEditor-u)
 Module2200Name=Dinamičke cijene
@@ -576,7 +582,7 @@ Module2200Desc=Omogući korištenje matematičkih izraza za cijene
 Module2300Name=Planirani poslovi
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Događaji/Raspored
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API/Web servisi (SOAP server)
@@ -613,7 +619,7 @@ Module50100Desc=Modul prodajnog mjesta (POS)
 Module50200Name=Paypal
 Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 Module50400Name=Računovodstvo (napredno)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Anketa, Upitnik ili Glasanje
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerancija kašnjenja (u danima) prije obavijesti o z
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerancija kašnjenja (u danima) prije obavijesti za napraviti čekovne pologe
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerancija kašnjenja (u danima) prije obavijesti za odobravanje izvještaja troška
 SetupDescription1=Sučelje postavki je za inicijalnu podešavanje parametara prije korištenja Dolibarr-a.
-SetupDescription2=Dva obavezna koraka podešavanja su prva dva u meniju podešavanja na lijevoj strani: %s i %s:
-SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=Ostale stavke izbornika upravljaju dodatnim parametrima.
 LogEvents=Pregled sigurnosnih događaja
 Audit=Revizija
@@ -1054,8 +1060,9 @@ LogEventDesc=You can enable here the logging for Dolibarr security events. Admin
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Dostupne aplikacije/moduli
 ToActivateModule=Za aktivaciju modula, idite na podešavanja (Naslovna->Podešavanje->Moduli).
@@ -1188,11 +1195,11 @@ UserMailRequired=E-pošta je obavezna za kreiranje novog korisnika
 HRMSetup=Podešavanje modula HRM
 ##### Company setup #####
 CompanySetup=Podešavanje modula tvrtke
-CompanyCodeChecker=Modul za generiranje koda komitenata i provhera (kupac ili dobavljač)
-AccountCodeManager=Module for accounting code generation (customer or supplier)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
 NotificationsDescUser=* po korisniku, jedan po jedan.
-NotificationsDescContact=* po kontaktu komitenta (kupci ili dobavljači), jedan po jedan.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* ili podešavanjem globalnih ciljanih adresa e-pošte u postavkama modula.
 ModelModules=Predlošci dokumenata
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
@@ -1203,6 +1210,9 @@ MustBeUnique=Mora biti jedinstven?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Obavezno za knjiženje računa?
 TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Izvoz poveznice u <b>%s</b> formatu je dostupno na sljedećoj poveznici: %s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=Slobodan unos teksta na ponudi
 WatermarkOnDraftProposal=Vodeni žig na skici ponude (ako nije prazno)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Traži odredišni bankovni račun ponude
 ##### SupplierProposal #####
-SupplierProposalSetup=Podešavanje modula cijenovnih upita dobavljačima
-SupplierProposalNumberingModules=Način označavanja cijenovnih upita dobavljačima
-SupplierProposalPDFModules=Model dokumenata cijenovnih upita dobavljaču
-FreeLegalTextOnSupplierProposal=Slobodan unos teksta na upitima prema dobavljaču
-WatermarkOnDraftSupplierProposal=Vodeni žig na skici upita dobavljaču (ništa ako se ostavi prazno)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Traži odredišni bankovni račun zahtjeva za cijenom
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Upitaj za izvorno skladište za narudžbe
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=Podešavanje upravljanjem narudžbama
 OrdersNumberingModules=Način označavanja narudžba
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe
 OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
 OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
 ##### Stock #####
-StockSetup=Podešavanje modula skladišta
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
 ##### Menu #####
 MenuDeleted=Izbornik obrisan
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Način označavanja čekovnih primki
 MultiCompanySetup=Više poduzeća module podešavanje
 ##### Suppliers #####
 SuppliersSetup=Podešavanje modula dobavljača
-SuppliersCommandModel=Kompletan predložak narudžbe dobavljača (logo...)
-SuppliersInvoiceModel=Kompletan predložak računa dobavljača (logo...)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Način označavanja računa dobavljača
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","
 SalariesSetup=Podešavanje modula plaća
 SortOrder=Redosljed sortiranja
 Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Podešavanje modula Izvještaji troška
 TemplatePDFExpenseReports=Predlošci dokumenta za generiranje izvještaja troška
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Install of external module from applic
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
-TextTitleColor=Boja naslova stranice
+TextTitleColor=Text color of Page title
 LinkColor=Boja poveznica
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=Boja pozadine za gornji izbornik
 TopMenuDisableImages=Sakrij slike u gornjem izborniku
 LeftMenuBackgroundColor=Boja pozadine lijevog izbornika
 BackgroundTableTitleColor=Boja pozadine za zaglavlje tablica
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Boja pozadine za neparne redove u tablici
 BackgroundTableLineEvenColor=Boja pozadine za parne redove u tablici
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Očekivani checksum
 CurrentChecksum=Trenutni checksum
 ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-MailToMember=To send email from member page
-MailToUser=To send email from user page
-MailToProject= To send email from project page
+MailToSendProposal=Ponude kupca
+MailToSendOrder=Narudžbe kupaca
+MailToSendInvoice=Računi za kupce
+MailToSendShipment=Isporuke
+MailToSendIntervention=Intervencije
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Ugovori
+MailToThirdparty=Komitenti
+MailToMember=Članovi
+MailToUser=Korisnici
+MailToProject=Projects page
 ByDefaultInList=Prikaži kao zadano na popisu
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1780,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/hr_HR/bills.lang b/htdocs/langs/hr_HR/bills.lang
index 47e36984250..93632b9f426 100644
--- a/htdocs/langs/hr_HR/bills.lang
+++ b/htdocs/langs/hr_HR/bills.lang
@@ -109,7 +109,7 @@ CancelBill=Poništi račun
 SendRemindByMail=Pošalji podsjetnik putem e-pošte
 DoPayment=Enter payment
 DoPaymentBack=Enter refund
-ConvertToReduc=Pretvori u budući popust
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Upiši zaprimljeno plaćanje kupca
@@ -120,7 +120,7 @@ BillStatus=Stanje računa
 StatusOfGeneratedInvoices=Status generiranih računa
 BillStatusDraft=Skica (potrebno potvrditi)
 BillStatusPaid=Plaćeno
-BillStatusPaidBackOrConverted=Credit note refund or converted into discount
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Napušteno
 BillStatusValidated=Ovjereno (potrebno platiti)
@@ -296,10 +296,10 @@ DiscountType=Discount type
 NoteReason=Bilješka/Razlog
 ReasonDiscount=Razlog
 DiscountOfferedBy=Odobrio
-DiscountStillRemaining=Discounts available
-DiscountAlreadyCounted=Discounts already consumed
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+SupplierDiscounts=Vendors discounts
 BillAddress=Adresa za naplatu
 HelpEscompte=Ovaj popust zajamčen je jer je kupac izvršio plaćanje prije roka.
 HelpAbandonBadCustomer=Ovaj iznos neće biti plaćen (kupac je loš kupac) i smatra se kao gubitak.
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Dopusti plaćanja za različite račune, ali od ist
 PaymentNote=Obavijest plaćanja
 ListOfPreviousSituationInvoices=Popis prijašnjih računa etape
 ListOfNextSituationInvoices=Popis narednih računa etapa
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Svakih %s dana
 FrequencyPer_m=Svakih %s mjeseci
 FrequencyPer_y=Svakih %s godina
@@ -505,9 +511,14 @@ SituationAmount=Iznos računa etape (net)
 SituationDeduction=Oduzimanje po etapama
 ModifyAllLines=Izmjeni sve stavke
 CreateNextSituationInvoice=Kreiraj sljedeću etapu
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=Ovaj račun nije posljednji u ciklusu i ne smije se mijenjati
 DisabledBecauseNotLastInCycle=Sljedeća etapa već postoji
 DisabledBecauseFinal=Ova etapa je konačna
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=N
 CantBeLessThanMinPercent=Napredak ne može biti manje nego što je vrijednost u prijašnjoj etapi.
 NoSituations=Nema otvorenih etapa
 InvoiceSituationLast=Konačni i glavni račun
@@ -532,3 +543,4 @@ AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/hr_HR/categories.lang b/htdocs/langs/hr_HR/categories.lang
index 5e7eba9f6f3..752ceb4a873 100644
--- a/htdocs/langs/hr_HR/categories.lang
+++ b/htdocs/langs/hr_HR/categories.lang
@@ -16,7 +16,7 @@ MembersCategoriesArea=Sučelje kategorija članova
 ContactsCategoriesArea=Sučelje kategorija kontakta
 AccountsCategoriesArea=Sučelje tagova/kategorija računa
 ProjectsCategoriesArea=Sučelje kategorija projekata
-SubCats=Podkategorije
+SubCats=Sub-categories
 CatList=Popis kategorija
 NewCategory=Nova kategorija
 ModifCat=Promjeni kategoriju
@@ -85,3 +85,4 @@ CategorieRecursivHelp=Ako je aktivirano, proizvod će isto biti povezan s matič
 AddProductServiceIntoCategory=Dodaj sljedeće proizvode/usluge
 ShowCategory=Prikaži kategoriju
 ByDefaultInList=Po predefiniranom na listi
+ChooseCategory=Choose category
diff --git a/htdocs/langs/hr_HR/commercial.lang b/htdocs/langs/hr_HR/commercial.lang
index 8718ef1bde5..92ee79f4b79 100644
--- a/htdocs/langs/hr_HR/commercial.lang
+++ b/htdocs/langs/hr_HR/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=Zatvoren
 ActionAC_EMAILING=Masovno slanje e-pošte
 ActionAC_COM=Pošalji narudžbu kupca putem pošte
 ActionAC_SHIP=Pošalji dostavu putem pošte
-ActionAC_SUP_ORD=Pošalji narudžbu dobavljača poštom
-ActionAC_SUP_INV=Pošalji račun dobavljača poštom
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=Ostalo
 ActionAC_OTH_AUTO=Automatski uneseni događaji
 ActionAC_MANUAL=Ručno uneseni događaji
diff --git a/htdocs/langs/hr_HR/companies.lang b/htdocs/langs/hr_HR/companies.lang
index e3280d88f23..41725e3b15d 100644
--- a/htdocs/langs/hr_HR/companies.lang
+++ b/htdocs/langs/hr_HR/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Jeste li sigurni da želite obrisati ovaj kontakt i sve inf
 MenuNewThirdParty=Novi komitent
 MenuNewCustomer=Novi kupac
 MenuNewProspect=Novi potencijalni kupac
-MenuNewSupplier=Novi dobavljač
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=Nova privatna osoba
-NewCompany=Nova tvrtka (potencijalni kupac, kupac, dobavljač)
-NewThirdParty=Novi komitent (potencijalni kupac, kupac, dobavljač)
-CreateDolibarrThirdPartySupplier=Kreiraj komitenta (dobavljač)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=Kreiraj komitenta
 CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Sučelje Potencijalnih kupaca
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=Potencijalni kupci
 ThirdPartyCustomers=Kupci
 ThirdPartyCustomersStats=Kupci
 ThirdPartyCustomersWithIdProf12=Kupci sa %s ili %s
-ThirdPartySuppliers=Dobavljači
+ThirdPartySuppliers=Vendors
 ThirdPartyType=Tip komitenta
 Individual=Privatna osoba
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
@@ -77,11 +77,11 @@ Web=Web
 Poste= Pozicija
 DefaultLang=Primarni jezik
 VATIsUsed=Sales tax is used
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
-ThirdpartyNotCustomerNotSupplierSoNoRef=Komitent nije kupac niti dobavljač, nema raspoloživih upućenih objekata
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Ponude
 OverAllOrders=Narudžbe
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=RE tip
 TypeLocaltax2ES=IRPF tip
 WrongCustomerCode=Neispravan kod kupca
-WrongSupplierCode=Neispravan kod dobavljača
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Način koda kupca 
-SupplierCodeModel=Način koda dobavljača
+SupplierCodeModel=Vendor code model
 Gencod=Barkod
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
@@ -267,7 +267,7 @@ Prospect=Potencijalni kupac
 CustomerCard=Kartica kupca
 Customer=Kupac
 CustomerRelativeDiscount=Relativni popust kupcu
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=Relativni popust
 CustomerAbsoluteDiscountShort=Apsolutni popust
 CompanyHasRelativeDiscount=Ovaj kupac ima predefiniran popust od <b>%s%%</b>
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this suppl
 CompanyHasNoAbsoluteDiscount=Ovaj kupac nema dostupan kreditni popust
 CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
 CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=Ništa
 Supplier=Dobavljač
 AddContact=Kreiraj kontakt
@@ -304,13 +304,13 @@ DeleteACompany=Izbriši tvrtku
 PersonalInformations=Osobni podaci
 AccountancyCode=Obračunski račun
 CustomerCode=Kod kupca
-SupplierCode=Kod dobavljača
+SupplierCode=Vendor code
 CustomerCodeShort=Kod kupca
-SupplierCodeShort=Kod dobavljača
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=Kod kupca, jedinstven za sve kupce
-SupplierCodeDesc=Kod dobavljača, jedinstven za sve dobavljače
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=Obavezno ako je komitent kupac ili potencijalni kupac
-RequiredIfSupplier=Obavezno ako je komitent dobavljač
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=Odobravanje kontrolirano modulom
 ThisIsModuleRules=Ovo su pravila za ovaj modul
 ProspectToContact=Potencijalni kupac u kontakt
@@ -338,7 +338,7 @@ MyContacts=Moji kontakti
 Capital=Kapital
 CapitalOf=Kapital od %s
 EditCompany=Uredi tvrtku
-ThisUserIsNot=Ovaj korisnik nije ni potencijalni kupac, kupac ni dobavljač
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=Ček
 VATIntraCheckDesc=Poveznica <b>%s</b> dozvoljava upit servis za provjeru poreznog broja u EU VIES. Potreban je pristup internetu kako bi ovaj servis radio.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -396,7 +396,7 @@ ImportDataset_company_4=Third parties/Sales representatives (Assign sales repres
 PriceLevel=Razina cijene
 DeliveryAddress=Adresa dostave
 AddAddress=Dodaj adresu
-SupplierCategory=Kategorija dobavljača
+SupplierCategory=Vendor category
 JuridicalStatus200=Nezavisni
 DeleteFile=Izbriši datoteku
 ConfirmDeleteFile=Jeste li sigurni da želite obrisati ovu datoteku?
@@ -406,7 +406,7 @@ FiscalYearInformation=Informacije za fiskalnu godinu
 FiscalMonthStart=Početni mjesec fiskalne godine
 YouMustAssignUserMailFirst=Morate prvo kreirati e-poštu za ovog korisnika kako biste mogli dodati njegove obavijesti putem e-pošte.
 YouMustCreateContactFirst=Kako biste bili u mogućnosti dodavanja obavijesti e-poštom, prvo morate definirati kontakt s valjanom adresom e-pošte za komitenta
-ListSuppliersShort=Lista dobavljača
+ListSuppliersShort=List of vendors
 ListProspectsShort=Lista potencijalnih kupaca
 ListCustomersShort=Lista kupaca
 ThirdPartiesArea=Sučelje komitenata i kontakata
@@ -420,7 +420,7 @@ CurrentOutstandingBill=Trenutno otvoreni računi
 OutstandingBill=Maksimalno za otvorene račune
 OutstandingBillReached=Dosegnut maksimum neplačenih računa
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Vraća broj u formatu %syymm-nnnn za kod kupca i %syymm-nnnn za kod dobavljača gdje je yy godina, mm je mjesec i nnnn je sljedni broj bez prekida i bez mogučnosti povratka na 0
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=Ova šifra je besplatne. Ova šifra se može modificirati u bilo koje vrijeme.
 ManagingDirectors=Ime vlasnika(ce) ( CEO, direktor, predsjednik uprave...)
 MergeOriginThirdparty=Dupliciran komitent (komitent koji želite obrisati)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Korisničko ime predstavnika
 SaleRepresentativeFirstname=Ime prodajnog predstavnika
 SaleRepresentativeLastname=Prezime prodajnog predstavnika
 ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/hr_HR/compta.lang b/htdocs/langs/hr_HR/compta.lang
index e54450dfd18..072647856a9 100644
--- a/htdocs/langs/hr_HR/compta.lang
+++ b/htdocs/langs/hr_HR/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=Neto plaćeno
 VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
-VATSummary=Tax Balance
+VATSummary=Tax monthly
+VATBalance=Tax Balance
 VATPaid=Tax paid
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=Sučelje Računovodstva/Financija
 NewPayment=Novo plaćanje
 Payments=Plaćanja
 PaymentCustomerInvoice=Uplata računa kupca
-PaymentSupplierInvoice=Supplier invoice payment
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Plaćanje društveni/fiskalni porez
 PaymentVat=PDV plaćanje
 ListPayment=Popis plaćanja
 ListOfCustomerPayments=Popis uplata kupca
-ListOfSupplierPayments=List of supplier payments
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Datum početka perioda
 DateEndPeriod=Datum završetka perioda
 newLT1Payment=Novo plaćanje poreza 2
@@ -110,7 +111,7 @@ ShowVatPayment=Prikaži PDV plaćanja
 TotalToPay=Ukupno za platiti
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
 CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Konto kupca
 SupplierAccountancyCodeShort=Konto dobavljača
 AccountNumber=Broj računa
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=Izvještaj po RE komitenta
 LT2ReportByCustomersES=Izvještaj po IRPF komitenta
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Izvještaj prikupljenog i plaćenog PDV-a kupaca
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Chart of accounts models
 Pcg_type=Pcg tip
 Pcg_subtype=Pcg podtip
 InvoiceLinesToDispatch=Stavke računa za otpremu
-ByProductsAndServices=Po proizvodima i uslugama
+ByProductsAndServices=By product and service
 RefExt=Vanjska ref.
 ToCreateAPredefinedInvoice=Za kreiranje predloška računa, kreirajte stadardni račun, onda, bez ovjeravanja, kliknite na gumb "%s"
 LinkedOrder=Poveži s narudžbom
@@ -215,7 +218,8 @@ Mode1=Metoda 1
 Mode2=Metoda 2
 CalculationRuleDesc=Za izračunavanje poreza, postoje dvije metode:<br> Metoda 1 je zaokruživanje PDV za svaku  stavku te njihov zbroj.<br>Metoda 2 je zbrajanje PDV za svaku stavku te zaokruživanje rezultata.<br>Konačni rezultat se može razlikovati za par lipa. Zadani način je način <b>%s</b>.
 CalculationRuleDescSupplier=Sukladno dobavljaču, odaberite prikladnu metodu za primjenu istog pravila računanja i dobivanju istog rezultata očekivanog od vašeg dobavljača.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Izvještaj prometa po proizvodu, kada koristite <b>gotovinsko računovodstvo</b> način nije točno. Ovaj izvještaj je dostupan samo kada koristite <b>Predano računovodstvo</b> (vidi podešavanjke modula računovodstva).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Način izračuna
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=Kloniraj društveni/fiskalni porez
 ConfirmCloneTax=Potvrdi kloniranje plaćanja društvenog/fiskalnog poreza
@@ -242,3 +246,10 @@ FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/hr_HR/dict.lang b/htdocs/langs/hr_HR/dict.lang
index 02775b9832f..c2e43af033a 100644
--- a/htdocs/langs/hr_HR/dict.lang
+++ b/htdocs/langs/hr_HR/dict.lang
@@ -5,7 +5,8 @@ CountryIT=Italija
 CountryES=Španjolska
 CountryDE=Njemačka
 CountryCH=Švicarska
-CountryGB=Velika Britanija
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=United Kingdom
 CountryUK=United Kingdom
 CountryIE=Irska
 CountryCN=Kina
diff --git a/htdocs/langs/hr_HR/ecm.lang b/htdocs/langs/hr_HR/ecm.lang
index 02ef5c294e9..99b06a501c0 100644
--- a/htdocs/langs/hr_HR/ecm.lang
+++ b/htdocs/langs/hr_HR/ecm.lang
@@ -39,9 +39,10 @@ ShowECMSection=Prikaži mapu
 DeleteSection=Obriši mapu
 ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
 ECMDirectoryForFiles=Relativna mapa za datoteke
-CannotRemoveDirectoryContainsFiles=Brisanje nije moguće jer sadrži neke datoteke
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=Upravitelj datotekama
-ECMSelectASection=Odaberite mapu na lijevom stablu
+ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
diff --git a/htdocs/langs/hr_HR/errors.lang b/htdocs/langs/hr_HR/errors.lang
index d5e86a4fa10..695f343ce8f 100644
--- a/htdocs/langs/hr_HR/errors.lang
+++ b/htdocs/langs/hr_HR/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Bar code required
 ErrorCustomerCodeAlreadyUsed=Customer code already used
 ErrorBarCodeAlreadyUsed=Bar code already used
 ErrorPrefixRequired=Prefix required
-ErrorBadSupplierCodeSyntax=Bad syntax for supplier code
-ErrorSupplierCodeRequired=Supplier code required
-ErrorSupplierCodeAlreadyUsed=Supplier code already used
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Bad parameters
 ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
 ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
@@ -87,7 +87,7 @@ ErrorsOnXLines=Errors on <b>%s</b> source record(s)
 ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
 ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s"
 ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
-ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Error on mask
 ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
-ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
diff --git a/htdocs/langs/hr_HR/install.lang b/htdocs/langs/hr_HR/install.lang
index b2c8a485723..398999d546f 100644
--- a/htdocs/langs/hr_HR/install.lang
+++ b/htdocs/langs/hr_HR/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not
 ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
 ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be granted to be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reload all information from configuration file.
 PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Neuspješno kreiranje administratorskog računa.
 WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called <b>install.lock</b> into Dolibarr document directory, in order to avoid malicious use of it.
 FunctionNotAvailableInThisPHP=Not available on this PHP
 ChoosedMigrateScript=Choose migration script
-DataMigration=Data migration
-DatabaseMigration=Structure database migration
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script processing
 ChooseYourSetupMode=Choose your setup mode and click "Start"...
 FreshInstall=Fresh install
@@ -146,7 +147,7 @@ NothingToDo=Nothing to do
 # upgrade
 MigrationFixData=Fix for denormalized data
 MigrationOrder=Data migration for customer's orders
-MigrationSupplierOrder=Data migration for supplier's orders
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Migracija podataka za ponude
 MigrationInvoice=Data migration for customer's invoices
 MigrationContract=Data migration for contracts
@@ -196,6 +197,8 @@ MigrationEvents=Migration of events to add event owner into assignement table
 MigrationEventsContact=Migration of events to add event contact into assignement table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 ShowNotAvailableOptions=Show not available options
diff --git a/htdocs/langs/hr_HR/ldap.lang b/htdocs/langs/hr_HR/ldap.lang
index 19aa8b09e40..7b1d4b0dbe8 100644
--- a/htdocs/langs/hr_HR/ldap.lang
+++ b/htdocs/langs/hr_HR/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Lozinka za domenu
 YouMustChangePassNextLogon=Lozinka za korisnika <b>%s</b> na domeni <b>%s</b> mora se promjeniti.
 UserMustChangePassNextLogon=Korisnik mora promjeniti lozinku na domeni %s
 LDAPInformationsForThisContact=Podaci u LDAP bazi za kontakt
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Member type synchronized
 ContactSynchronized=Kontakt sinhroniziran
 ForceSynchronize=Forsiraj sinhronizaciju Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Neuspješno čitanje LDAP baze. Provjerite postavke LDAP modula i pristupnost bazi.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/hr_HR/loan.lang b/htdocs/langs/hr_HR/loan.lang
index 5c19c6d5b96..d721a41391d 100644
--- a/htdocs/langs/hr_HR/loan.lang
+++ b/htdocs/langs/hr_HR/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=Kapital
 Insurance=Osiguranje
 Interest=Kamata
 Nbterms=Broj rata
+Term=Term
 LoanAccountancyCapitalCode=Accounting account capital
 LoanAccountancyInsuranceCode=Accounting account insurance
 LoanAccountancyInterestCode=Accounting account interest
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=Potvrdite brisanje kredita
 LoanDeleted=Kredit je uspješno obrisan
 ConfirmPayLoan=Potvrdite označivanje isplačen kredit
 LoanPaid=Kredit isplačen
-# Calc
-LoanCalc=Kalkulatora bankovnih kredita
-PurchaseFinanceInfo=Informacije o nabavi i financiranju
-SalePriceOfAsset=Cijena imovine
-PercentageDown=Percentage Down
-LengthOfMortgage=Trajanje kredita
-AnnualInterestRate=Godišnja kamatna stopa
-ExplainCalculations=Objašnjenje izračuna
-ShowMeCalculationsAndAmortization=Prikaži izračun i amortizaciju
-MortgagePaymentInformation=Informacije hipotekarnog plačanja
-DownPayment=Predujam
-DownPaymentDesc=<b>Predujam</b> = Cijena doma pomnožena s percentage down, podjeljena sa 100 ( za 5% dolje postaje 5/100 ili 0.05)
-InterestRateDesc=<b>Kamatna stopa</b> = godišnji kamatni postotak podjeljen sa 100
-MonthlyFactorDesc=<b>Mjesečni faktor</b> = Rezultat sljedeće formule
-MonthlyInterestRateDesc=<b>Mjesečna kamatna stopa</b> = Godišnja kamatna stopa podjeljena sa 12 ( za 12 mjeseci u godini )
-MonthTermDesc=<b>Mjesečni period</b> plačanje kredita u mjesecima = Broj godina na koliko je uzet kredit pomnožen s 12
-MonthlyPaymentDesc=Mjesečna rata je izračunata korištenjem sljedeće formule
-AmortizationPaymentDesc=<a href="#amortization">Amortization</a> razgrađuje koliko vaše mjesčno plačanje ide u bankovne kamate, a koliko ide u plačanje glavnice vašeg kredita.
-AmountFinanced=Financirani iznos
-AmortizationMonthlyPaymentOverYears=Amortizacija za mjesečnu ratu: <b>%s</b> za %s godine
-Totalsforyear=Ukupno za godinu
-MonthlyPayment=Mjesečna rata
-LoanCalcDesc=<b>Hipotekarni kalkulator</b> se može koristiti za izračun mjesečnih rata kredita, bazirano na posuđenom iznosu, periodu kredita i kamatnoj stopi.<br>Ovaj kalkulator također uključuje PMI (privatno kreditno osiguranje) za kredite gdje je predujam manji od 20%% . Isto uzmite u obzir gradske poreze na nekretnine, i njihov utjecaj na ukupnu mjesečnu ratu kredita.
-GoToInterest=%s će otići u KAMATU
-GoToPrincipal=%s će otići u GLAVNICU
-YouWillSpend=Potrošit ćete %s u %s godina
 ListLoanAssociatedProject=List of loan associated with the project
 AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Kamata
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=Konfiguracija modula kredita
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-FinancialCommitment=Financial commitment
 CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/langs/hr_HR/mails.lang b/htdocs/langs/hr_HR/mails.lang
index 16388324482..fcf1576a017 100644
--- a/htdocs/langs/hr_HR/mails.lang
+++ b/htdocs/langs/hr_HR/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Pošiljatelj
 MailErrorsTo=Errors to
 MailReply=Reply to
 MailTo=Receiver(s)
+MailToUsers=To user(s)
 MailCC=Copy to
+MailToCCUsers=Copy to users(s)
 MailCCC=Cached copy to
 MailTopic=EMail topic
 MailText=Poruka
@@ -164,4 +166,4 @@ InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/hr_HR/main.lang b/htdocs/langs/hr_HR/main.lang
index 6a0a6dd9b4e..e08f585d857 100644
--- a/htdocs/langs/hr_HR/main.lang
+++ b/htdocs/langs/hr_HR/main.lang
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is se
 Administrator=Administrator
 Undefined=Nedefinirano
 PasswordForgotten=Zaboravili ste lozinku?
+NoAccount=No account?
 SeeAbove=Vidi iznad
 HomeArea=Naslovna
 LastConnexion=Posljednje spajanje
@@ -231,7 +232,7 @@ Limit=Limit
 Limits=Limiti
 Logout=Odjava
 NoLogoutProcessWithAuthMode=Nema mogučnosti aplikativnog odspajanja s <b>%s</b> načinom autentifikacije.
-Connection=Veza
+Connection=Prijava
 Setup=Podešavanje
 Alert=Obavijest
 MenuWarnings=Obavijesti
@@ -402,6 +403,7 @@ DefaultTaxRate=Default tax rate
 Average=Prosjek
 Sum=Zbroj
 Delta=Delta
+RemainToPay=Remain to pay
 Module=Modul/Aplikacija
 Modules=Moduli/Aplikacije
 Option=Opcija
@@ -414,7 +416,7 @@ Favorite=Favorit
 ShortInfo=Info.
 Ref=Ref.
 ExternalRef=Ref. vanjski
-RefSupplier=Ref. dobavljača
+RefSupplier=Ref. vendor
 RefPayment=Ref. plaćanja
 CommercialProposalsShort=Ponude
 Comment=Komentar
@@ -493,7 +495,7 @@ Received=Primljeno
 Paid=Plaćeno
 Topic=Subjekt
 ByCompanies=Od komitenata
-ByUsers=Od korisnika
+ByUsers=By user
 Links=Veze
 Link=Veza
 Rejects=Odbijanja
@@ -619,9 +621,9 @@ BuildDoc=Izradi dokument
 Entity=Okolina
 Entities=Subjekti
 CustomerPreview=Pregled kupca
-SupplierPreview=Pregled dobavljača
+SupplierPreview=Vendor preview
 ShowCustomerPreview=Prikaži pregled kupca
-ShowSupplierPreview=Prikaži pregled dobavljača
+ShowSupplierPreview=Show vendor preview
 RefCustomer=Ref. kupca
 Currency=Valuta
 InfoAdmin=Informacije za administratore
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=Proizvodi ili usluge
 SearchIntoProjects=Projekti
 SearchIntoTasks=Zadaci
 SearchIntoCustomerInvoices=Računi za kupce
-SearchIntoSupplierInvoices=Račun dobavljača
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Narudžbe kupaca
-SearchIntoSupplierOrders=Narudžbe dobavljaču
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=Ponude kupca
-SearchIntoSupplierProposals=Ponude dobavljača
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Intervencije
 SearchIntoContracts=Ugovori
 SearchIntoCustomerShipments=Pošiljke kupcu
@@ -941,3 +943,5 @@ Remote=Remote
 LocalAndRemote=Local and Remote
 KeyboardShortcut=Keyboard shortcut
 AssignedTo=Dodjeljeno korisniku
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/hr_HR/margins.lang b/htdocs/langs/hr_HR/margins.lang
index 713fd9d6b8c..4f6f998b9e8 100644
--- a/htdocs/langs/hr_HR/margins.lang
+++ b/htdocs/langs/hr_HR/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=Kao usluga
 UseDiscountOnTotal=Na međuzbroju
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Definira ako je globalni rabat tretiran kao prozvod ili usluga, ili samo na međusumi za izračun marže.
 MARGIN_TYPE=Kupovno/troškovna cijena sugerirana za izračun marže
-MargeType1=Marža prema najboljoj cijeni dobavljača
+MargeType1=Margin on Best vendor price
 MargeType2=Marža prema Procjenjenoj prosječnoj cijeni (PPC)
 MargeType3=Marža po cijeni troškova
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Cijena troška
 UnitCharges=Troškovi jedinice
 Charges=Troškovi
diff --git a/htdocs/langs/hr_HR/members.lang b/htdocs/langs/hr_HR/members.lang
index 567654b8068..78801a482f4 100644
--- a/htdocs/langs/hr_HR/members.lang
+++ b/htdocs/langs/hr_HR/members.lang
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
diff --git a/htdocs/langs/hr_HR/opensurvey.lang b/htdocs/langs/hr_HR/opensurvey.lang
index 8747919b382..ba2ca276e1c 100644
--- a/htdocs/langs/hr_HR/opensurvey.lang
+++ b/htdocs/langs/hr_HR/opensurvey.lang
@@ -58,3 +58,4 @@ MoreChoices=Unesite još odabira za glasače
 SurveyExpiredInfo=Anketa je zatvorena ili glasanje je završeno.
 EmailSomeoneVoted=%s je ispunio liniju. \nVašu anketu možete pronaći na linku:\n%s
 ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/hr_HR/orders.lang b/htdocs/langs/hr_HR/orders.lang
index 06ce28a7618..acd4a202693 100644
--- a/htdocs/langs/hr_HR/orders.lang
+++ b/htdocs/langs/hr_HR/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Sučelje narudžba kupaca
-SuppliersOrdersArea=Sučelje narudžba dobavljačima
+SuppliersOrdersArea=Purchase orders area
 OrderCard=Kartica nardžbi
 OrderId=Broj narudžbe
 Order=Narudžba
@@ -13,10 +13,10 @@ OrderToProcess=Obrada narudžbe
 NewOrder=Nova narudžba
 ToOrder=Napravi narudžbu
 MakeOrder=Napravi narudžbu
-SupplierOrder=Narudžba dobavljaču
-SuppliersOrders=Narudžbe dobavljaču
-SuppliersOrdersRunning=Trenutne narudžbe dobavljaču
-CustomerOrder=Narudžbe kupaca
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=Narudžba kupca
 CustomersOrders=Narudžbe kupaca
 CustomersOrdersRunning=Trenutne narudžbe kupaca
 CustomersOrdersAndOrdersLines=Narudžba kupca i stavke narudžbe
@@ -24,7 +24,7 @@ OrdersDeliveredToBill=Customer orders delivered to bill
 OrdersToBill=Isporučene narudžbe kupca
 OrdersInProcess=Narudžbe kupca u obradi
 OrdersToProcess=Narudžbe kupca za obradu
-SuppliersOrdersToProcess=Narudžbe dobavljača za obradu
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=Otkazano
 StatusOrderDraftShort=Skica
 StatusOrderValidatedShort=Ovjereno
@@ -75,15 +75,15 @@ ShowOrder=Prikaži narudžbu
 OrdersOpened=Narudžbe za obradu
 NoDraftOrders=Nema skica narudžbi
 NoOrder=Nema narudžbe
-NoSupplierOrder=Nema narudžbe dobavljača
+NoSupplierOrder=No purchase order
 LastOrders=Zadnjih %s narudžba kupaca
 LastCustomerOrders=Zadnjih %s narudžba kupaca
-LastSupplierOrders=Zadnjih %s narudžba dobavljača
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=Zadnjih %s promjenjenih narudžba
 AllOrders=Sve narudžbe
 NbOfOrders=Broj narudžbe
 OrdersStatistics=Statistike narudžbe
-OrdersStatisticsSuppliers=Statistika narudžbi dobavljačima
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Broj narudžba tijekom mjeseca
 AmountOfOrdersByMonthHT=Iznos narudžbi po mjesecu (bez PDV-a)
 ListOfOrders=Lista narudžbi
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</
 GenerateBill=Kreiraj račun
 ClassifyShipped=Označi kao isporučeno
 DraftOrders=Skica narudžbi
-DraftSuppliersOrders=Skice narudžbi dobavljača
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=Narudžbe u obradi
 RefOrder=Ref. narudžbe
 RefCustomerOrder=Ref. narudžba kupca
-RefOrderSupplier=Ref. narudžba dobavljača
-RefOrderSupplierShort=Ref. order supplier
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=Pošalji narudžbu e-poštom
 ActionsOnOrder=Događaji vezani uz narudžbu
 NoArticleOfTypeProduct=Ne postoji stavka tipa proizvod tako da nema isporučive stavke za ovu narudžbu
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
 DispatchSupplierOrder=Zaprimanje narudžbe dobavljača %s
 FirstApprovalAlreadyDone=Prvo odobrenje je već napravljeno
 SecondApprovalAlreadyDone=Drugo odobrenje je već napravljeno
-SupplierOrderReceivedInDolibarr=Narudžba dobavljaču %s zaprimljena %s
-SupplierOrderSubmitedInDolibarr=Narudžba dobavljaču %s poslana
-SupplierOrderClassifiedBilled=Narudžba dobavljaču %s postavljena za naplatu
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Other orders
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Predstavnik praćena narudžbe kupca
@@ -125,11 +125,11 @@ TypeContact_commande_internal_SHIPPING=Predstavnik praćenja utovara
 TypeContact_commande_external_BILLING=Kontakt osoba za račun
 TypeContact_commande_external_SHIPPING=Kontakt osoba za isporuku
 TypeContact_commande_external_CUSTOMER=Kontakt kupca prateće narudžbe
-TypeContact_order_supplier_internal_SALESREPFOLL=Predstavnik praćenja narudžbe dobavljača
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Predstavnik praćenja utovara
-TypeContact_order_supplier_external_BILLING=Osoba za račune pri dobavljaču
-TypeContact_order_supplier_external_SHIPPING=Osoba za pošiljke pri dobavljaču
-TypeContact_order_supplier_external_CUSTOMER=Kontakt dobavljača prateće narudžbe
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Konstanta COMMANDE_SUPPLIER_ADDON nije definirana
 Error_COMMANDE_ADDON_NotDefined=Konstanta COMMANDE_ADDON nije definirana
 Error_OrderNotChecked=Nisu odabrane narudžbe za izradu računa
diff --git a/htdocs/langs/hr_HR/other.lang b/htdocs/langs/hr_HR/other.lang
index fc810e160d1..83c785a82a0 100644
--- a/htdocs/langs/hr_HR/other.lang
+++ b/htdocs/langs/hr_HR/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=Files is too big
 PleaseBePatient=Please be patient...
 NewPassword=New password
 ResetPassword=Reset password
-RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
@@ -233,6 +233,8 @@ PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=Exports area
 AvailableFormats=Available formats
diff --git a/htdocs/langs/hr_HR/productbatch.lang b/htdocs/langs/hr_HR/productbatch.lang
index 87e5c442ca0..c037eb13c00 100644
--- a/htdocs/langs/hr_HR/productbatch.lang
+++ b/htdocs/langs/hr_HR/productbatch.lang
@@ -16,7 +16,7 @@ printEatby=Upotrebljivo: %s
 printSellby=Istek: %s
 printQty=Količina: %d
 AddDispatchBatchLine=Dodaj stavku za otpremu na police
-WhenProductBatchModuleOnOptionAreForced=Kada je modul Lot/Serial uključen, atumatski se ažuriraju količine za proknjižene isporuke i ručne otpreme i ne mogu više biti izmjenjene. Ostale opcije mogu biti postavljene po vašoj želji.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=Ovaj proizvod ne koristi lot/serijski broj
 ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
diff --git a/htdocs/langs/hr_HR/products.lang b/htdocs/langs/hr_HR/products.lang
index e1666e06a5a..a83f3099cad 100644
--- a/htdocs/langs/hr_HR/products.lang
+++ b/htdocs/langs/hr_HR/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Prodani iznos
 PurchasedAmount=Nabavni iznos
 NewPrice=Nova cijena
 MinPrice=Min. prodajna cijena
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=Prodajna cijena za ovaj proizvod (%s bez PDV-a) ne može biti manja od najmanje dozvoljene. Ova poruka može se pojaviti i kada ste upisali bitan popust.
 ContractStatusClosed=Zatvoreno
 ErrorProductAlreadyExists=Proizvod s oznakom %s već postoji
@@ -155,7 +156,7 @@ BuyingPrices=Nabavne cijene
 CustomerPrices=Cijene kupaca
 SuppliersPrices=Cijena dobavljača
 SuppliersPricesOfProductsOrServices=Cijena dobavljača (proizvoda ili usluga)
-CustomCode=Customs/Commodity/HS code
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=Zemlja porijekla
 Nature=Vrsta proizvoda
 ShortLabel=Kratka oznaka
diff --git a/htdocs/langs/hr_HR/projects.lang b/htdocs/langs/hr_HR/projects.lang
index d39570462e1..ecfb85b0828 100644
--- a/htdocs/langs/hr_HR/projects.lang
+++ b/htdocs/langs/hr_HR/projects.lang
@@ -77,6 +77,7 @@ Time=Vrijeme
 ListOfTasks=Popis zadataka
 GoToListOfTimeConsumed=Idi na popis utrošenog vremena
 GoToListOfTasks=Idi na popis zadataka
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=Popis ponuda dodjeljenih projektu
 ListOrdersAssociatedProject=List of customer orders associated with the project
@@ -226,4 +227,4 @@ AllowCommentOnProject=Allow user comments on projects
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/hr_HR/stocks.lang b/htdocs/langs/hr_HR/stocks.lang
index 67eb762a586..80524d7740e 100644
--- a/htdocs/langs/hr_HR/stocks.lang
+++ b/htdocs/langs/hr_HR/stocks.lang
@@ -203,3 +203,4 @@ RegulateStock=Regulate Stock
 ListInventory=Popis
 StockSupportServices=Stock management support services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/hr_HR/stripe.lang b/htdocs/langs/hr_HR/stripe.lang
index 22409d7f777..793a7ff86cd 100644
--- a/htdocs/langs/hr_HR/stripe.lang
+++ b/htdocs/langs/hr_HR/stripe.lang
@@ -58,8 +58,8 @@ NameOnCard=Name on card
 CardNumber=Card Number
 ExpiryDate=Expiry Date
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/hr_HR/supplier_proposal.lang b/htdocs/langs/hr_HR/supplier_proposal.lang
index 241b9e868d5..d8503302a19 100644
--- a/htdocs/langs/hr_HR/supplier_proposal.lang
+++ b/htdocs/langs/hr_HR/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Ponude dobavljača
-supplier_proposalDESC=Upravljaj zahtjevima za cijene prema dobavljačima
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
 SupplierProposalNew=Novo traženje cijene
 CommRequest=Tražena cijena
 CommRequests=Tražene cijene
 SearchRequest=Pronađi zahtjev
 DraftRequests=Skica zahtjeva
-SupplierProposalsDraft=Skice ponuda dobavljača
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=Zadnjih %s promjenjenih zahtjeva za cijenom
 RequestsOpened=Otvoreni zahtjevi
-SupplierProposalArea=Sučelje ponuda dobavljača
-SupplierProposalShort=Ponuda dobavljača
-SupplierProposals=Ponude dobavljača
-SupplierProposalsShort=Ponude dobavljača
+SupplierProposalArea=Vendor proposals area
+SupplierProposalShort=Vendor proposal
+SupplierProposals=Vendor proposals
+SupplierProposalsShort=Vendor proposals
 NewAskPrice=Novo traženje cijene
 ShowSupplierProposal=Prikaži zahtjev
 AddSupplierProposal=Kreiraj zahtjev za cijenom
-SupplierProposalRefFourn=Ref. dobavljača
+SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=Datum isporuke
 SupplierProposalRefFournNotice=Prije zatvaranja s "Prihvačeno", provjerite reference dobavljača.
 ConfirmValidateAsk=Are you sure you want to validate this price request under name <b>%s</b>?
@@ -47,9 +47,9 @@ CommercialAsk=Zahtjev za cijenom
 DefaultModelSupplierProposalCreate=Izrada osnovnog modela
 DefaultModelSupplierProposalToBill=Osnovni predložak prilikom zatvaranja zahtjeva (prihvačeno)
 DefaultModelSupplierProposalClosed=Osnovni predložak prilikom zatvaranja zahtjeva (odbijeno)
-ListOfSupplierProposals=Popis zahtjeva za ponudama dobavljača
-ListSupplierProposalsAssociatedProject=Popis ponuda dobavljača dodjeljenih projektu
-SupplierProposalsToClose=Ponude dobavljača za zatvaranje
-SupplierProposalsToProcess=Ponude dobavljača za obradu
+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=Svi zahtjevi
diff --git a/htdocs/langs/hr_HR/suppliers.lang b/htdocs/langs/hr_HR/suppliers.lang
index b063774367b..7572f5a92cb 100644
--- a/htdocs/langs/hr_HR/suppliers.lang
+++ b/htdocs/langs/hr_HR/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Dobavljači
-SuppliersInvoice=Računi dobavljača
-ShowSupplierInvoice=Prikaži račune dobavljača
-NewSupplier=Novi dobavljač
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=Povijest
-ListOfSuppliers=Popis dobavljača
-ShowSupplier=Prikaži dobavljača
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=Datum narudžbe
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Neki od pod proizvoda nemaju definiranu cijenu
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
-SupplierPrices=Cijena dobavljača
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Ova ref. dobavljača već je povezana s ref.: %s
-NoRecordedSuppliers=Nema dobavljača
-SupplierPayment=Plaćanje dobavljača
-SuppliersArea=Sučelje dobavljača
-RefSupplierShort=Ref. dobavljača
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=Dostupnost
-ExportDataset_fournisseur_1=Računi dobavljača i stavke računa
-ExportDataset_fournisseur_2=Računi dobavljača i plaćanja
-ExportDataset_fournisseur_3=Narudžbe dobavljača i stavke narudžbe
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=Odobri narudžbu
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Zabrani narudžbu
 ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
 ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
-AddSupplierOrder=Kreiraj narudžbu dobavljaču
-AddSupplierInvoice=Kreiraj račun dobavljača
-ListOfSupplierProductForSupplier=Popis proizvoda i cijena za dobavljača <b>%s</b>
-SentToSuppliers=Poslano dobavljačima
-ListOfSupplierOrders=Popis narudžbi dobavljača
-MenuOrdersSupplierToBill=Narudžbe dobavljača u račune
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Kašnjenje isporuke u danima
 DescNbDaysToDelivery=Najveće kašnjenje za proizvode s ove narudžbe
-SupplierReputation=Reputacija dobavljača
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Nemoj naručiti
 NotTheGoodQualitySupplier=Loša kvaliteta
 ReputationForThisProduct=Reputacija
 BuyerName=Naziv kupca
 AllProductServicePrices=All product / service prices
 AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=Cijena dobavljača
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/hr_HR/website.lang b/htdocs/langs/hr_HR/website.lang
index 901f4bb47c6..ff35b10630d 100644
--- a/htdocs/langs/hr_HR/website.lang
+++ b/htdocs/langs/hr_HR/website.lang
@@ -73,7 +73,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
diff --git a/htdocs/langs/hr_HR/workflow.lang b/htdocs/langs/hr_HR/workflow.lang
index c2c3e3cd4ca..0102abea324 100644
--- a/htdocs/langs/hr_HR/workflow.lang
+++ b/htdocs/langs/hr_HR/workflow.lang
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source custome
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/hu_HU/accountancy.lang b/htdocs/langs/hu_HU/accountancy.lang
index 7ce7b42eca9..9dd72d83f2a 100644
--- a/htdocs/langs/hu_HU/accountancy.lang
+++ b/htdocs/langs/hu_HU/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Könyvelés
 ACCOUNTING_EXPORT_SEPARATORCSV=Oszlop határoló az export fájlhoz
 ACCOUNTING_EXPORT_DATE=Dátum formátuma az export fájlhoz
 ACCOUNTING_EXPORT_PIECE=Darabszám exportálása
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Accounts with non zero values
 ListOfAccounts=List of accounts
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers 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
 
-AccountancyArea=Accountancy area
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
 AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
@@ -89,7 +90,7 @@ MenuProductsAccounts=Product accounts
 ProductsBinding=Products accounts
 Ventilation=Binding to accounts
 CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Supplier invoice binding
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
 ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
@@ -185,11 +187,12 @@ ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
-DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Group of account
 Pcgsubtype=Subgroup of account
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
 ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
 DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report 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 fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -293,4 +296,9 @@ Binded=Lines bound
 ToBind=Lines to bind
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang
index 2a16ec835cb..9b8c6c3b592 100644
--- a/htdocs/langs/hu_HU/admin.lang
+++ b/htdocs/langs/hu_HU/admin.lang
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=SMTP / SMTPS Host (alapértelmezés a php.ini-ben: <b>%s)<
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP / SMTPS Port (nem definiált a PHP-ben Unix szerű rendszereken)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPS Host (nem definiált a PHP-ben Unix szerű rendszereken)
 MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= Küldjön szisztematikusan rejtett másolatot az összes elküldött e-mail-ről ide:
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=E-mail küldéséhez használt metódus
 MAIN_MAIL_SMTPS_ID=SMTP azonosító ha szükséges a hitelesítés
 MAIN_MAIL_SMTPS_PW=SMTP jelszó ha szükséges a hitelesítés
@@ -291,7 +292,7 @@ ModuleSetup=Modul beállítása
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=Rendszer
 ModuleFamilyCrm=Ügyfélkapcsolat kezelés (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Termékkezelés (PM)
 ModuleFamilyHr=Emberi Erőforrás Kezelés (HR)
 ModuleFamilyProjects=Projektek / kollaboratív munka
@@ -373,7 +374,8 @@ NoSmsEngine=Nincs SMS küldő menedzser áll. SMS küldő menedzser nem telepít
 PDF=PDF
 PDFDesc=Beállíthatjuk, hogy az egyes globális kapcsolódó beállítások a PDF generáció
 PDFAddressForging=Szabályok kovácsolni címre dobozok
-HideAnyVATInformationOnPDF=Hide kapcsolatos minden információt áfa generált PDF
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=Termékleírás elrejtése a generált PDF fájlban
@@ -445,7 +447,8 @@ DisplayCompanyInfo=Display company address
 DisplayCompanyManagers=Mutassa a menedzserek nevét
 DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party 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.
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Set this to 1 if you want to attach main document to emai
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=Felhasználók és csoportok
 Module0Desc=Users / Employees and Groups management
@@ -479,7 +485,7 @@ Module1Desc=A vállalatok vezetése és a kapcsolattartó
 Module2Name=Kereskedelmi
 Module2Desc=Kereskedelmi irányítás
 Module10Name=Számvitel
-Module10Desc=Egyszerű számviteli menedzsment (számla és fizetési elszállításával)
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=Javaslatok
 Module20Desc=Üzleti ajánlat vezetése
 Module22Name=Tömeges e-levelek
@@ -546,8 +552,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=WebCalendar
 Module410Desc=WebCalendar integráció
-Module500Name=Különleges költségek
-Module500Desc=Különleges kiadások (adók, szociális vagy pénzügyi adók, osztalék) kezelése
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Payment of employee wages
 Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
@@ -561,14 +567,14 @@ Module700Name=Adományok
 Module700Desc=Adomány vezetése
 Module770Name=Költség kimutatások
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Mantis integráció
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
 Module1780Name=Címkék/kategóriák
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=WYSIWYG szerkesztő
 Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
 Module2200Name=Dinamikus árak
@@ -576,7 +582,7 @@ Module2200Desc=Matematikai kifejezések engedélyezése az árak meghatározás
 Module2300Name=Időzített feladatok
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Események/Naptár
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API/Web szolgáltatások (SOAP szerver)
@@ -613,7 +619,7 @@ Module50100Desc=Point of sales module (POS).
 Module50200Name=Paypal
 Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Poll, Survey or Vote
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerancia késleltetést (nap) előtt figyelmeztető
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerancia késedelem (nap) előtt figyelmeztetést ellenőrzések betét csinálni
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tűréshatár értéke (napokban) mielőtt figyelmeztetést küld a kiadási összesítések elfogadtatására
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=További bejegyzések kezelése menüben választható paramétereket.
 LogEvents=Biztonsági audit események
 Audit=Könyvvizsgálat
@@ -1054,8 +1060,9 @@ LogEventDesc=Itt tud belépni a Dolibarr eseményeire biztonságosa. A rendszerg
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Rendszer információk különféle műszaki információkat kapunk a csak olvasható módban, és csak rendszergazdák számára látható.
 SystemAreaForAdminOnly=Ez a terület áll rendelkezésre a felhasználók csak rendszergazda. Egyik Dolibarr engedélyek csökkentheti ezt a határt.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=Választhat minden paramétert kapcsolatos Dolibarr kinézetét itt
 AvailableModules=Available app/modules
 ToActivateModule=Ha aktiválni modulok, menjen a Setup Terület (Home-> Beállítások-> Modulok).
@@ -1188,11 +1195,11 @@ UserMailRequired=E-mail létrehozásához szükséges új felhasználó
 HRMSetup=HRM module setup
 ##### Company setup #####
 CompanySetup=Cégek modul beállítása
-CompanyCodeChecker=Modul harmadik felek code-termelés és ellenőrzés (ügyfél vagy szállító)
-AccountCodeManager=Module for accounting code generation (customer or supplier)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
 NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
 ModelModules=Dokumentumok sablonok
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
@@ -1203,6 +1210,9 @@ MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
 TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Az export linket <b>%s</b> formátumban elérhető a következő linkre: %s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=Szabad szöveg a kereskedelmi javaslatok
 WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
 ##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=Order Management Setup
 OrdersNumberingModules=Megrendelés számozási modulok
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=Csatlakozás a szerverhez &quot;%s&quot; az adatbázis &quot;%s
 OSCommerceTestKo1=Csatlakozás a szerverhez &quot;%s&quot; sikerül, de adatbázis &quot;%s&quot; nem lehet elérni.
 OSCommerceTestKo2=Csatlakozás a szerverhez &quot;%s&quot; felhasználói &quot;%s&quot; sikerült.
 ##### Stock #####
-StockSetup=Warehouse module setup
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
 ##### Menu #####
 MenuDeleted=Menü törölve
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
 MultiCompanySetup=Több cég setup modul
 ##### Suppliers #####
 SuppliersSetup=Szállító modul beállítása
-SuppliersCommandModel=Teljes sablon szállító érdekében (logo. ..)
-SuppliersInvoiceModel=A teljes szállítói számla sablon (logo. ..)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","
 SalariesSetup=Alkalmazottak modul beállítása
 SortOrder=Rendezés iránya
 Format=Formátum
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Install of external module from applic
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
-TextTitleColor=Color of page title
+TextTitleColor=Text color of Page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=Background color for Top menu
 TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
 ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-MailToMember=To send email from member page
-MailToUser=To send email from user page
-MailToProject= To send email from project page
+MailToSendProposal=Ügyfél ajánlatok
+MailToSendOrder=Vevők megrendelései
+MailToSendInvoice=Ügyfél számlák
+MailToSendShipment=Szállítások
+MailToSendIntervention=Beavatkozások
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Szerződések
+MailToThirdparty=Partner
+MailToMember=Tagok
+MailToUser=Felhasználók
+MailToProject=Projects page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1780,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/hu_HU/bills.lang b/htdocs/langs/hu_HU/bills.lang
index 94aead7794b..16662e9e988 100644
--- a/htdocs/langs/hu_HU/bills.lang
+++ b/htdocs/langs/hu_HU/bills.lang
@@ -109,7 +109,7 @@ CancelBill=Visszavon egy számlát
 SendRemindByMail=Emlékeztető küldése e-mailben 
 DoPayment=Enter payment
 DoPaymentBack=Enter refund
-ConvertToReduc=Átalakít jövőbeni kedvezménnyé
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Írja be a vásárlótól kapott a fizetést
@@ -120,7 +120,7 @@ BillStatus=Számla állapota
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Tervezet (érvényesítés szükséges)
 BillStatusPaid=Fizetett
-BillStatusPaidBackOrConverted=Credit note refund or converted into discount
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Elveszett
 BillStatusValidated=Hitelesített (ki kell fizetni)
@@ -296,10 +296,10 @@ DiscountType=Discount type
 NoteReason=Megjegyzés / Ok
 ReasonDiscount=Ok
 DiscountOfferedBy=Által nyújtott
-DiscountStillRemaining=Discounts available
-DiscountAlreadyCounted=Discounts already consumed
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+SupplierDiscounts=Vendors discounts
 BillAddress=Szánmlázási cím
 HelpEscompte=Ez a kedvezmény egy engedmény a vevő részére, mert a befizetés már megtörtént előzőleg.
 HelpAbandonBadCustomer=Ez az összeg már Elveszett (kétes vevő), rendkívüli veszteségként leírva.
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but
 PaymentNote=Fizetési megjegyzés
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Minden %s. nap
 FrequencyPer_m=Minden %s. hónap
 FrequencyPer_y=Minden %s. év
@@ -505,9 +511,14 @@ SituationAmount=Situation invoice amount(net)
 SituationDeduction=Situation subtraction
 ModifyAllLines=Minden sor módosítása
 CreateNextSituationInvoice=Create next situation
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=V
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
 NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
@@ -532,3 +543,4 @@ AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/hu_HU/categories.lang b/htdocs/langs/hu_HU/categories.lang
index b5e44aac7ef..85f7e6ab47b 100644
--- a/htdocs/langs/hu_HU/categories.lang
+++ b/htdocs/langs/hu_HU/categories.lang
@@ -16,7 +16,7 @@ MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
-SubCats=Alkategóriák
+SubCats=Sub-categories
 CatList=List of tags/categories
 NewCategory=New tag/category
 ModifCat=Modify tag/category
@@ -85,3 +85,4 @@ CategorieRecursivHelp=If activated, product will also linked to parent category
 AddProductServiceIntoCategory=Add the following product/service
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
+ChooseCategory=Choose category
diff --git a/htdocs/langs/hu_HU/commercial.lang b/htdocs/langs/hu_HU/commercial.lang
index b7d4360249a..e75c2cff966 100644
--- a/htdocs/langs/hu_HU/commercial.lang
+++ b/htdocs/langs/hu_HU/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=Bezár
 ActionAC_EMAILING=Tömeges email küldés
 ActionAC_COM=Vevő rendelésének elküldése levélben
 ActionAC_SHIP=Fuvarlevél küldése levélben
-ActionAC_SUP_ORD=Beszállítói rendelés elküldése levélben
-ActionAC_SUP_INV=Beszállítói számla elküldése levélben
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=Más
 ActionAC_OTH_AUTO=Automatikusan generált események
 ActionAC_MANUAL=Kézzel hozzáadott események
diff --git a/htdocs/langs/hu_HU/companies.lang b/htdocs/langs/hu_HU/companies.lang
index ca828df5ac7..e5b5246d0de 100644
--- a/htdocs/langs/hu_HU/companies.lang
+++ b/htdocs/langs/hu_HU/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Biztosan törölni akarja ezt a kapcsolatot és az összes
 MenuNewThirdParty=Új partner
 MenuNewCustomer=Új vevő
 MenuNewProspect=Új jelentkező
-MenuNewSupplier=Új beszállító
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=Új magánszemély
-NewCompany=Új cég (jelentkező, vevő, szállító)
-NewThirdParty=Új partner (jelentkező, vevő, szállító)
-CreateDolibarrThirdPartySupplier=Parnter (szállító) létrehozása
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=Parnter létrehozása (harmadik fél)
 CreateThirdPartyAndContact=Harmadik fél létrehozása + szülő kapcsolat
 ProspectionArea=Potenciális ​​terület
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=Jelentkezők
 ThirdPartyCustomers=Vevők
 ThirdPartyCustomersStats=Vevők
 ThirdPartyCustomersWithIdProf12=Vevők %s vagy %s
-ThirdPartySuppliers=Beszállítók
+ThirdPartySuppliers=Vendors
 ThirdPartyType=Partner típusa
 Individual=Magánszemély
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
@@ -77,11 +77,11 @@ Web=Web
 Poste= Pozíció
 DefaultLang=Nyelv alapértelmezés szerint
 VATIsUsed=Sales tax is used
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Cím kitöltése a harmadik férl címével
-ThirdpartyNotCustomerNotSupplierSoNoRef=A harmadik fél nem vevő sem szállító, nincs elérhető hivatkozási objektum
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Fizetési bank számla
 OverAllProposals=Javaslatok
 OverAllOrders=Megrendelések
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=RE típus
 TypeLocaltax2ES=IRPF típus
 WrongCustomerCode=Vevőkód érvénytelen
-WrongSupplierCode=Szállító kód érvénytelen
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Vevőkód modell
-SupplierCodeModel=Szállító kód modell
+SupplierCodeModel=Vendor code model
 Gencod=Vonalkód
 ##### Professional ID #####
 ProfId1Short=Szakma ID 1
@@ -267,7 +267,7 @@ Prospect=Jelentkező
 CustomerCard=Vevő-kártya
 Customer=Vevő
 CustomerRelativeDiscount=Relatív vásárlói kedvezmény
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=Relatív kedvezmény
 CustomerAbsoluteDiscountShort=Abszolút kedvezmény
 CompanyHasRelativeDiscount=A vevő alapértelmezett kedvezménye <b>%s%%</b>
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this suppl
 CompanyHasNoAbsoluteDiscount=A vevőnek nincs kedvezménye vagy hitele
 CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
 CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=Nincs
 Supplier=Szállító
 AddContact=Kapcsolat létrehozása
@@ -304,13 +304,13 @@ DeleteACompany=Cég törlése
 PersonalInformations=Személyes adatok
 AccountancyCode=Accounting account
 CustomerCode=Vevőkód
-SupplierCode=Szállító kódja
+SupplierCode=Vendor code
 CustomerCodeShort=Vevőkód
-SupplierCodeShort=Beszállító kódja
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=Vevőkód, egyedi minden vevő számára
-SupplierCodeDesc=Szállító kódja, egyedi minden szolgáltató
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=Kötelező, ha a partner vevő vagy jelentkező
-RequiredIfSupplier=Kötelező, ha harmadik fél a szállító
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=Érvényességi a modulban beállítva
 ThisIsModuleRules=A modul szabályai
 ProspectToContact=Jelentkező a kapcsolat felvételre
@@ -338,7 +338,7 @@ MyContacts=Kapcsolataim
 Capital=Tőke
 CapitalOf=%s tőkéje
 EditCompany=Cég szerkesztése
-ThisUserIsNot=A felhasználó nem jelentkező, vevő vagy szállító
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=Csekk
 VATIntraCheckDesc=A link <b>%s</b> lehetővé teszi, hogy kérje az európai adószám ellenőrzését. Internet kapcsolat szükséges.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -396,7 +396,7 @@ ImportDataset_company_4=Third parties/Sales representatives (Assign sales repres
 PriceLevel=Árszint
 DeliveryAddress=Szállítási cím
 AddAddress=Cím hozzáadása
-SupplierCategory=Szállítói kategória
+SupplierCategory=Vendor category
 JuridicalStatus200=Független
 DeleteFile=Fájl törlése
 ConfirmDeleteFile=Biztosan törölni akarja ezt a fájlt?
@@ -406,7 +406,7 @@ FiscalYearInformation=Információ a pénzügyi évről
 FiscalMonthStart=Pénzügyi év kezdő hónapja
 YouMustAssignUserMailFirst=E-mail értesítő hozzáadásához először létre kell hozni egy e-mail-t ehhez a felhasználóhoz.
 YouMustCreateContactFirst=E-mail értesítő hozzáadásához létre kell hozni egy e-mail kapcsolatot a harmadik félhez.
-ListSuppliersShort=Szállítók listája
+ListSuppliersShort=List of vendors
 ListProspectsShort=Jelenkezők listája
 ListCustomersShort=Vevők listája
 ThirdPartiesArea=Partner és a szerződés helye
@@ -420,7 +420,7 @@ CurrentOutstandingBill=Jelenlegi kintlévőség
 OutstandingBill=Maximális kintlévőség
 OutstandingBillReached=Max. a kintlévőség elért
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Vevőkód a %yymm-nnnn, valamint a szállítókód a %syymm-nnnn szám formátumban, ahol yy év, mm a hónap és nnnn sorfolytonosan növekvő számsor, ami nem lehet nulla.
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=A kód szabad. Ez a kód bármikor módosítható.
 ManagingDirectors=Vezető(k) neve (ügyvezető, elnök, igazgató)
 MergeOriginThirdparty=Duplikált partner (a partnert törlésre kerül)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Kereskedelmi képviselő bejelentkezés
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=Új vásárló vagy beszállító javasolt a megkettőzött kóddal
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/hu_HU/compta.lang b/htdocs/langs/hu_HU/compta.lang
index b88c1a9ce57..67d7fa5b541 100644
--- a/htdocs/langs/hu_HU/compta.lang
+++ b/htdocs/langs/hu_HU/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=Net fizetett
 VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
-VATSummary=Tax Balance
+VATSummary=Tax monthly
+VATBalance=Tax Balance
 VATPaid=Tax paid
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=Számviteli / Treasury területén
 NewPayment=Új fizetési
 Payments=Kifizetések
 PaymentCustomerInvoice=Ügyfél számla fizetési
-PaymentSupplierInvoice=Szállító számla fizetési
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Szociális/költségvetési adó fizetés
 PaymentVat=ÁFA-fizetés
 ListPayment=A fizetési lista
 ListOfCustomerPayments=Ügyfelek fizetési listája
-ListOfSupplierPayments=Listája szállítói kifizetések
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -110,7 +111,7 @@ ShowVatPayment=Mutasd ÁFA fizetési
 TotalToPay=Összes fizetni
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
 CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
 SupplierAccountancyCodeShort=Sup. account. code
 AccountNumber=Számlaszám
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Jelentés a harmadik fél IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
 Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
-ByProductsAndServices=Termékenként és szolgáltatásonként
+ByProductsAndServices=By product and service
 RefExt=Külső hiv
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
 LinkedOrder=Link to order
@@ -215,7 +218,8 @@ Mode1=Method 1
 Mode2=Method 2
 CalculationRuleDesc=Az összes Áfa kiszámítására 2 mód van:<br>1. mód: az Áfa kerekítése soronként, majd összeadva.<br>2. mód: összeadva soronként, majd a végeredmény kerekítve.<br>A végeredményben lehet némi eltérés. Az alapértelmezett: <b>%s</b>.
 CalculationRuleDescSupplier=According to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
@@ -242,3 +246,10 @@ FiscalPeriod=Könyvelési periódus
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/hu_HU/dict.lang b/htdocs/langs/hu_HU/dict.lang
index 10a6f2b248b..5ebdcb117fa 100644
--- a/htdocs/langs/hu_HU/dict.lang
+++ b/htdocs/langs/hu_HU/dict.lang
@@ -5,7 +5,8 @@ CountryIT=Olaszország
 CountryES=Spanyolország
 CountryDE=Németország
 CountryCH=Svájc
-CountryGB=Nagy-Britannia
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=Egyesült Királyság
 CountryUK=Egyesült Királyság
 CountryIE=Írország
 CountryCN=Kína
diff --git a/htdocs/langs/hu_HU/ecm.lang b/htdocs/langs/hu_HU/ecm.lang
index 2c3576f77c6..cb69e810476 100644
--- a/htdocs/langs/hu_HU/ecm.lang
+++ b/htdocs/langs/hu_HU/ecm.lang
@@ -39,9 +39,10 @@ ShowECMSection=Könyvtár mutatása
 DeleteSection=Könyvtár eltávolítása
 ConfirmDeleteSection=Kérem erősítse meg, valóban törli a <b>%s</b> könyvtárat ?
 ECMDirectoryForFiles=Relatív könyvtár a fájlokhoz
-CannotRemoveDirectoryContainsFiles=Az eltvolítás nem lehetséges amig tartalmaz fájlokat
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=Fájl kezelő
-ECMSelectASection=Válasszon könyvtárat a bal oldali fából...
+ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
diff --git a/htdocs/langs/hu_HU/errors.lang b/htdocs/langs/hu_HU/errors.lang
index 0a254aeb7a4..ba547724e50 100644
--- a/htdocs/langs/hu_HU/errors.lang
+++ b/htdocs/langs/hu_HU/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Bar code required
 ErrorCustomerCodeAlreadyUsed=Ügyfélkód már használatban
 ErrorBarCodeAlreadyUsed=Bar code already used
 ErrorPrefixRequired=Előtag szükséges
-ErrorBadSupplierCodeSyntax=A beszállító kód szintaxisa rossz
-ErrorSupplierCodeRequired=Beszállító kód szükséges
-ErrorSupplierCodeAlreadyUsed=Beszállító kód már használatban
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Hibás paraméterek
 ErrorBadValueForParameter=A '%s' érték nem megfelelő a '%s' paraméter számára
 ErrorBadImageFormat=A képfájl formátuma nem támogatott (A PHP nem támogatja ilyen formátumú képek konverzióját)
@@ -87,7 +87,7 @@ ErrorsOnXLines=<b>%s</b> hibák forrása vonalak
 ErrorFileIsInfectedWithAVirus=A víruskereső program nem tudta érvényesíteni a fájl (file lehet megfertőzte egy vírus)
 ErrorSpecialCharNotAllowedForField=Speciális karakterek használata nem engedélyezett területen &quot;%s&quot;
 ErrorNumRefModel=A referencia létezik az adatbázis (%s), és nem kompatibilis ezzel a számozással a szabály. Vegye rekord vagy átnevezték hivatkozással, hogy aktiválja ezt a modult.
-ErrorQtyTooLowForThisSupplier=Mennyiség túl alacsony ehhez a szállító vagy nincs ár megadva a termék erre a szállító
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Hiba a maszk
 ErrorBadMaskFailedToLocatePosOfSequence=Hiba, maszk sorozatszám nélkül
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
-ErrorSupplierCountryIsNotDefined=A beszállító országa nincs meghatárzova. Először ezt javítsa ki.
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
diff --git a/htdocs/langs/hu_HU/install.lang b/htdocs/langs/hu_HU/install.lang
index d02add80516..17cd26ff08b 100644
--- a/htdocs/langs/hu_HU/install.lang
+++ b/htdocs/langs/hu_HU/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=<b>%s</b> konfigurációs fájl NEM l
 ConfFileCouldBeCreated=<b>%s</b> konfigurációs fájl létrehozható.
 ConfFileIsNotWritable=<b>%s</b> konfigurációs fájl NEM írható. Ellenõrizze a jogosúltságokat. Elsõ telepítés esetén, a web szervernek tudnia kell írni ebbe a fájlba a konfigurációs folyamat során (Unix alapu rendszer esetén "chmod 666").
 ConfFileIsWritable=<b>%s</b> konfigurációs fájl írható.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Minden újratöltése információt konfigurációs fájlban.
 PHPSupportSessions=Ez a PHP verzió támogatja a munkameneteket.
 PHPSupportPOSTGETOk=Ez a PHP verzió támogatja POST és GET változókat.
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Nem tudta létrehozni a Dolibarr rendszergazda fiókot.
 WarningRemoveInstallDir=Figyelem, biztonsági okok miatt, amint végez a telepítés/frissítés folyamattal, annak véletlenszerű indításának elkerülésére adja hozzá az <b>install.lock<b> filet a Dollibar dokumentum könyvtárba, hogy elkerülje annak indítását.
 FunctionNotAvailableInThisPHP=Nem elérhetõ ezen a PHP verzión
 ChoosedMigrateScript=Migrációs szkript választása
-DataMigration=Adat migráció
-DatabaseMigration=Struktúra adatbázis migráció
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Szkript feldolhozása
 ChooseYourSetupMode=Válassta ki a telepítési módot és kattintson a "START"-ra...
 FreshInstall=Friss telepítés
@@ -146,7 +147,7 @@ NothingToDo=Nothing to do
 # upgrade
 MigrationFixData=Fix denormalizált adatra
 MigrationOrder=Ügyfél rendelések migrációja
-MigrationSupplierOrder=Beszállítói rendelések migrációja
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Üzleti ajánlatok migrációja
 MigrationInvoice=Ügyfél számlák migrációja
 MigrationContract=Szerzõdések migrációja
@@ -196,6 +197,8 @@ MigrationEvents=Az események migrálásához az események tulajdonosát be kel
 MigrationEventsContact=Migration of events to add event contact into assignement table
 MigrationRemiseEntity=Üres mező érték frissítése: llx_societe_remise
 MigrationRemiseExceptEntity=Üres mező érték frissítése: llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
 MigrationReloadModule=Modul újratöltése %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 ShowNotAvailableOptions=Nem elérhető opciók mutatása
diff --git a/htdocs/langs/hu_HU/ldap.lang b/htdocs/langs/hu_HU/ldap.lang
index 6c41bf4f1de..18934b59b99 100644
--- a/htdocs/langs/hu_HU/ldap.lang
+++ b/htdocs/langs/hu_HU/ldap.lang
@@ -1,12 +1,11 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Jelszó a domain-hez
 YouMustChangePassNextLogon=<b>%s</b> felhasználó jelszavát a <b>%s</b> domain-ben meg kell változtatni.
 UserMustChangePassNextLogon=%s domainben a felhasználónak meg kell változtatnia a jelszavát.
 LDAPInformationsForThisContact=Információ a kapcsolatról az LDAP adatbázisban
 LDAPInformationsForThisUser=Információ a felhasználóról az LDAP adatbázisban
 LDAPInformationsForThisGroup=Információ a csoportról az LDAP adatbázisban
 LDAPInformationsForThisMember=Információ a tagról az LDAP adatbázisban
-LDAPInformationsForThisMemberType=Information in LDAP database for this member type
+LDAPInformationsForThisMemberType=A tag típusáról elérhető LDAP információ
 LDAPAttributes=LDAP attributumok
 LDAPCard=LDAP kártya
 LDAPRecordNotFound=Rekord nem található az LDAP adatbázisban
@@ -14,14 +13,15 @@ LDAPUsers=Felhasználók az LDAP adatbázisban
 LDAPFieldStatus=Állapot
 LDAPFieldFirstSubscriptionDate=Első feliratkozási dátum
 LDAPFieldFirstSubscriptionAmount=Első feliratkozási mennyiség
-LDAPFieldLastSubscriptionDate=Utolsó feliratkozási dátum
-LDAPFieldLastSubscriptionAmount=Utolsó feliratkozási mennyiség
+LDAPFieldLastSubscriptionDate=Utolsó feliratkozás ideje
+LDAPFieldLastSubscriptionAmount=Utolsó feliratkozás mennyisége
 LDAPFieldSkype=Skype név
 LDAPFieldSkypeExample=Például: Skype név
 UserSynchronized=Felhasználó szinkronizálva
 GroupSynchronized=Csoport szinkronizálva
 MemberSynchronized=Tag szinkronizálva
-MemberTypeSynchronized=Member type synchronized
+MemberTypeSynchronized=A tag típusa szinkronizálva
 ContactSynchronized=Kapcsolat szinkronizálva
 ForceSynchronize=Eröltetett szinkronizáció Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Nem sikerült olvasni az LDAP adatbázist. Ellenőrizze az LDAP modul beállítását és az adatbázis hozzáférhetőségét.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/hu_HU/loan.lang b/htdocs/langs/hu_HU/loan.lang
index b4b8daa2e4a..9c8cfd6e4e2 100644
--- a/htdocs/langs/hu_HU/loan.lang
+++ b/htdocs/langs/hu_HU/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=Tőke
 Insurance=Insurance
 Interest=Interest
 Nbterms=Number of terms
+Term=Term
 LoanAccountancyCapitalCode=Accounting account capital
 LoanAccountancyInsuranceCode=Accounting account insurance
 LoanAccountancyInterestCode=Accounting account interest
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=Confirm deleting this loan
 LoanDeleted=Loan Deleted Successfully
 ConfirmPayLoan=Confirm classify paid this loan
 LoanPaid=Loan Paid
-# Calc
-LoanCalc=Bank Loans Calculator
-PurchaseFinanceInfo=Purchase & Financing Information
-SalePriceOfAsset=Sale Price of Asset
-PercentageDown=Percentage Down
-LengthOfMortgage=Duration of loan
-AnnualInterestRate=Annual Interest Rate
-ExplainCalculations=Explain Calculations
-ShowMeCalculationsAndAmortization=Show me the calculations and amortization
-MortgagePaymentInformation=Mortgage Payment Information
-DownPayment=Down Payment
-DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
-InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
-MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
-MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
-MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
-MonthlyPaymentDesc=The montly payment is figured out using the following formula
-AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
-AmountFinanced=Amount Financed
-AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
-Totalsforyear=Totals for year
-MonthlyPayment=Monthly Payment
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
-GoToInterest=%s will go towards INTEREST
-GoToPrincipal=%s will go towards PRINCIPAL
-YouWillSpend=You will spend %s in year %s
 ListLoanAssociatedProject=List of loan associated with the project
 AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Interest
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-FinancialCommitment=Financial commitment
 CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/langs/hu_HU/mails.lang b/htdocs/langs/hu_HU/mails.lang
index a10d9fded7e..d14e977927e 100644
--- a/htdocs/langs/hu_HU/mails.lang
+++ b/htdocs/langs/hu_HU/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Küldő
 MailErrorsTo=Hiba küldése ide
 MailReply=Válasz cím
 MailTo=Fogadó(k)
+MailToUsers=To user(s)
 MailCC=Másolat ide
+MailToCCUsers=Copy to users(s)
 MailCCC=Eltárol másolat ide
 MailTopic=eMail Téma
 MailText=Üzenet
@@ -164,4 +166,4 @@ InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/hu_HU/main.lang b/htdocs/langs/hu_HU/main.lang
index f76aa73c216..e6065284f55 100644
--- a/htdocs/langs/hu_HU/main.lang
+++ b/htdocs/langs/hu_HU/main.lang
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr hitelesítési mód beél
 Administrator=Rendszergazda
 Undefined=Nincs definiálva
 PasswordForgotten=Elfelejtett jelszó ?
+NoAccount=No account?
 SeeAbove=Lásd feljebb
 HomeArea=Nyitólap
 LastConnexion=Legutóbbi csatlakozás
@@ -231,7 +232,7 @@ Limit=Határ
 Limits=Határok
 Logout=Kijelentkezés
 NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Kapcsolat
+Connection=Bejelentkezés
 Setup=Beállítás
 Alert=Figyelmeztetés
 MenuWarnings=Figyelmeztetések
@@ -402,6 +403,7 @@ DefaultTaxRate=Default tax rate
 Average=Átlag
 Sum=Szumma
 Delta=Delta
+RemainToPay=Remain to pay
 Module=Modul/Alkalmazás
 Modules=Modulok/alkalmazások
 Option=Opció
@@ -414,7 +416,7 @@ Favorite=Kedvenc
 ShortInfo=Info.
 Ref=Ref.
 ExternalRef=Külső hivatkozás
-RefSupplier=Beszállító Ref.
+RefSupplier=Ref. vendor
 RefPayment=Fizetési Ref.
 CommercialProposalsShort=Üzleti ajánlatok
 Comment=Megjegyzés
@@ -493,7 +495,7 @@ Received=Kapott
 Paid=Fizetett
 Topic=Tárgy
 ByCompanies=Harmadik fél által
-ByUsers=Felashználó által
+ByUsers=By user
 Links=Linkek
 Link=Link
 Rejects=Selejtek
@@ -619,9 +621,9 @@ BuildDoc=Dokumentum generálása
 Entity=Környezet
 Entities=Entitások
 CustomerPreview=Ügyfél előnézet
-SupplierPreview=Beszállító előnézet
+SupplierPreview=Vendor preview
 ShowCustomerPreview=Ügyfél előnézet mutatása
-ShowSupplierPreview=Beszállító előnézet mutatása
+ShowSupplierPreview=Show vendor preview
 RefCustomer=Ügyfél Ref.
 Currency=Pénznem
 InfoAdmin=Információ adminisztrátorok számára
@@ -679,7 +681,7 @@ Color=Szín
 Documents=Kapcsolt fájlok
 Documents2=Dokumentumok
 UploadDisabled=Feltöltés kikapcsolva
-MenuAccountancy=Accountancy
+MenuAccountancy=Könyvelés
 MenuECM=Dokumentumok
 MenuAWStats=AWStats
 MenuMembers=Tagok
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=Termékek vagy Szolgáltatások
 SearchIntoProjects=Projektek
 SearchIntoTasks=Tennivalók
 SearchIntoCustomerInvoices=Ügyfél számlák
-SearchIntoSupplierInvoices=Beszállítói számlák
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Ügyfél megrendelések
-SearchIntoSupplierOrders=Beszállítói megrendelések
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=Ügyfél ajánlatok
-SearchIntoSupplierProposals=Beszállítói ajánlatok
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Beavatkozások
 SearchIntoContracts=Szerződések
 SearchIntoCustomerShipments=Vásárlói kiszállítások
@@ -941,3 +943,5 @@ Remote=Remote
 LocalAndRemote=Local and Remote
 KeyboardShortcut=Keyboard shortcut
 AssignedTo=Hozzárendelve
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/hu_HU/margins.lang b/htdocs/langs/hu_HU/margins.lang
index f483e1a3ec6..634fb7c4ec2 100644
--- a/htdocs/langs/hu_HU/margins.lang
+++ b/htdocs/langs/hu_HU/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=As a service
 UseDiscountOnTotal=On subtotal
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
 MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best supplier price
+MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Cost price
 UnitCharges=Unit charges
 Charges=Charges
diff --git a/htdocs/langs/hu_HU/members.lang b/htdocs/langs/hu_HU/members.lang
index 6027b2e0c2d..5b4a25ce28c 100644
--- a/htdocs/langs/hu_HU/members.lang
+++ b/htdocs/langs/hu_HU/members.lang
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
diff --git a/htdocs/langs/hu_HU/opensurvey.lang b/htdocs/langs/hu_HU/opensurvey.lang
index 14812e688af..d5353fae0fb 100644
--- a/htdocs/langs/hu_HU/opensurvey.lang
+++ b/htdocs/langs/hu_HU/opensurvey.lang
@@ -58,3 +58,4 @@ MoreChoices=Enter more choices for the voters
 SurveyExpiredInfo=The poll has been closed or voting delay has expired.
 EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
 ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/hu_HU/orders.lang b/htdocs/langs/hu_HU/orders.lang
index b7ea7643381..f415eb0f8f9 100644
--- a/htdocs/langs/hu_HU/orders.lang
+++ b/htdocs/langs/hu_HU/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Vevők megrendelései
-SuppliersOrdersArea=Beszállítói rendelések
+SuppliersOrdersArea=Purchase orders area
 OrderCard=Megrendelőlap
 OrderId=Megrendelés azonosító
 Order=Megrendelés
@@ -13,18 +13,18 @@ OrderToProcess=Feldolgozandó megrendelés
 NewOrder=Új megbízás
 ToOrder=Rendelés készítése
 MakeOrder=Rendelés készítése
-SupplierOrder=Beszállítói megrendelés
-SuppliersOrders=Beszállítói megrendelések
-SuppliersOrdersRunning=Jelenlegi beszállító megrendelések
-CustomerOrder=Vevői megrendelés
-CustomersOrders=Vevők megrendelései
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=Az ügyfelek érdekében
+CustomersOrders=Vevői megrendelések
 CustomersOrdersRunning=Jelenlegi vevő megrendelései
 CustomersOrdersAndOrdersLines=Vevői megrendelések és megrendelés sorok
 OrdersDeliveredToBill=Kézbesített számlázandó vevő megrendelések
 OrdersToBill=Kézbesített vevő megrendelések
 OrdersInProcess=Folyamatban lévő vevő megrendelések
 OrdersToProcess=Feldolgozandó vevő megrendelések
-SuppliersOrdersToProcess=Feldolgozandó beszállítói megrendelések
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=Visszavonva
 StatusOrderDraftShort=Tervezet
 StatusOrderValidatedShort=Hitelesítve
@@ -75,15 +75,15 @@ ShowOrder=Megrendelés mutatása
 OrdersOpened=Feldolgozandó megrendelések
 NoDraftOrders=Nincsenek megrendelés tervek
 NoOrder=Nincs megrendelés
-NoSupplierOrder=Nincs beszállítói megrendelés
+NoSupplierOrder=No purchase order
 LastOrders=Utolsó %s vevői megrendelések
 LastCustomerOrders=Utolsó %s vevői megrendelések
-LastSupplierOrders=Legutóbbi %s vevői megrendelések
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=Utolsó %s módosított megrendelések
 AllOrders=Minden megrendelés
 NbOfOrders=Megrendelések száma
 OrdersStatistics=Rendelési statisztikák
-OrdersStatisticsSuppliers=Beszállító rendelési statisztikák
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Megrendelések száma havonta
 AmountOfOrdersByMonthHT=Megrendelések összege havonta (nettó)
 ListOfOrders=Megrendelések listája
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Biztosan megerősíti a <b>%s</b> számú megrendelést?
 GenerateBill=Számla generálása
 ClassifyShipped='Kézbesített'-ként megjelöl
 DraftOrders=Megrendelés tervezetek
-DraftSuppliersOrders=Beszállítói megrendelés tervek
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=Folyamatban lévő megrendelések
 RefOrder=Megrendelés ref.
 RefCustomerOrder=Ügyfél megrendelés hiv.
-RefOrderSupplier=Beszállítói megrendelés hiv.
-RefOrderSupplierShort=Hiv. beszállítói megrendelés
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=A megrendelés elküldése levélben
 ActionsOnOrder=Megrendelés eseményei
 NoArticleOfTypeProduct=Nincs termék a megrendelésben, így nincs mit kiszállítani
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Biztosan klónozni szeretné ezt a <b>%s</b> megrendelést?
 DispatchSupplierOrder=Beszállítói megrendelés %s fogadása
 FirstApprovalAlreadyDone=Első jóváhagyás már elvégezve
 SecondApprovalAlreadyDone=Másod jóváhagyás már elvégezve
-SupplierOrderReceivedInDolibarr=Beszállítói megrendelés %s megérkezett %s
-SupplierOrderSubmitedInDolibarr=Beszállítói megrendelés %s küldve
-SupplierOrderClassifiedBilled=Beszállítói megrendelés %s számlázandóra állítva
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Egyéb megrendelések
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Reprezentatív nyomon követése az ügyfelek érdekében
@@ -125,11 +125,11 @@ TypeContact_commande_internal_SHIPPING=Képviselő-up a következő hajózási
 TypeContact_commande_external_BILLING=Vevő számlázási cím
 TypeContact_commande_external_SHIPPING=Vevő szállítási cím
 TypeContact_commande_external_CUSTOMER=Vevő megrendelés nyomon követési kapcsolat
-TypeContact_order_supplier_internal_SALESREPFOLL=Képviselő nyomon követi a beszállító megrendelést
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Képviselő nyomon követi a szállítást
-TypeContact_order_supplier_external_BILLING=Beszállító számlázási cím
-TypeContact_order_supplier_external_SHIPPING=Beszállító szállítási cím
-TypeContact_order_supplier_external_CUSTOMER=Vevő kapcsolata megrendelés nyomon követése érdekében
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Állandó COMMANDE_SUPPLIER_ADDON nincs definiálva
 Error_COMMANDE_ADDON_NotDefined=Állandó COMMANDE_ADDON nincs definiálva
 Error_OrderNotChecked=Nincs megrendelés kiválasztva
diff --git a/htdocs/langs/hu_HU/other.lang b/htdocs/langs/hu_HU/other.lang
index 965fd5825b0..59b3d1a700a 100644
--- a/htdocs/langs/hu_HU/other.lang
+++ b/htdocs/langs/hu_HU/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=Fájlok túl nagy
 PleaseBePatient=Kerjük legyen türelemmel...
 NewPassword=New password
 ResetPassword=Reset password
-RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
@@ -233,6 +233,8 @@ PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=Az export területén
 AvailableFormats=Elérhető formátumok
diff --git a/htdocs/langs/hu_HU/productbatch.lang b/htdocs/langs/hu_HU/productbatch.lang
index 4c09f11dac7..6ba8d2aef98 100644
--- a/htdocs/langs/hu_HU/productbatch.lang
+++ b/htdocs/langs/hu_HU/productbatch.lang
@@ -16,7 +16,7 @@ printEatby=Eat-by: %s
 printSellby=Sell-by: %s
 printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic increase/decrease stock mode is forced to shipping validate and manual dispatching for reception and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
 ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
diff --git a/htdocs/langs/hu_HU/products.lang b/htdocs/langs/hu_HU/products.lang
index d28377946c5..70cc062c12c 100644
--- a/htdocs/langs/hu_HU/products.lang
+++ b/htdocs/langs/hu_HU/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=Új ár
 MinPrice=Min. eladási ár
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=Az eladási ár nem lehet kisebb a minimum árnál (nettó %s)
 ContractStatusClosed=Lezárva
 ErrorProductAlreadyExists=Egy terméke ezzel a referenciával %s már létezik.
@@ -155,7 +156,7 @@ BuyingPrices=Vételi árak
 CustomerPrices=Végfelhasználói árak
 SuppliersPrices=Beszállítói árak
 SuppliersPricesOfProductsOrServices=Beszállítói árak (termék vagy szolgáltatás)
-CustomCode=Customs/Commodity/HS code
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=Származási ország
 Nature=Természet
 ShortLabel=Rövid címke
diff --git a/htdocs/langs/hu_HU/projects.lang b/htdocs/langs/hu_HU/projects.lang
index b82ed0d3565..0ee107e086d 100644
--- a/htdocs/langs/hu_HU/projects.lang
+++ b/htdocs/langs/hu_HU/projects.lang
@@ -77,6 +77,7 @@ Time=Idő
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=A projekthez tartozó kereskedelmi ajánlatok listája
 ListOrdersAssociatedProject=List of customer orders associated with the project
@@ -226,4 +227,4 @@ AllowCommentOnProject=Allow user comments on projects
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/hu_HU/stocks.lang b/htdocs/langs/hu_HU/stocks.lang
index 7e6d0bb0a25..b7286afb854 100644
--- a/htdocs/langs/hu_HU/stocks.lang
+++ b/htdocs/langs/hu_HU/stocks.lang
@@ -203,3 +203,4 @@ RegulateStock=Regulate Stock
 ListInventory=Lista
 StockSupportServices=Stock management support services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/hu_HU/stripe.lang b/htdocs/langs/hu_HU/stripe.lang
index 3f7283c96e9..f6ea6fe1f81 100644
--- a/htdocs/langs/hu_HU/stripe.lang
+++ b/htdocs/langs/hu_HU/stripe.lang
@@ -58,8 +58,8 @@ NameOnCard=Name on card
 CardNumber=Card Number
 ExpiryDate=Expiry Date
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/hu_HU/supplier_proposal.lang b/htdocs/langs/hu_HU/supplier_proposal.lang
index 55ff95432e3..bfabf30ac11 100644
--- a/htdocs/langs/hu_HU/supplier_proposal.lang
+++ b/htdocs/langs/hu_HU/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Supplier commercial proposals
-supplier_proposalDESC=Manage price requests to suppliers
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
 SupplierProposalNew=New price request
 CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
-SupplierProposalsDraft=Draft supplier proposals
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=Latest %s modified price requests
 RequestsOpened=Open price requests
-SupplierProposalArea=Supplier proposals area
-SupplierProposalShort=Supplier proposal
-SupplierProposals=Beszállítói ajánlatok
-SupplierProposalsShort=Beszállítói ajánlatok
+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=Supplier ref
+SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=Kézbesítés dátuma
 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>?
@@ -47,9 +47,9 @@ CommercialAsk=Price request
 DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposals=List of supplier proposal requests
-ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
-SupplierProposalsToClose=Supplier proposals to close
-SupplierProposalsToProcess=Supplier proposals to process
+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
diff --git a/htdocs/langs/hu_HU/suppliers.lang b/htdocs/langs/hu_HU/suppliers.lang
index 6c6d2ae1525..8563391e10e 100644
--- a/htdocs/langs/hu_HU/suppliers.lang
+++ b/htdocs/langs/hu_HU/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Beszállítók
-SuppliersInvoice=Beszállítói számla
-ShowSupplierInvoice=Beszállító számlák megmutatása
-NewSupplier=Új beszállító
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=Történet
-ListOfSuppliers=Beszállítók listája
-ShowSupplier=Bzállító mutatása
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=Megrendelés dátuma
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Néhány altermékhez nincs ár megadva
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
-SupplierPrices=Beszállítói árak
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Ez a beszállító már hozzá van rendelve van ehhez az azonosítóhoz: %s
-NoRecordedSuppliers=Nincs beszállító bejegyezve
-SupplierPayment=Beszállítói kifizetése
-SuppliersArea=Beszállítói terület
-RefSupplierShort=Beszállítói Ref.
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=Elérhetőség
-ExportDataset_fournisseur_1=Beszállítói számla lista és számla sorok
-ExportDataset_fournisseur_2=Beszállítói számlák és kifizetések
-ExportDataset_fournisseur_3=Beszállítói rendelések és beszerzési tételsorok
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=Beszerzési megrendelés jóváhagyása
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Megrendelés elutasítása
 ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
 ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
-AddSupplierOrder=Beszállítói megrendelés létrehozása
-AddSupplierInvoice=Beszállítói számla létrehozása
-ListOfSupplierProductForSupplier=<b>%s</b> beszállító termékeinek és árainak listái
-SentToSuppliers=Küldés a beszállítónak
-ListOfSupplierOrders=Beszállítói rendelések listája
-MenuOrdersSupplierToBill=Beszállítói rendelések számlázáshoz
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Beszállítási késedelem napokban
 DescNbDaysToDelivery=A megrendelésben lévő termékek legnagyobb késedelme.
-SupplierReputation=Supplier reputation
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
 AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=Beszállítói árak
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/hu_HU/website.lang b/htdocs/langs/hu_HU/website.lang
index b895e197382..bae417c085c 100644
--- a/htdocs/langs/hu_HU/website.lang
+++ b/htdocs/langs/hu_HU/website.lang
@@ -73,7 +73,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
diff --git a/htdocs/langs/hu_HU/workflow.lang b/htdocs/langs/hu_HU/workflow.lang
index 5b3ebd02942..ab187e8ee80 100644
--- a/htdocs/langs/hu_HU/workflow.lang
+++ b/htdocs/langs/hu_HU/workflow.lang
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source custome
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/id_ID/accountancy.lang b/htdocs/langs/id_ID/accountancy.lang
index 077b9fc9f8e..aeb63e6101c 100644
--- a/htdocs/langs/id_ID/accountancy.lang
+++ b/htdocs/langs/id_ID/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Akuntansi
 ACCOUNTING_EXPORT_SEPARATORCSV=Kolom pemisah untuk ekspor data
 ACCOUNTING_EXPORT_DATE=Format tanggal untuk ekspor data
 ACCOUNTING_EXPORT_PIECE=Ekspor jumlah potongan
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Accounts with non zero values
 ListOfAccounts=List of accounts
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers 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
 
-AccountancyArea=Accountancy area
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
 AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
@@ -89,7 +90,7 @@ MenuProductsAccounts=Product accounts
 ProductsBinding=Products accounts
 Ventilation=Binding to accounts
 CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Supplier invoice binding
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=Jurnal Pembelian
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Jurnal lain-lain
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Jurnal Sosial
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
 ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
@@ -185,11 +187,12 @@ ListeMvts=List of movements
 ErrorDebitCredit=Debet dan Kredit tidak boleh ada nilai di saat yg sama
 AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
-DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=Daftar akun-akun akunting
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Group of account
 Pcgsubtype=Subgroup of account
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
 ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
 DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report 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 fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Kesalahan, Anda tidak dapat menghapus akun akuntansi ini karena digunakan
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -293,4 +296,9 @@ Binded=Lines bound
 ToBind=Lines to bind
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang
index 4c86133a8cc..3fc6960faa3 100644
--- a/htdocs/langs/id_ID/admin.lang
+++ b/htdocs/langs/id_ID/admin.lang
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems)
 MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=Metode Pengiriman EMails
 MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
 MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
@@ -291,7 +292,7 @@ ModuleSetup=Setup Modul
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=Sistem
 ModuleFamilyCrm=Customer Relation Management (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projects/Collaborative work
@@ -373,7 +374,8 @@ NoSmsEngine=No SMS sender manager available. SMS sender manager are not installe
 PDF=PDF
 PDFDesc=You can set each global options related to the PDF generation
 PDFAddressForging=Rules to forge address boxes
-HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=Hide products description on generated PDF
@@ -445,7 +447,8 @@ DisplayCompanyInfo=Display company address
 DisplayCompanyManagers=Display manager names
 DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party 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.
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Set this to 1 if you want to attach main document to emai
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=Pengguna & Grup
 Module0Desc=Users / Employees and Groups management
@@ -479,7 +485,7 @@ Module1Desc=Companies and contact management (customers, prospects...)
 Module2Name=Komersil
 Module2Desc=Commercial management
 Module10Name=Akunting
-Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching.
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=Proposal
 Module20Desc=Commercial proposal management
 Module22Name=Mass E-mailings
@@ -546,8 +552,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
-Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Payment of employee wages
 Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
@@ -561,14 +567,14 @@ Module700Name=Sumbangan
 Module700Desc=Donation management
 Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Mantis integration
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
 Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
 Module2200Name=Dynamic Prices
@@ -576,7 +582,7 @@ Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Scheduled jobs
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API/Web services (SOAP server)
@@ -613,7 +619,7 @@ Module50100Desc=Point of sales module (POS).
 Module50200Name=Paypal
 Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Poll, Survey or Vote
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed memb
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=Other menu entries manage optional parameters.
 LogEvents=Security audit events
 Audit=Audit
@@ -1054,8 +1060,9 @@ LogEventDesc=You can enable here the logging for Dolibarr security events. Admin
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1188,11 +1195,11 @@ UserMailRequired=EMail required to create a new user
 HRMSetup=HRM module setup
 ##### Company setup #####
 CompanySetup=Companies module setup
-CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier)
-AccountCodeManager=Module for accounting code generation (customer or supplier)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
 NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
 ModelModules=Documents templates
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
@@ -1203,6 +1210,9 @@ MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
 TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=Free text on commercial proposals
 WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
 ##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=Order management setup
 OrdersNumberingModules=Orders numbering models
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe
 OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
 OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
 ##### Stock #####
-StockSetup=Warehouse module setup
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
 ##### Menu #####
 MenuDeleted=Menu deleted
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
 MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
 SuppliersSetup=Supplier module setup
-SuppliersCommandModel=Complete template of supplier order (logo...)
-SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","
 SalariesSetup=Setup of module salaries
 SortOrder=Sort order
 Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Install of external module from applic
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
-TextTitleColor=Color of page title
+TextTitleColor=Text color of Page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=Background color for Top menu
 TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
 ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-MailToMember=To send email from member page
-MailToUser=To send email from user page
-MailToProject= To send email from project page
+MailToSendProposal=Customer proposals
+MailToSendOrder=Customer orders
+MailToSendInvoice=Customer invoices
+MailToSendShipment=Pengiriman
+MailToSendIntervention=Interventions
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Contracts
+MailToThirdparty=Pihak Ketiga
+MailToMember=Anggota
+MailToUser=Users
+MailToProject=Projects page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1780,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/id_ID/bills.lang b/htdocs/langs/id_ID/bills.lang
index 125f8cd1d52..78ff6d7db2f 100644
--- a/htdocs/langs/id_ID/bills.lang
+++ b/htdocs/langs/id_ID/bills.lang
@@ -109,7 +109,7 @@ CancelBill=Batalkan tagihan
 SendRemindByMail=Kirim pengingat ke surel / email
 DoPayment=Enter payment
 DoPaymentBack=Enter refund
-ConvertToReduc=Ubah kedalam diskon untuk selanjutnya
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Masukkan pembayaran yang diterima dari pelanggan
@@ -120,7 +120,7 @@ BillStatus=Status tagihan
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Konsep (harus di validasi)
 BillStatusPaid=Dibayar
-BillStatusPaidBackOrConverted=Credit note refund or converted into discount
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Diabaikan
 BillStatusValidated=Sudah divalidasi (harus sudah dibayar)
@@ -296,10 +296,10 @@ DiscountType=Discount type
 NoteReason=Note/Reason
 ReasonDiscount=Reason
 DiscountOfferedBy=Granted by
-DiscountStillRemaining=Discounts available
-DiscountAlreadyCounted=Discounts already consumed
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+SupplierDiscounts=Vendors discounts
 BillAddress=Bill address
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Every %s days
 FrequencyPer_m=Every %s months
 FrequencyPer_y=Every %s years
@@ -505,9 +511,14 @@ SituationAmount=Situation invoice amount(net)
 SituationDeduction=Situation subtraction
 ModifyAllLines=Modify all lines
 CreateNextSituationInvoice=Create next situation
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=S
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
 NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
@@ -532,3 +543,4 @@ AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/id_ID/categories.lang b/htdocs/langs/id_ID/categories.lang
index 41e5f4e4c13..c0c8d4c0cef 100644
--- a/htdocs/langs/id_ID/categories.lang
+++ b/htdocs/langs/id_ID/categories.lang
@@ -16,7 +16,7 @@ MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
-SubCats=Subcategories
+SubCats=Sub-categories
 CatList=List of tags/categories
 NewCategory=New tag/category
 ModifCat=Modify tag/category
@@ -85,3 +85,4 @@ CategorieRecursivHelp=If activated, product will also linked to parent category
 AddProductServiceIntoCategory=Add the following product/service
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
+ChooseCategory=Choose category
diff --git a/htdocs/langs/id_ID/commercial.lang b/htdocs/langs/id_ID/commercial.lang
index a1a5f0f1588..78f2e0038dd 100644
--- a/htdocs/langs/id_ID/commercial.lang
+++ b/htdocs/langs/id_ID/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=Close
 ActionAC_EMAILING=Send mass email
 ActionAC_COM=Send customer order by mail
 ActionAC_SHIP=Send shipping by mail
-ActionAC_SUP_ORD=Send supplier order by mail
-ActionAC_SUP_INV=Send supplier invoice by mail
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=Lainnya
 ActionAC_OTH_AUTO=Automatically inserted events
 ActionAC_MANUAL=Manually inserted events
diff --git a/htdocs/langs/id_ID/companies.lang b/htdocs/langs/id_ID/companies.lang
index c1757046f26..02fe5871d14 100644
--- a/htdocs/langs/id_ID/companies.lang
+++ b/htdocs/langs/id_ID/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Are you sure you want to delete this contact and all inheri
 MenuNewThirdParty=Pihak Ketiga Baru
 MenuNewCustomer=Pelanggan Baru
 MenuNewProspect=Prospek Baru
-MenuNewSupplier=Pemasok Baru
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=New private individual
-NewCompany=New company (prospect, customer, supplier)
-NewThirdParty=New third party (prospect, customer, supplier)
-CreateDolibarrThirdPartySupplier=Create a third party (supplier)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=Create third party
 CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Prospection area
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=Prospects
 ThirdPartyCustomers=Customers
 ThirdPartyCustomersStats=Customers
 ThirdPartyCustomersWithIdProf12=Customers with %s or %s
-ThirdPartySuppliers=Pemasok
+ThirdPartySuppliers=Vendors
 ThirdPartyType=Third party type
 Individual=Private individual
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
@@ -77,11 +77,11 @@ Web=Web
 Poste= Posisi
 DefaultLang=Language by default
 VATIsUsed=Sales tax is used
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
-ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Proposal
 OverAllOrders=Orders
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=RE Type
 TypeLocaltax2ES=IRPF Type
 WrongCustomerCode=Customer code invalid
-WrongSupplierCode=Supplier code invalid
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Customer code model
-SupplierCodeModel=Supplier code model
+SupplierCodeModel=Vendor code model
 Gencod=Bar code
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
@@ -267,7 +267,7 @@ Prospect=Prospect
 CustomerCard=Customer Card
 Customer=Customer
 CustomerRelativeDiscount=Relative customer discount
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=Relative discount
 CustomerAbsoluteDiscountShort=Absolute discount
 CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this suppl
 CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
 CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
 CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=None
 Supplier=Suplier
 AddContact=Create contact
@@ -304,13 +304,13 @@ DeleteACompany=Delete a company
 PersonalInformations=Personal data
 AccountancyCode=Akun akuntansi
 CustomerCode=Customer code
-SupplierCode=Supplier code
+SupplierCode=Vendor code
 CustomerCodeShort=Customer code
-SupplierCodeShort=Supplier code
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=Customer code, unique for all customers
-SupplierCodeDesc=Supplier code, unique for all suppliers
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=Required if third party is a customer or prospect
-RequiredIfSupplier=Required if third party is a supplier
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=Validity controled by module
 ThisIsModuleRules=This is rules for this module
 ProspectToContact=Prospect to contact
@@ -338,7 +338,7 @@ MyContacts=My contacts
 Capital=Capital
 CapitalOf=Capital of %s
 EditCompany=Edit company
-ThisUserIsNot=This user is not a prospect, customer nor supplier
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=Check
 VATIntraCheckDesc=The link <b>%s</b> allows to ask the european VAT checker service. An external internet access from server is required for this service to work.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -396,7 +396,7 @@ ImportDataset_company_4=Third parties/Sales representatives (Assign sales repres
 PriceLevel=Price level
 DeliveryAddress=Delivery address
 AddAddress=Add address
-SupplierCategory=Supplier category
+SupplierCategory=Vendor category
 JuridicalStatus200=Independent
 DeleteFile=Delete file
 ConfirmDeleteFile=Are you sure you want to delete this file?
@@ -406,7 +406,7 @@ FiscalYearInformation=Information on the fiscal year
 FiscalMonthStart=Starting month of the fiscal year
 YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
 YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
-ListSuppliersShort=Daftar Suplier
+ListSuppliersShort=List of vendors
 ListProspectsShort=List of prospects
 ListCustomersShort=List of customers
 ThirdPartiesArea=Third parties and contact area
@@ -420,7 +420,7 @@ CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/id_ID/compta.lang b/htdocs/langs/id_ID/compta.lang
index 593293bbf7f..b7fb8812484 100644
--- a/htdocs/langs/id_ID/compta.lang
+++ b/htdocs/langs/id_ID/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=Net paid
 VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
-VATSummary=Tax Balance
+VATSummary=Tax monthly
+VATBalance=Tax Balance
 VATPaid=Tax paid
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=Accountancy/Treasury area
 NewPayment=New payment
 Payments=Semua pembayaran
 PaymentCustomerInvoice=Customer invoice payment
-PaymentSupplierInvoice=Supplier invoice payment
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
-ListOfSupplierPayments=List of supplier payments
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -110,7 +111,7 @@ ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
 CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
 SupplierAccountancyCodeShort=Sup. account. code
 AccountNumber=Account number
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
 Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
-ByProductsAndServices=By products and services
+ByProductsAndServices=By product and service
 RefExt=External ref
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
 LinkedOrder=Link to order
@@ -215,7 +218,8 @@ Mode1=Method 1
 Mode2=Method 2
 CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
 CalculationRuleDescSupplier=According to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
@@ -242,3 +246,10 @@ FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/id_ID/dict.lang b/htdocs/langs/id_ID/dict.lang
index 6e90946a98c..4e75c40182c 100644
--- a/htdocs/langs/id_ID/dict.lang
+++ b/htdocs/langs/id_ID/dict.lang
@@ -5,7 +5,8 @@ CountryIT=Italy
 CountryES=Spain
 CountryDE=Germany
 CountryCH=Switzerland
-CountryGB=Great Britain
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=United Kingdom
 CountryUK=United Kingdom
 CountryIE=Ireland
 CountryCN=China
diff --git a/htdocs/langs/id_ID/ecm.lang b/htdocs/langs/id_ID/ecm.lang
index 6ed7ecbcb32..2cd72ef2b91 100644
--- a/htdocs/langs/id_ID/ecm.lang
+++ b/htdocs/langs/id_ID/ecm.lang
@@ -39,9 +39,10 @@ ShowECMSection=Show directory
 DeleteSection=Remove directory
 ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
 ECMDirectoryForFiles=Relative directory for files
-CannotRemoveDirectoryContainsFiles=Removed not possible because it contains some files
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=File manager
-ECMSelectASection=Select a directory on left tree...
+ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
diff --git a/htdocs/langs/id_ID/errors.lang b/htdocs/langs/id_ID/errors.lang
index ec036b28bc5..0ca7488b8cb 100644
--- a/htdocs/langs/id_ID/errors.lang
+++ b/htdocs/langs/id_ID/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Bar code required
 ErrorCustomerCodeAlreadyUsed=Customer code already used
 ErrorBarCodeAlreadyUsed=Bar code already used
 ErrorPrefixRequired=Prefix required
-ErrorBadSupplierCodeSyntax=Bad syntax for supplier code
-ErrorSupplierCodeRequired=Supplier code required
-ErrorSupplierCodeAlreadyUsed=Supplier code already used
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Bad parameters
 ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
 ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
@@ -87,7 +87,7 @@ ErrorsOnXLines=Errors on <b>%s</b> source record(s)
 ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
 ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s"
 ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
-ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Error on mask
 ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
-ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
diff --git a/htdocs/langs/id_ID/install.lang b/htdocs/langs/id_ID/install.lang
index 1e81d853df5..96c1558a004 100644
--- a/htdocs/langs/id_ID/install.lang
+++ b/htdocs/langs/id_ID/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=File konfigurasi <b>%s</b>  tidak ada
 ConfFileCouldBeCreated=File konfigurasi <b>%s</b>  dapat dibuat
 ConfFileIsNotWritable=File konfigurasi <b>%s</b>  tidak dapat ditulis ulang. Periksa hak akses file. Untuk instalasi pertama kali, web server harus dapat menulisi file tersebut selama proses konfigurasi (sebagai contoh perintah "chmod 666" pada sistem operasi berbasis Unix").
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=memuat ulang semua informasi dari berkas konfigurasi
 PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=PHP ini mendukung variabel POST dan GET
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
 WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called <b>install.lock</b> into Dolibarr document directory, in order to avoid malicious use of it.
 FunctionNotAvailableInThisPHP=Not available on this PHP
 ChoosedMigrateScript=Choose migration script
-DataMigration=Migrasi Data
-DatabaseMigration=Structure database migration
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script processing
 ChooseYourSetupMode=Choose your setup mode and click "Start"...
 FreshInstall=Fresh install
@@ -146,7 +147,7 @@ NothingToDo=Nothing to do
 # upgrade
 MigrationFixData=Fix for denormalized data
 MigrationOrder=Data migration for customer's orders
-MigrationSupplierOrder=Data migration for supplier's orders
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Data migration for commercial proposals
 MigrationInvoice=Data migration for customer's invoices
 MigrationContract=Data migration for contracts
@@ -196,6 +197,8 @@ MigrationEvents=Migration of events to add event owner into assignement table
 MigrationEventsContact=Migration of events to add event contact into assignement table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 ShowNotAvailableOptions=Show not available options
diff --git a/htdocs/langs/id_ID/ldap.lang b/htdocs/langs/id_ID/ldap.lang
index d6360f3e540..abe11602147 100644
--- a/htdocs/langs/id_ID/ldap.lang
+++ b/htdocs/langs/id_ID/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Password for domain
 YouMustChangePassNextLogon=Password for user <b>%s</b> on the domain <b>%s</b> must be changed.
 UserMustChangePassNextLogon=User must change password on the domain %s
 LDAPInformationsForThisContact=Information in LDAP database for this contact
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Member type synchronized
 ContactSynchronized=Contact synchronized
 ForceSynchronize=Force synchronizing Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Failed to read LDAP database. Check LDAP module setup and database accessibility.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/id_ID/loan.lang b/htdocs/langs/id_ID/loan.lang
index 9aae3869cc3..534dee08867 100644
--- a/htdocs/langs/id_ID/loan.lang
+++ b/htdocs/langs/id_ID/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=Capital
 Insurance=Insurance
 Interest=Interest
 Nbterms=Number of terms
+Term=Term
 LoanAccountancyCapitalCode=Accounting account capital
 LoanAccountancyInsuranceCode=Accounting account insurance
 LoanAccountancyInterestCode=Accounting account interest
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=Confirm deleting this loan
 LoanDeleted=Loan Deleted Successfully
 ConfirmPayLoan=Confirm classify paid this loan
 LoanPaid=Loan Paid
-# Calc
-LoanCalc=Bank Loans Calculator
-PurchaseFinanceInfo=Purchase & Financing Information
-SalePriceOfAsset=Sale Price of Asset
-PercentageDown=Percentage Down
-LengthOfMortgage=Duration of loan
-AnnualInterestRate=Annual Interest Rate
-ExplainCalculations=Explain Calculations
-ShowMeCalculationsAndAmortization=Show me the calculations and amortization
-MortgagePaymentInformation=Mortgage Payment Information
-DownPayment=Down Payment
-DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
-InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
-MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
-MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
-MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
-MonthlyPaymentDesc=The montly payment is figured out using the following formula
-AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
-AmountFinanced=Amount Financed
-AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
-Totalsforyear=Totals for year
-MonthlyPayment=Monthly Payment
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
-GoToInterest=%s will go towards INTEREST
-GoToPrincipal=%s will go towards PRINCIPAL
-YouWillSpend=You will spend %s in year %s
 ListLoanAssociatedProject=List of loan associated with the project
 AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Interest
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-FinancialCommitment=Financial commitment
 CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/langs/id_ID/mails.lang b/htdocs/langs/id_ID/mails.lang
index a947035bbb8..1527ff82712 100644
--- a/htdocs/langs/id_ID/mails.lang
+++ b/htdocs/langs/id_ID/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Sender
 MailErrorsTo=Errors to
 MailReply=Reply to
 MailTo=Receiver(s)
+MailToUsers=To user(s)
 MailCC=Copy to
+MailToCCUsers=Copy to users(s)
 MailCCC=Cached copy to
 MailTopic=EMail topic
 MailText=Message
@@ -164,4 +166,4 @@ InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/id_ID/main.lang b/htdocs/langs/id_ID/main.lang
index d06768035f8..472cabe784d 100644
--- a/htdocs/langs/id_ID/main.lang
+++ b/htdocs/langs/id_ID/main.lang
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is se
 Administrator=Administrator
 Undefined=Undefined
 PasswordForgotten=Password forgotten?
+NoAccount=No account?
 SeeAbove=See above
 HomeArea=Home area
 LastConnexion=Latest connection
@@ -231,7 +232,7 @@ Limit=Limit
 Limits=Limits
 Logout=Logout
 NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Connection
+Connection=Login
 Setup=Pengaturan
 Alert=Alert
 MenuWarnings=Alerts
@@ -402,6 +403,7 @@ DefaultTaxRate=Default tax rate
 Average=Average
 Sum=Sum
 Delta=Delta
+RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
@@ -414,7 +416,7 @@ Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
 ExternalRef=Ref. extern
-RefSupplier=Referensi Suplier
+RefSupplier=Ref. vendor
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
 Comment=Comment
@@ -493,7 +495,7 @@ Received=Received
 Paid=Dibayar
 Topic=Subject
 ByCompanies=By third parties
-ByUsers=By users
+ByUsers=By user
 Links=Links
 Link=Link
 Rejects=Rejects
@@ -619,9 +621,9 @@ BuildDoc=Build Doc
 Entity=Environment
 Entities=Entities
 CustomerPreview=Customer preview
-SupplierPreview=Supplier preview
+SupplierPreview=Vendor preview
 ShowCustomerPreview=Show customer preview
-ShowSupplierPreview=Show supplier preview
+ShowSupplierPreview=Show vendor preview
 RefCustomer=Ref. customer
 Currency=Currency
 InfoAdmin=Information for administrators
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=Products or services
 SearchIntoProjects=Projects
 SearchIntoTasks=Tasks
 SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Interventions
 SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
@@ -941,3 +943,5 @@ Remote=Remote
 LocalAndRemote=Local and Remote
 KeyboardShortcut=Keyboard shortcut
 AssignedTo=Ditugaskan untuk
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/id_ID/margins.lang b/htdocs/langs/id_ID/margins.lang
index af89b4a7082..c0703c550e7 100644
--- a/htdocs/langs/id_ID/margins.lang
+++ b/htdocs/langs/id_ID/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=As a service
 UseDiscountOnTotal=On subtotal
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
 MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best supplier price
+MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Cost price
 UnitCharges=Unit charges
 Charges=Charges
diff --git a/htdocs/langs/id_ID/members.lang b/htdocs/langs/id_ID/members.lang
index 5cb7eda64b8..725fed92e62 100644
--- a/htdocs/langs/id_ID/members.lang
+++ b/htdocs/langs/id_ID/members.lang
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
diff --git a/htdocs/langs/id_ID/opensurvey.lang b/htdocs/langs/id_ID/opensurvey.lang
index 87e6a74913a..76684955e56 100644
--- a/htdocs/langs/id_ID/opensurvey.lang
+++ b/htdocs/langs/id_ID/opensurvey.lang
@@ -58,3 +58,4 @@ MoreChoices=Enter more choices for the voters
 SurveyExpiredInfo=The poll has been closed or voting delay has expired.
 EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
 ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/id_ID/orders.lang b/htdocs/langs/id_ID/orders.lang
index 6aef485e335..d2b90b619f0 100644
--- a/htdocs/langs/id_ID/orders.lang
+++ b/htdocs/langs/id_ID/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Customers orders area
-SuppliersOrdersArea=Suppliers orders area
+SuppliersOrdersArea=Purchase orders area
 OrderCard=Order card
 OrderId=Order Id
 Order=Order
@@ -13,18 +13,18 @@ OrderToProcess=Order to process
 NewOrder=New order
 ToOrder=Make order
 MakeOrder=Make order
-SupplierOrder=Supplier order
-SuppliersOrders=Suppliers orders
-SuppliersOrdersRunning=Current suppliers orders
-CustomerOrder=Customer order
-CustomersOrders=Customer orders
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=Customer Order
+CustomersOrders=Pesanan Pelanggan
 CustomersOrdersRunning=Current customer orders
 CustomersOrdersAndOrdersLines=Customer orders and order lines
 OrdersDeliveredToBill=Customer orders delivered to bill
 OrdersToBill=Customer orders delivered
 OrdersInProcess=Customer orders in process
 OrdersToProcess=Customer orders to process
-SuppliersOrdersToProcess=Supplier orders to process
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=Dibatalkan
 StatusOrderDraftShort=Konsep
 StatusOrderValidatedShort=Divalidasi
@@ -75,15 +75,15 @@ ShowOrder=Show order
 OrdersOpened=Orders to process
 NoDraftOrders=No draft orders
 NoOrder=No order
-NoSupplierOrder=No supplier order
+NoSupplierOrder=No purchase order
 LastOrders=Latest %s customer orders
 LastCustomerOrders=Latest %s customer orders
-LastSupplierOrders=Latest %s supplier orders
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=Latest %s modified orders
 AllOrders=All orders
 NbOfOrders=Number of orders
 OrdersStatistics=Order's statistics
-OrdersStatisticsSuppliers=Supplier order's statistics
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Number of orders by month
 AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
 ListOfOrders=List of orders
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</
 GenerateBill=Generate invoice
 ClassifyShipped=Classify delivered
 DraftOrders=Draft orders
-DraftSuppliersOrders=Draft suppliers orders
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=In process orders
 RefOrder=Ref. order
 RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for supplier
-RefOrderSupplierShort=Ref. order supplier
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=Send order by mail
 ActionsOnOrder=Events on order
 NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
 DispatchSupplierOrder=Receiving supplier order %s
 FirstApprovalAlreadyDone=First approval already done
 SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=Supplier order %s received %s
-SupplierOrderSubmitedInDolibarr=Supplier order %s submited
-SupplierOrderClassifiedBilled=Supplier order %s set billed
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Other orders
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
@@ -125,11 +125,11 @@ TypeContact_commande_internal_SHIPPING=Representative following-up shipping
 TypeContact_commande_external_BILLING=Customer invoice contact
 TypeContact_commande_external_SHIPPING=Customer shipping contact
 TypeContact_commande_external_CUSTOMER=Customer contact following-up order
-TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
-TypeContact_order_supplier_external_BILLING=Supplier invoice contact
-TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact
-TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
 Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
 Error_OrderNotChecked=No orders to invoice selected
diff --git a/htdocs/langs/id_ID/other.lang b/htdocs/langs/id_ID/other.lang
index 08e48dcc66d..c0b7f469ff8 100644
--- a/htdocs/langs/id_ID/other.lang
+++ b/htdocs/langs/id_ID/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=Files is too big
 PleaseBePatient=Mohon tunggu
 NewPassword=New password
 ResetPassword=Reset password
-RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
@@ -233,6 +233,8 @@ PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=Exports area
 AvailableFormats=Available formats
diff --git a/htdocs/langs/id_ID/productbatch.lang b/htdocs/langs/id_ID/productbatch.lang
index 26c4da492d1..9a4d79edc8b 100644
--- a/htdocs/langs/id_ID/productbatch.lang
+++ b/htdocs/langs/id_ID/productbatch.lang
@@ -16,7 +16,7 @@ printEatby=Eat-by: %s
 printSellby=Sell-by: %s
 printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic increase/decrease stock mode is forced to shipping validate and manual dispatching for reception and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
 ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
diff --git a/htdocs/langs/id_ID/products.lang b/htdocs/langs/id_ID/products.lang
index 1df9efe0083..3f745906379 100644
--- a/htdocs/langs/id_ID/products.lang
+++ b/htdocs/langs/id_ID/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
 MinPrice=Min. selling price
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
 ContractStatusClosed=Ditutup
 ErrorProductAlreadyExists=A product with reference %s already exists.
@@ -155,7 +156,7 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Supplier prices
 SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
-CustomCode=Customs/Commodity/HS code
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
 Nature=Nature
 ShortLabel=Short label
diff --git a/htdocs/langs/id_ID/projects.lang b/htdocs/langs/id_ID/projects.lang
index 7445e3f4cc4..fe1301797ae 100644
--- a/htdocs/langs/id_ID/projects.lang
+++ b/htdocs/langs/id_ID/projects.lang
@@ -77,6 +77,7 @@ Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer orders associated with the project
@@ -226,4 +227,4 @@ AllowCommentOnProject=Allow user comments on projects
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/id_ID/stocks.lang b/htdocs/langs/id_ID/stocks.lang
index 90c26c8cd8f..cb07159f2c0 100644
--- a/htdocs/langs/id_ID/stocks.lang
+++ b/htdocs/langs/id_ID/stocks.lang
@@ -203,3 +203,4 @@ RegulateStock=Regulate Stock
 ListInventory=Daftar
 StockSupportServices=Stock management support services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/id_ID/stripe.lang b/htdocs/langs/id_ID/stripe.lang
index 9fb2fa45113..6fa072b4c9a 100644
--- a/htdocs/langs/id_ID/stripe.lang
+++ b/htdocs/langs/id_ID/stripe.lang
@@ -58,8 +58,8 @@ NameOnCard=Name on card
 CardNumber=Card Number
 ExpiryDate=Expiry Date
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/id_ID/supplier_proposal.lang b/htdocs/langs/id_ID/supplier_proposal.lang
index 09e2a71fa63..9490c2b287f 100644
--- a/htdocs/langs/id_ID/supplier_proposal.lang
+++ b/htdocs/langs/id_ID/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Supplier commercial proposals
-supplier_proposalDESC=Manage price requests to suppliers
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
 SupplierProposalNew=New price request
 CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
-SupplierProposalsDraft=Draft supplier proposals
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=Latest %s modified price requests
 RequestsOpened=Open price requests
-SupplierProposalArea=Supplier proposals area
-SupplierProposalShort=Supplier proposal
-SupplierProposals=Supplier proposals
-SupplierProposalsShort=Supplier proposals
+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=Supplier ref
+SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=Delivery date
 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>?
@@ -47,9 +47,9 @@ CommercialAsk=Price request
 DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposals=List of supplier proposal requests
-ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
-SupplierProposalsToClose=Supplier proposals to close
-SupplierProposalsToProcess=Supplier proposals to process
+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
diff --git a/htdocs/langs/id_ID/suppliers.lang b/htdocs/langs/id_ID/suppliers.lang
index 999db316666..a4eff5fe0ea 100644
--- a/htdocs/langs/id_ID/suppliers.lang
+++ b/htdocs/langs/id_ID/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Suplier langganan
-SuppliersInvoice=Invoice suplier
-ShowSupplierInvoice=Show Supplier Invoice
-NewSupplier=Suplier baru
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=Riwayat
-ListOfSuppliers=Daftar Suplier
-ShowSupplier=Tampilkan suplier
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=Tanggal Pemesanan
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
-SupplierPrices=Supplier prices
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
-NoRecordedSuppliers=Tidak ada suplier tersimpan
-SupplierPayment=Pembayaran suplier
-SuppliersArea=Wilayah Suplier
-RefSupplierShort=Referensi Suplier
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=Ketersediaan
-ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
-ExportDataset_fournisseur_2=Supplier invoices and payments
-ExportDataset_fournisseur_3=Supplier orders and order lines
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=Setujui pesanan
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
 ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
 ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
-AddSupplierOrder=Buat pesanan suplier
-AddSupplierInvoice=Buat invoice suplier
-ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
-SentToSuppliers=Terkirim ke suplier
-ListOfSupplierOrders=Daftar pesanan suplier
-MenuOrdersSupplierToBill=Pesanan suplier menjadi invoice
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-SupplierReputation=Supplier reputation
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
 AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=Supplier prices
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/id_ID/website.lang b/htdocs/langs/id_ID/website.lang
index 0350da13f8f..0f0673e3716 100644
--- a/htdocs/langs/id_ID/website.lang
+++ b/htdocs/langs/id_ID/website.lang
@@ -73,7 +73,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
diff --git a/htdocs/langs/id_ID/workflow.lang b/htdocs/langs/id_ID/workflow.lang
index a50bd91595b..783373ad66d 100644
--- a/htdocs/langs/id_ID/workflow.lang
+++ b/htdocs/langs/id_ID/workflow.lang
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source custome
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/is_IS/accountancy.lang b/htdocs/langs/is_IS/accountancy.lang
index 36ddabc6c69..725176ffa3c 100644
--- a/htdocs/langs/is_IS/accountancy.lang
+++ b/htdocs/langs/is_IS/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Accounting
 ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
 ACCOUNTING_EXPORT_DATE=Date format for export file
 ACCOUNTING_EXPORT_PIECE=Export the number of piece
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Accounts with non zero values
 ListOfAccounts=List of accounts
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers 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
 
-AccountancyArea=Accountancy area
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
 AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
@@ -89,7 +90,7 @@ MenuProductsAccounts=Product accounts
 ProductsBinding=Products accounts
 Ventilation=Binding to accounts
 CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Supplier invoice binding
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
 ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
@@ -185,11 +187,12 @@ ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
-DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Group of account
 Pcgsubtype=Subgroup of account
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
 ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
 DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report 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 fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -293,4 +296,9 @@ Binded=Lines bound
 ToBind=Lines to bind
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang
index 3809109931d..26ca15d5d56 100644
--- a/htdocs/langs/is_IS/admin.lang
+++ b/htdocs/langs/is_IS/admin.lang
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=SMTP / SMTPS Host (Sjálfgefið í <b>php.ini: %s )</b>
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP / SMTPS Höfn (skilgreint ekki inn í PHP á Unix eins og kerfi)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPS Host (skilgreint ekki inn í PHP á Unix eins og kerfi)
 MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= Senda kerfisbundið falin kolefnis-afrit af öllum sendi tölvupóst til
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=Aðferð til að nota til að senda tölvupóst
 MAIN_MAIL_SMTPS_ID=SMTP ID ef sannprófun sem krafist
 MAIN_MAIL_SMTPS_PW=SMTP lykilorð ef sannprófun sem krafist
@@ -291,7 +292,7 @@ ModuleSetup=Module skipulag
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=Kerfi
 ModuleFamilyCrm=Viðskiptavinur Tengsl Stjórnun (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Verkefni / samvinna vinna
@@ -373,7 +374,8 @@ NoSmsEngine=Nei SMS sendandi framkvæmdastjóri boði. SMS sendandi framkvæmdas
 PDF=Skoða sem PDF skjal
 PDFDesc=Þú getur stillt hvert alþjóðlegt valkosti sem tengjast PDF kynslóð
 PDFAddressForging=Reglur til að ryðja tölu kassa
-HideAnyVATInformationOnPDF=Fela allar upplýsingar sem tengjast virðisaukaskatti á mynda PDF
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=Hide products description on generated PDF
@@ -445,7 +447,8 @@ DisplayCompanyInfo=Display company address
 DisplayCompanyManagers=Display manager names
 DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party 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.
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Set this to 1 if you want to attach main document to emai
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=Notendur & hópar
 Module0Desc=Users / Employees and Groups management
@@ -479,7 +485,7 @@ Module1Desc=Fyrirtæki og stjórnun tengiliðs
 Module2Name=Auglýsing
 Module2Desc=Auglýsing stjórnun
 Module10Name=Bókhald
-Module10Desc=Einföld bókhald stjórnun (Reikningar og greiðslur dispatching)
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=Tillögur
 Module20Desc=Auglýsing tillögunnar stjórnun
 Module22Name=Mass E-pósti
@@ -546,8 +552,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar sameining
-Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Payment of employee wages
 Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
@@ -561,14 +567,14 @@ Module700Name=Fjárframlög
 Module700Desc=Framlög í stjórnun
 Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Mantis sameining
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
 Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=Fckeditor
 Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
 Module2200Name=Dynamic Prices
@@ -576,7 +582,7 @@ Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Scheduled jobs
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API/Web services (SOAP server)
@@ -613,7 +619,7 @@ Module50100Desc=Point of sales module (POS).
 Module50200Name=Paypal
 Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Poll, Survey or Vote
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=Umburðarlyndi töf (í dögum) áður en viðvörun u
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Umburðarlyndi töf (í dögum) áður en vakandi fyrir eftirlit leggja inn til að gera
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=Aðrar færslur matseðill stjórna valfrjálst stika.
 LogEvents=Öryggi endurskoðun viðburðir
 Audit=Úttekt
@@ -1054,8 +1060,9 @@ LogEventDesc=Þú getur gert hér skráir þig inn Dolibarr öryggi viðburðir.
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Kerfi upplýsingar er ýmis tæknilegar upplýsingar sem þú færð í lesa aðeins háttur og sýnileg Aðeins kerfisstjórar.
 SystemAreaForAdminOnly=Þetta svæði er í boði fyrir notendur stjórnandi aðeins. Ekkert af Dolibarr leyfi getur dregið þessi mörk.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=Þú getur valið hvert stika sem tengist Dolibarr útlit og feel hér
 AvailableModules=Available app/modules
 ToActivateModule=Til að virkja mát, fara á svæðinu skipulag (Home-> Uppsetning-> mát).
@@ -1188,11 +1195,11 @@ UserMailRequired=Netfang sem þarf til að búa til nýjan notanda
 HRMSetup=HRM module setup
 ##### Company setup #####
 CompanySetup=Stofnanir mát skipulag
-CompanyCodeChecker=Eining til þriðja aðila kóða kynslóð og eftirlit (viðskiptavini eða birgja)
-AccountCodeManager=Module for accounting code generation (customer or supplier)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
 NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
 ModelModules=Skjöl sniðmát
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
@@ -1203,6 +1210,9 @@ MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
 TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Óákveðinn greinir í ensku útflutningur hlekkur <b>til %s </b> snið er að finna á eftirfarandi tengil: %s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=Frjáls texti um viðskiptabanka tillögur
 WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
 ##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=Stjórn Order's skipulag
 OrdersNumberingModules=Pantanir tala mát
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=árangursrík Tenging við miðlara ' %s ' á gagnagrunni ' %s
 OSCommerceTestKo1=Tenging við miðlara ' %s ' ná árangri en% gagnagrunni 's' ekki næst.
 OSCommerceTestKo2=Tenging við miðlara ' %s ' sem notanda ' %s ' mistókst.
 ##### Stock #####
-StockSetup=Warehouse module setup
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
 ##### Menu #####
 MenuDeleted=Valmynd eytt
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
 MultiCompanySetup=Multi-fyrirtæki mát skipulag
 ##### Suppliers #####
 SuppliersSetup=Birgir mát skipulag
-SuppliersCommandModel=Heill sniðmát af röð birgir (logo. ..)
-SuppliersInvoiceModel=Heill sniðmát af reikningi birgis (logo. ..)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","
 SalariesSetup=Setup of module salaries
 SortOrder=Sort order
 Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Install of external module from applic
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
-TextTitleColor=Color of page title
+TextTitleColor=Text color of Page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=Background color for Top menu
 TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
 ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-MailToMember=To send email from member page
-MailToUser=To send email from user page
-MailToProject= To send email from project page
+MailToSendProposal=Customer proposals
+MailToSendOrder=Customer orders
+MailToSendInvoice=Customer invoices
+MailToSendShipment=Sendingar
+MailToSendIntervention=Íhlutun
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Samningar
+MailToThirdparty=Í þriðja aðila
+MailToMember=Meðlimir
+MailToUser=Notendur
+MailToProject=Projects page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1780,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/is_IS/bills.lang b/htdocs/langs/is_IS/bills.lang
index efd9541aa1b..fef2e5a55d6 100644
--- a/htdocs/langs/is_IS/bills.lang
+++ b/htdocs/langs/is_IS/bills.lang
@@ -109,7 +109,7 @@ CancelBill=Hætta við reikning
 SendRemindByMail=Senda áminningu í tölvupósti
 DoPayment=Enter payment
 DoPaymentBack=Enter refund
-ConvertToReduc=Umbreyta inn í framtíðina afsláttur
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Sláðu inn greiðslu frá viðskiptavini
@@ -120,7 +120,7 @@ BillStatus=Invoice stöðu
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Víxill (þarf að vera staðfest)
 BillStatusPaid=Greiddur
-BillStatusPaidBackOrConverted=Credit note refund or converted into discount
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Yfirgefin
 BillStatusValidated=Staðfestar (þarf að vera greidd)
@@ -296,10 +296,10 @@ DiscountType=Discount type
 NoteReason=Ath / Reason
 ReasonDiscount=Ástæða
 DiscountOfferedBy=Veitt
-DiscountStillRemaining=Discounts available
-DiscountAlreadyCounted=Discounts already consumed
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+SupplierDiscounts=Vendors discounts
 BillAddress=Bill heimilisfang
 HelpEscompte=Þessi afsláttur er afsláttur veittur til viðskiptavina vegna greiðslu þess var áður litið.
 HelpAbandonBadCustomer=Þessi upphæð hefur verið yfirgefin (viðskiptavinur til vera a slæmur viðskiptavina) og er talið að sérstakar lausir.
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Every %s days
 FrequencyPer_m=Every %s months
 FrequencyPer_y=Every %s years
@@ -505,9 +511,14 @@ SituationAmount=Situation invoice amount(net)
 SituationDeduction=Situation subtraction
 ModifyAllLines=Modify all lines
 CreateNextSituationInvoice=Create next situation
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=S
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
 NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
@@ -532,3 +543,4 @@ AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/is_IS/categories.lang b/htdocs/langs/is_IS/categories.lang
index 95ea43e0a84..b7021b7d93c 100644
--- a/htdocs/langs/is_IS/categories.lang
+++ b/htdocs/langs/is_IS/categories.lang
@@ -16,7 +16,7 @@ MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
-SubCats=Undirflokkar
+SubCats=Sub-categories
 CatList=List of tags/categories
 NewCategory=New tag/category
 ModifCat=Modify tag/category
@@ -85,3 +85,4 @@ CategorieRecursivHelp=If activated, product will also linked to parent category
 AddProductServiceIntoCategory=Add the following product/service
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
+ChooseCategory=Choose category
diff --git a/htdocs/langs/is_IS/commercial.lang b/htdocs/langs/is_IS/commercial.lang
index 60a9f7ea04b..e01a89dc3d3 100644
--- a/htdocs/langs/is_IS/commercial.lang
+++ b/htdocs/langs/is_IS/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=Loka
 ActionAC_EMAILING=Senda massi tölvupósti
 ActionAC_COM=Senda viðskiptavina þess með pósti
 ActionAC_SHIP=Senda skipum með pósti
-ActionAC_SUP_ORD=Senda birgir röð í pósti
-ActionAC_SUP_INV=Senda birgir reikning í pósti
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=Annað
 ActionAC_OTH_AUTO=Automatically inserted events
 ActionAC_MANUAL=Manually inserted events
diff --git a/htdocs/langs/is_IS/companies.lang b/htdocs/langs/is_IS/companies.lang
index 761479e52e1..ff515adb735 100644
--- a/htdocs/langs/is_IS/companies.lang
+++ b/htdocs/langs/is_IS/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Are you sure you want to delete this contact and all inheri
 MenuNewThirdParty=New þriðja aðila
 MenuNewCustomer=Nýr viðskiptavinur
 MenuNewProspect=Nýjar horfur
-MenuNewSupplier=New birgir
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=New Einstaklingur
-NewCompany=Ný fyrirtæki (horfur, viðskiptavina, birgja)
-NewThirdParty=New þriðja aðila (horfur, viðskiptavina, birgja)
-CreateDolibarrThirdPartySupplier=Create a third party (supplier)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=Create third party
 CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Prospection area
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=Horfur
 ThirdPartyCustomers=Viðskiptavinir
 ThirdPartyCustomersStats=Viðskiptavinir
 ThirdPartyCustomersWithIdProf12=Viðskiptavinur með %s  eða %s
-ThirdPartySuppliers=Birgjar
+ThirdPartySuppliers=Vendors
 ThirdPartyType=Í þriðja aðila tegund
 Individual=Einstaklingur
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
@@ -77,11 +77,11 @@ Web=Web
 Poste= Staða
 DefaultLang=Tungumál sjálfgefið
 VATIsUsed=Sales tax is used
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
-ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Tillögur
 OverAllOrders=Pantanir
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=RE Type
 TypeLocaltax2ES=IRPF Type
 WrongCustomerCode=Viðskiptavinur númer ógilt
-WrongSupplierCode=Birgir kóða ógilt
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Viðskiptavinur númer líkan
-SupplierCodeModel=Birgir kóða líkan
+SupplierCodeModel=Vendor code model
 Gencod=Strikamerki
 ##### Professional ID #####
 ProfId1Short=Prófessor persónuskilríki 1
@@ -267,7 +267,7 @@ Prospect=Prospect
 CustomerCard=Customer Card
 Customer=Viðskiptavinur
 CustomerRelativeDiscount=Hlutfallsleg viðskiptavina afslátt
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=Hlutfallsleg afsláttur
 CustomerAbsoluteDiscountShort=Alger afsláttur
 CompanyHasRelativeDiscount=Þessi viðskiptavinur hefur afslátt <b>af %s %%</b>
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this suppl
 CompanyHasNoAbsoluteDiscount=Þessi viðskiptavinur hefur ekki afslátt inneign í boði
 CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
 CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=None
 Supplier=Birgir
 AddContact=Create contact
@@ -304,13 +304,13 @@ DeleteACompany=Eyða fyrirtæki
 PersonalInformations=Persónuupplýsingar
 AccountancyCode=Accounting account
 CustomerCode=Viðskiptavinur númer
-SupplierCode=Birgir kóða
+SupplierCode=Vendor code
 CustomerCodeShort=Viðskiptavinur númer
-SupplierCodeShort=Birgir kóða
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=Viðskiptavinur númer og einstakt fyrir alla viðskiptavini
-SupplierCodeDesc=Birgir númerið einstakt fyrir alla birgja
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=Áskilið ef þriðji aðili sem viðskiptavinur eða horfur
-RequiredIfSupplier=Áskilið ef þriðji aðili er birgir
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=Gildistími stjórnað af mát
 ThisIsModuleRules=Þetta er regla fyrir þessa einingu
 ProspectToContact=Prospect samband
@@ -338,7 +338,7 @@ MyContacts=tengiliðir mínir
 Capital=Capital
 CapitalOf=Capital af %s
 EditCompany=Breyta fyrirtæki
-ThisUserIsNot=Þessi notandi hefur ekki möguleika, viðskiptavina né birgir
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=Athuga
 VATIntraCheckDesc=<b>Á%</b> tengilinn <b>s</b> leyfir þér að spyrja european VSK afgreiðslumaður þjónustu. Ytri aðgangur frá miðlara er krafist fyrir þessa þjónustu til að vinna.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -396,7 +396,7 @@ ImportDataset_company_4=Third parties/Sales representatives (Assign sales repres
 PriceLevel=Verðlag
 DeliveryAddress=Afhending heimilisfang
 AddAddress=Bæta við heimilisfangi
-SupplierCategory=Birgir flokkur
+SupplierCategory=Vendor category
 JuridicalStatus200=Independent
 DeleteFile=Eyða skrá
 ConfirmDeleteFile=Ertu viss um að þú viljir eyða þessari skrá?
@@ -406,7 +406,7 @@ FiscalYearInformation=Upplýsingar um fjárhagsársins
 FiscalMonthStart=Byrjun mánuði fjárhagsársins
 YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
 YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
-ListSuppliersShort=Listi yfir birgja
+ListSuppliersShort=List of vendors
 ListProspectsShort=Listi yfir horfur
 ListCustomersShort=Listi yfir viðskiptavini
 ThirdPartiesArea=Third parties and contact area
@@ -420,7 +420,7 @@ CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Fara aftur numero með snið %s yymm-NNNN fyrir kóða viðskiptavina og %s yymm-NNNN fyrir númer birgja þar sem YY er ári, mm er mánuður og NNNN er röð án brot og ekki aftur snúið til 0.
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=Viðskiptavinur / birgir númerið er ókeypis. Þessi kóði getur breytt hvenær sem er.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/is_IS/compta.lang b/htdocs/langs/is_IS/compta.lang
index cca9918eb55..a9df0df642b 100644
--- a/htdocs/langs/is_IS/compta.lang
+++ b/htdocs/langs/is_IS/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=Net greitt
 VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
-VATSummary=Tax Balance
+VATSummary=Tax monthly
+VATBalance=Tax Balance
 VATPaid=Tax paid
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=Bókhalds / ríkissjóðs area
 NewPayment=Ný greiðsla
 Payments=Greiðslur
 PaymentCustomerInvoice=Viðskiptavinur Reikningar greiðslu
-PaymentSupplierInvoice=Birgir Reikningar greiðslu
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VSK-greiðslu
 ListPayment=Listi yfir greiðslur
 ListOfCustomerPayments=Listi yfir greiðslur viðskiptavina
-ListOfSupplierPayments=Listi yfir greiðslur birgir
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -110,7 +111,7 @@ ShowVatPayment=Sýna VSK greiðslu
 TotalToPay=Samtals borga
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
 CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
 SupplierAccountancyCodeShort=Sup. account. code
 AccountNumber=Reikningsnúmer
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Skýrsla um þriðja aðila IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
 Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
-ByProductsAndServices=By products and services
+ByProductsAndServices=By product and service
 RefExt=External ref
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
 LinkedOrder=Link to order
@@ -215,7 +218,8 @@ Mode1=Method 1
 Mode2=Method 2
 CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
 CalculationRuleDescSupplier=According to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
@@ -242,3 +246,10 @@ FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/is_IS/dict.lang b/htdocs/langs/is_IS/dict.lang
index 0fbcb7f6679..1dc35ef040d 100644
--- a/htdocs/langs/is_IS/dict.lang
+++ b/htdocs/langs/is_IS/dict.lang
@@ -5,7 +5,8 @@ CountryIT=Ítalía
 CountryES=Spánn
 CountryDE=Þýskaland
 CountryCH=Sviss
-CountryGB=Great Britain
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=United Kingdom
 CountryUK=United Kingdom
 CountryIE=Írland
 CountryCN=Kína
diff --git a/htdocs/langs/is_IS/ecm.lang b/htdocs/langs/is_IS/ecm.lang
index ba520e1b671..c8d3d6fc5cb 100644
--- a/htdocs/langs/is_IS/ecm.lang
+++ b/htdocs/langs/is_IS/ecm.lang
@@ -39,9 +39,10 @@ ShowECMSection=Sýna skrá
 DeleteSection=Fjarlægja möppu
 ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
 ECMDirectoryForFiles=Hlutfallsleg skrá fyrir skrá
-CannotRemoveDirectoryContainsFiles=Fjarri ekki hægt því það inniheldur nokkrar skrár
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=File Manager
-ECMSelectASection=Velja möppu á vinstri tré ...
+ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
diff --git a/htdocs/langs/is_IS/errors.lang b/htdocs/langs/is_IS/errors.lang
index 70f72cc7258..bb34f5e8452 100644
--- a/htdocs/langs/is_IS/errors.lang
+++ b/htdocs/langs/is_IS/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Bar code required
 ErrorCustomerCodeAlreadyUsed=Viðskiptavinur sem notaður er þegar
 ErrorBarCodeAlreadyUsed=Bar code already used
 ErrorPrefixRequired=Forskeyti krafist
-ErrorBadSupplierCodeSyntax=Bad setningafræði fyrir birgi kóða
-ErrorSupplierCodeRequired=Birgir merkjamál þurfa
-ErrorSupplierCodeAlreadyUsed=Birgir sem notaður er þegar
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Bad breytur
 ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
 ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
@@ -87,7 +87,7 @@ ErrorsOnXLines=Villur <b>á %s </b> uppspretta línur
 ErrorFileIsInfectedWithAVirus=The antivirus program was not 'fær til setja í gildi the skrá (skrá gæti verið sýkt af veiru)
 ErrorSpecialCharNotAllowedForField=Sérstafir eru ekki leyfðar í reitinn " %s "
 ErrorNumRefModel=Vísun til staðar í gagnagrunninum ( %s ) og er ekki með þessari tala reglu. Fjarlægja færslu eða endurnefna þær tilvísun til að virkja þessa einingu.
-ErrorQtyTooLowForThisSupplier=Magn of lág fyrir þessa söluaðila eða ekki verði skilgreind á þessa vöru fyrir þennan birgir
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Villa á grímu
 ErrorBadMaskFailedToLocatePosOfSequence=Villa, gríma án fjölda röð
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
-ErrorSupplierCountryIsNotDefined=Land fyrir þessa birgja er ekki skilgreind. Rétt þetta fyrst.
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
diff --git a/htdocs/langs/is_IS/install.lang b/htdocs/langs/is_IS/install.lang
index e05e4421800..3591ea67327 100644
--- a/htdocs/langs/is_IS/install.lang
+++ b/htdocs/langs/is_IS/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=<b>Stillingar %s  er</b> ekki til og g
 ConfFileCouldBeCreated=<b>Stillingarskráin %s </b> getur verið búinn til.
 ConfFileIsNotWritable=<b>Stillingarskráin %s </b> er ekki rétta aðgangsheimild. Athugaðu heimildir. Fyrir fyrsta sett verður upp á netþjóninn þinn verði veitt til að geta skrifað inn í þessa mynd á ferli stillingar ("chmod 666" til dæmis á Unix eins og OS).
 ConfFileIsWritable=<b>Stillingarskráin %s </b> er writable.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reload allar upplýsingar úr skrá stillingu.
 PHPSupportSessions=Þetta PHP styður fundur.
 PHPSupportPOSTGETOk=Þetta PHP styður breytur POST og FÁ.
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
 WarningRemoveInstallDir=Aðvörun, vegna öryggis, þegar setja upp eða uppfæra er heill, þá ættir þú að fjarlægja <b>setja möppu eða gefa henni nýtt heiti með hana til install.lock í því skyni að koma í veg fyrir notkun þess illgjarn.</b>
 FunctionNotAvailableInThisPHP=Ekki í boði á þessari PHP
 ChoosedMigrateScript=Veldu fólksflutninga handrit
-DataMigration=Gögn fólksflutninga
-DatabaseMigration=Uppbygging gagnasafn flutningur
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script vinnslu
 ChooseYourSetupMode=Veldu uppsetningu háttur þinn og smelltu á "Start" ...
 FreshInstall=Fresh setja
@@ -146,7 +147,7 @@ NothingToDo=Nothing to do
 # upgrade
 MigrationFixData=Festa fyrir denormalized gögn
 MigrationOrder=Gögn fólksflutninga fyrir pantanir viðskiptavina
-MigrationSupplierOrder=Gögn fólksflutninga fyrir pantanir birgis
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Gögn fólksflutninga í atvinnuskyni tillögur
 MigrationInvoice=Gögn fólksflutninga fyrir reikninga viðskiptavina
 MigrationContract=Gögn fólksflutninga til samninga
@@ -196,6 +197,8 @@ MigrationEvents=Migration of events to add event owner into assignement table
 MigrationEventsContact=Migration of events to add event contact into assignement table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 ShowNotAvailableOptions=Show not available options
diff --git a/htdocs/langs/is_IS/ldap.lang b/htdocs/langs/is_IS/ldap.lang
index 771d6acd359..87c15eb19b2 100644
--- a/htdocs/langs/is_IS/ldap.lang
+++ b/htdocs/langs/is_IS/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Lykilorð fyrir lén
 YouMustChangePassNextLogon=Lykilorð fyrir <b>notandann %s  í%</b> léni <b>s</b> verður að vera breytt.
 UserMustChangePassNextLogon=Notandi verður að breyta lykilorðinu á vefnum %s
 LDAPInformationsForThisContact=Upplýsingar í LDAP gagnagrunninn fyrir þennan tengilið
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Member type synchronized
 ContactSynchronized=Hafðu samstilla
 ForceSynchronize=Force synchronizing Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Ekki tókst að lesa LDAP gagnagrunninn. Athugaðu LDAP mát skipulag og gagnasafn aðgengi.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/is_IS/loan.lang b/htdocs/langs/is_IS/loan.lang
index 9aae3869cc3..534dee08867 100644
--- a/htdocs/langs/is_IS/loan.lang
+++ b/htdocs/langs/is_IS/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=Capital
 Insurance=Insurance
 Interest=Interest
 Nbterms=Number of terms
+Term=Term
 LoanAccountancyCapitalCode=Accounting account capital
 LoanAccountancyInsuranceCode=Accounting account insurance
 LoanAccountancyInterestCode=Accounting account interest
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=Confirm deleting this loan
 LoanDeleted=Loan Deleted Successfully
 ConfirmPayLoan=Confirm classify paid this loan
 LoanPaid=Loan Paid
-# Calc
-LoanCalc=Bank Loans Calculator
-PurchaseFinanceInfo=Purchase & Financing Information
-SalePriceOfAsset=Sale Price of Asset
-PercentageDown=Percentage Down
-LengthOfMortgage=Duration of loan
-AnnualInterestRate=Annual Interest Rate
-ExplainCalculations=Explain Calculations
-ShowMeCalculationsAndAmortization=Show me the calculations and amortization
-MortgagePaymentInformation=Mortgage Payment Information
-DownPayment=Down Payment
-DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
-InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
-MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
-MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
-MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
-MonthlyPaymentDesc=The montly payment is figured out using the following formula
-AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
-AmountFinanced=Amount Financed
-AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
-Totalsforyear=Totals for year
-MonthlyPayment=Monthly Payment
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
-GoToInterest=%s will go towards INTEREST
-GoToPrincipal=%s will go towards PRINCIPAL
-YouWillSpend=You will spend %s in year %s
 ListLoanAssociatedProject=List of loan associated with the project
 AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Interest
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-FinancialCommitment=Financial commitment
 CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/langs/is_IS/mails.lang b/htdocs/langs/is_IS/mails.lang
index 972af5ace7b..442305ccc10 100644
--- a/htdocs/langs/is_IS/mails.lang
+++ b/htdocs/langs/is_IS/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Sendandi
 MailErrorsTo=Villur við
 MailReply=Svara
 MailTo=Receiver (s)
+MailToUsers=To user(s)
 MailCC=Afrita á
+MailToCCUsers=Copy to users(s)
 MailCCC=Geymd afrit til
 MailTopic=Netfang þráð
 MailText=Message
@@ -164,4 +166,4 @@ InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/is_IS/main.lang b/htdocs/langs/is_IS/main.lang
index a0fca9fde2a..81e94659242 100644
--- a/htdocs/langs/is_IS/main.lang
+++ b/htdocs/langs/is_IS/main.lang
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is se
 Administrator=Stjórnandi
 Undefined=Óskilgreint
 PasswordForgotten=Password forgotten?
+NoAccount=No account?
 SeeAbove=Sjá ofar
 HomeArea=Home area
 LastConnexion=Latest connection
@@ -231,7 +232,7 @@ Limit=Takmörk
 Limits=Mörk
 Logout=Útskrá
 NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Tengsl
+Connection=Innskráning
 Setup=Skipulag
 Alert=Viðvörun
 MenuWarnings=Alerts
@@ -402,6 +403,7 @@ DefaultTaxRate=Default tax rate
 Average=Meðaltal
 Sum=Summa
 Delta=Delta
+RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Valkostur
@@ -414,7 +416,7 @@ Favorite=Favorite
 ShortInfo=Info.
 Ref=Tilv.
 ExternalRef=Ref. extern
-RefSupplier=Tilv. birgir
+RefSupplier=Ref. vendor
 RefPayment=Tilv. greiðslu
 CommercialProposalsShort=Auglýsing tillögur
 Comment=Athugasemd
@@ -493,7 +495,7 @@ Received=Móttekin
 Paid=Greiddur
 Topic=Subject
 ByCompanies=Eftir þriðja aðila
-ByUsers=Með því að notendur
+ByUsers=By user
 Links=Tenglar
 Link=Link
 Rejects=Hafnar
@@ -619,9 +621,9 @@ BuildDoc=Byggja Doc
 Entity=Heild
 Entities=Stofnanir
 CustomerPreview=Viðskiptavinur Forsýning
-SupplierPreview=Birgir forsýning
+SupplierPreview=Vendor preview
 ShowCustomerPreview=Sýna viðskiptavinum sýnishorn
-ShowSupplierPreview=Sýna birgir forsýning
+ShowSupplierPreview=Show vendor preview
 RefCustomer=Tilv. viðskiptavina
 Currency=Gjaldmiðill
 InfoAdmin=Upplýsingar fyrir stjórnendur
@@ -679,7 +681,7 @@ Color=Litur
 Documents=Hlekkur skrá
 Documents2=Skjöl
 UploadDisabled=Hlaða fatlaðra
-MenuAccountancy=Bókhalds
+MenuAccountancy=Accounting
 MenuECM=Skjöl
 MenuAWStats=Awstats
 MenuMembers=Members
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=Products or services
 SearchIntoProjects=Verkefni
 SearchIntoTasks=Verkefni
 SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Íhlutun
 SearchIntoContracts=Samningar
 SearchIntoCustomerShipments=Customer shipments
@@ -941,3 +943,5 @@ Remote=Remote
 LocalAndRemote=Local and Remote
 KeyboardShortcut=Keyboard shortcut
 AssignedTo=Áhrifum á
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/is_IS/margins.lang b/htdocs/langs/is_IS/margins.lang
index 068b9c1e834..a6630619786 100644
--- a/htdocs/langs/is_IS/margins.lang
+++ b/htdocs/langs/is_IS/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=As a service
 UseDiscountOnTotal=On subtotal
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
 MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best supplier price
+MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Cost price
 UnitCharges=Unit charges
 Charges=Charges
diff --git a/htdocs/langs/is_IS/members.lang b/htdocs/langs/is_IS/members.lang
index b0e4a7a0740..34ec456bd69 100644
--- a/htdocs/langs/is_IS/members.lang
+++ b/htdocs/langs/is_IS/members.lang
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
diff --git a/htdocs/langs/is_IS/opensurvey.lang b/htdocs/langs/is_IS/opensurvey.lang
index 47c0b122dc3..40b08906a84 100644
--- a/htdocs/langs/is_IS/opensurvey.lang
+++ b/htdocs/langs/is_IS/opensurvey.lang
@@ -58,3 +58,4 @@ MoreChoices=Enter more choices for the voters
 SurveyExpiredInfo=The poll has been closed or voting delay has expired.
 EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
 ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/is_IS/orders.lang b/htdocs/langs/is_IS/orders.lang
index c4c81dad11f..93e501bda1c 100644
--- a/htdocs/langs/is_IS/orders.lang
+++ b/htdocs/langs/is_IS/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Viðskiptavinir pantanir area
-SuppliersOrdersArea=Birgjar pantanir area
+SuppliersOrdersArea=Purchase orders area
 OrderCard=Panta kort
 OrderId=Order Id
 Order=Panta
@@ -13,18 +13,18 @@ OrderToProcess=Til að framkvæma
 NewOrder=New Order
 ToOrder=Gera röð
 MakeOrder=Gera röð
-SupplierOrder=Birgir röð
-SuppliersOrders=pantanir birgis
-SuppliersOrdersRunning=pantanir Current birgis
-CustomerOrder=Viðskiptavinur röð
-CustomersOrders=Customer orders
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=Customer Order
+CustomersOrders=Viðskiptavinur Pantanir
 CustomersOrdersRunning=Current customer orders
 CustomersOrdersAndOrdersLines=Customer orders and order lines
 OrdersDeliveredToBill=Customer orders delivered to bill
 OrdersToBill=Customer orders delivered
 OrdersInProcess=Customer orders in process
 OrdersToProcess=Customer orders to process
-SuppliersOrdersToProcess=Supplier orders to process
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=Hætt við
 StatusOrderDraftShort=Víxill
 StatusOrderValidatedShort=Staðfestar
@@ -75,15 +75,15 @@ ShowOrder=Sýna röð
 OrdersOpened=Orders to process
 NoDraftOrders=No draft orders
 NoOrder=No order
-NoSupplierOrder=No supplier order
+NoSupplierOrder=No purchase order
 LastOrders=Latest %s customer orders
 LastCustomerOrders=Latest %s customer orders
-LastSupplierOrders=Latest %s supplier orders
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=Latest %s modified orders
 AllOrders=Allar pantanir
 NbOfOrders=Fjöldi fyrirmæla
 OrdersStatistics=tölfræði Order's
-OrdersStatisticsSuppliers=tölfræði Birgir röð's
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Fjöldi fyrirmæla eftir mánuði
 AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
 ListOfOrders=Listi yfir pantanir
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</
 GenerateBill=Búa til reikning
 ClassifyShipped=Classify delivered
 DraftOrders=Drög að fyrirmælum
-DraftSuppliersOrders=Draft suppliers orders
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=Í pantanir ferli
 RefOrder=Tilv. röð
 RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for supplier
-RefOrderSupplierShort=Ref. order supplier
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=Senda til með pósti
 ActionsOnOrder=Aðgerðir á röð
 NoArticleOfTypeProduct=Engar greinar af gerðinni 'vara' svo engin shippable grein fyrir þessari röð
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
 DispatchSupplierOrder=Móttaka birgir röð %s
 FirstApprovalAlreadyDone=First approval already done
 SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=Supplier order %s received %s
-SupplierOrderSubmitedInDolibarr=Supplier order %s submited
-SupplierOrderClassifiedBilled=Supplier order %s set billed
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Aðrar skipanir
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Fulltrúi eftirfarandi upp viðskiptavina röð
@@ -125,11 +125,11 @@ TypeContact_commande_internal_SHIPPING=Fulltrúi eftirfarandi upp siglinga
 TypeContact_commande_external_BILLING=Viðskiptavinur Reikningar samband
 TypeContact_commande_external_SHIPPING=Viðskiptavinur siglinga samband
 TypeContact_commande_external_CUSTOMER=Viðskiptavinur samband eftirfarandi upp röð
-TypeContact_order_supplier_internal_SALESREPFOLL=Fulltrúi eftirfarandi upp birgir röð
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Fulltrúi eftirfarandi upp siglinga
-TypeContact_order_supplier_external_BILLING=Birgir Reikningar samband
-TypeContact_order_supplier_external_SHIPPING=Birgir siglinga samband
-TypeContact_order_supplier_external_CUSTOMER=Birgir samband eftirfarandi upp röð
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON skilgreind ekki
 Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON skilgreind ekki
 Error_OrderNotChecked=No orders to invoice selected
diff --git a/htdocs/langs/is_IS/other.lang b/htdocs/langs/is_IS/other.lang
index 3eeb07a6f46..0cc680f1089 100644
--- a/htdocs/langs/is_IS/other.lang
+++ b/htdocs/langs/is_IS/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=Skrár er of stór
 PleaseBePatient=Vinsamlegast sýnið þolinmæði ...
 NewPassword=New password
 ResetPassword=Reset password
-RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
@@ -233,6 +233,8 @@ PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=Útflutningur area
 AvailableFormats=Laus snið
diff --git a/htdocs/langs/is_IS/productbatch.lang b/htdocs/langs/is_IS/productbatch.lang
index f9e8d788470..43b7f793dca 100644
--- a/htdocs/langs/is_IS/productbatch.lang
+++ b/htdocs/langs/is_IS/productbatch.lang
@@ -16,7 +16,7 @@ printEatby=Eat-by: %s
 printSellby=Sell-by: %s
 printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic increase/decrease stock mode is forced to shipping validate and manual dispatching for reception and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
 ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
diff --git a/htdocs/langs/is_IS/products.lang b/htdocs/langs/is_IS/products.lang
index aac5945e14f..d4371bfc658 100644
--- a/htdocs/langs/is_IS/products.lang
+++ b/htdocs/langs/is_IS/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=Ný verð
 MinPrice=Min. selling price
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=Söluverð er ekki vera lægra en lágmarks leyfð fyrir þessa vöru ( %s  án skatta)
 ContractStatusClosed=Loka
 ErrorProductAlreadyExists=Vara með% tilvísun s er þegar til.
@@ -155,7 +156,7 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Supplier prices
 SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
-CustomCode=Customs/Commodity/HS code
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=Uppruni land
 Nature=Náttúra
 ShortLabel=Short label
diff --git a/htdocs/langs/is_IS/projects.lang b/htdocs/langs/is_IS/projects.lang
index 5c21a2b2b72..5213ae876a6 100644
--- a/htdocs/langs/is_IS/projects.lang
+++ b/htdocs/langs/is_IS/projects.lang
@@ -77,6 +77,7 @@ Time=Tími
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=Listi yfir auglýsing tillögum í tengslum við verkefnið
 ListOrdersAssociatedProject=List of customer orders associated with the project
@@ -226,4 +227,4 @@ AllowCommentOnProject=Allow user comments on projects
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/is_IS/stocks.lang b/htdocs/langs/is_IS/stocks.lang
index 000a7317a3a..8ba4c8619e4 100644
--- a/htdocs/langs/is_IS/stocks.lang
+++ b/htdocs/langs/is_IS/stocks.lang
@@ -203,3 +203,4 @@ RegulateStock=Regulate Stock
 ListInventory=Listi
 StockSupportServices=Stock management support services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/is_IS/stripe.lang b/htdocs/langs/is_IS/stripe.lang
index ae525ef5107..e5cf4d02933 100644
--- a/htdocs/langs/is_IS/stripe.lang
+++ b/htdocs/langs/is_IS/stripe.lang
@@ -58,8 +58,8 @@ NameOnCard=Name on card
 CardNumber=Card Number
 ExpiryDate=Expiry Date
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/is_IS/supplier_proposal.lang b/htdocs/langs/is_IS/supplier_proposal.lang
index 1b29c11de7c..79e20aec4e0 100644
--- a/htdocs/langs/is_IS/supplier_proposal.lang
+++ b/htdocs/langs/is_IS/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Supplier commercial proposals
-supplier_proposalDESC=Manage price requests to suppliers
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
 SupplierProposalNew=New price request
 CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
-SupplierProposalsDraft=Draft supplier proposals
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=Latest %s modified price requests
 RequestsOpened=Open price requests
-SupplierProposalArea=Supplier proposals area
-SupplierProposalShort=Supplier proposal
-SupplierProposals=Supplier proposals
-SupplierProposalsShort=Supplier proposals
+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=Supplier ref
+SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=Fæðingardag
 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>?
@@ -47,9 +47,9 @@ CommercialAsk=Price request
 DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposals=List of supplier proposal requests
-ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
-SupplierProposalsToClose=Supplier proposals to close
-SupplierProposalsToProcess=Supplier proposals to process
+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
diff --git a/htdocs/langs/is_IS/suppliers.lang b/htdocs/langs/is_IS/suppliers.lang
index 8e8a0397be6..2a7f274f323 100644
--- a/htdocs/langs/is_IS/suppliers.lang
+++ b/htdocs/langs/is_IS/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Birgjar
-SuppliersInvoice=Birgjar Reikningar
-ShowSupplierInvoice=Show Supplier Invoice
-NewSupplier=New birgir
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=Saga
-ListOfSuppliers=Listi yfir birgja
-ShowSupplier=Sýna birgir
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=Panta dagsetningu
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
-SupplierPrices=Supplier prices
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Þessi tilvísun birgir er nú þegar tengt með tilvísun: %s
-NoRecordedSuppliers=Nei birgja skráð
-SupplierPayment=Birgir greiðslu
-SuppliersArea=Birgjar area
-RefSupplierShort=Tilv. birgir
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=Framboð
-ExportDataset_fournisseur_1=Birgir reikningum lista og línur reiknings er
-ExportDataset_fournisseur_2=Birgir reikninga og greiðslur
-ExportDataset_fournisseur_3=Supplier orders and order lines
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=Samþykkja þessari röð
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
 ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
 ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
-AddSupplierOrder=Búa til birgja þess
-AddSupplierInvoice=Búa til birgja Reikningar
-ListOfSupplierProductForSupplier=Listi yfir vörur og verð <b>fyrir%</b> söluaðila <b>s</b>
-SentToSuppliers=Sent to suppliers
-ListOfSupplierOrders=List of supplier orders
-MenuOrdersSupplierToBill=Supplier orders to invoice
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-SupplierReputation=Supplier reputation
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
 AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=Supplier prices
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/is_IS/website.lang b/htdocs/langs/is_IS/website.lang
index a5988f7f2af..392ac3aed7a 100644
--- a/htdocs/langs/is_IS/website.lang
+++ b/htdocs/langs/is_IS/website.lang
@@ -73,7 +73,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
diff --git a/htdocs/langs/is_IS/workflow.lang b/htdocs/langs/is_IS/workflow.lang
index 3961e558115..47aff549487 100644
--- a/htdocs/langs/is_IS/workflow.lang
+++ b/htdocs/langs/is_IS/workflow.lang
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source custome
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/it_IT/accountancy.lang b/htdocs/langs/it_IT/accountancy.lang
index 8abf4ecfda5..b581970d63a 100644
--- a/htdocs/langs/it_IT/accountancy.lang
+++ b/htdocs/langs/it_IT/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Contabilità avanzata
 ACCOUNTING_EXPORT_SEPARATORCSV=Separatore delle colonne nel file di esportazione
 ACCOUNTING_EXPORT_DATE=Formato della data per i file di esportazione
 ACCOUNTING_EXPORT_PIECE=Esporta il numero di pezzi
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Accounts with non zero values
 ListOfAccounts=List of accounts
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers 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
 
-AccountancyArea=Accountancy area
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=Le seguenti azioni vengono di solito eseguite una volta sola, o una volta all'anno...
 AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
@@ -89,7 +90,7 @@ MenuProductsAccounts=Product accounts
 ProductsBinding=Products accounts
 Ventilation=Vincola all'account
 CustomersVentilation=Collegamento fatture attive
-SuppliersVentilation=Collegamento fatture fornitori
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Crea nuova transazione
 UpdateMvts=Modifica una transazione
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=Giornale Acquisti
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Giornale Varie
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Giornale Note Spese
 ACCOUNTING_SOCIAL_JOURNAL=Giornale Sociale
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
 ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
@@ -185,11 +187,12 @@ ListeMvts=Lista dei movimenti
 ErrorDebitCredit=Debito e Credito non possono avere un valore contemporaneamente
 AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=Lista dei profili dei soggetti terzi
-DescThirdPartyReport=Consulta la lista dei clienti e fornitori e dei contatti collegati.
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=Lista delle voci del piano dei conti
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Gruppo di conto
 Pcgsubtype=Sottogruppo di conto
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
 ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
 DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report 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 fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Collega automaticamente
 AutomaticBindingDone=Collegamento automatico fatto
 
 ErrorAccountancyCodeIsAlreadyUse=Errore, non puoi cancellare la voce del piano dei conti perché è utilizzata
-MvtNotCorrectlyBalanced=Movimenti non correttamente bilanciati. Credito = %s. Debito = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transazioni scritte nel libro contabile
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -293,4 +296,9 @@ Binded=Linee collegate
 ToBind=Linee da vincolare
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang
index 8164125ffa4..dedfc55faae 100644
--- a/htdocs/langs/it_IT/admin.lang
+++ b/htdocs/langs/it_IT/admin.lang
@@ -32,7 +32,7 @@ PurgeSessions=Pulizia delle sessioni
 ConfirmPurgeSessions=Vuoi davvero eliminare tutte le sessioni? Questo causerà la disconnessione di tutti gli utenti (tranne te).
 NoSessionListWithThisHandler=Il gestore delle sessioni configurato in PHP non consente di elencare tutte le sessioni in esecuzione.
 LockNewSessions=Bloccare le nuove connessioni
-ConfirmLockNewSessions=Sei sicuro di voler limitare qualsiasi nuova connessione a Dolibarr a te stesso? <b>%s</b> solo l'utente sarà in grado di connettersi dopo la modifica.
+ConfirmLockNewSessions=Sei sicuro di voler limitare qualsiasi nuova connessione a Dolibarr a te stesso? Solo l'utente <b>%s</b> sarà in grado di connettersi dopo la modifica.
 UnlockNewSessions=Rimuovere il blocco di connessione
 YourSession=La tua sessione
 Sessions=Sessione utente
@@ -198,7 +198,7 @@ ModulesMarketPlaceDesc=Potete trovare altri moduli da scaricare su siti web este
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Trova app/moduli esterni...
 ModulesDevelopYourModule=Sviluppa il tuo modulo/app
-ModulesDevelopDesc=You can develop or find a partner to develop for you, your personalised module
+ModulesDevelopDesc=Puoi sviluppare o trovare un partner che sviluppi il tuo modulo personalizzato
 DOLISTOREdescriptionLong=Instead of switching on <a href="https://www.dolistore.com">www.dolistore.com</a> web site to find an external module, you can use this embedded tool that will make the seach on the external market place for you (may be slow, need an internet access)...
 NewModule=Nuovo
 FreeModule=Free
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=Host SMTP (Di default in php.ini: <b> %s </b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Porta SMTP (non disponibile in PHP su Linux)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP Host (non disponibile in PHP su Linux)
 MAIN_MAIL_EMAIL_FROM=Inviante email per email automatiche (di default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= Inviare sistematicamente una copia carbone nascosta di tutte le email a
 MAIN_DISABLE_ALL_MAILS=Disabilita tutti gli invii email (per scopi di test o demo)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=Metodo da utilizzare per l'invio di email
 MAIN_MAIL_SMTPS_ID=Id per l'autenticazione SMTP, se necessario
 MAIN_MAIL_SMTPS_PW=Password per l'autenticazione SMTP, se necessaria
@@ -291,7 +292,7 @@ ModuleSetup=Impostazioni modulo
 ModulesSetup=Impostazione Modulo/Applicazione
 ModuleFamilyBase=Sistema
 ModuleFamilyCrm=Client Resource Management (CRM)
-ModuleFamilySrm=Gestione delle relazioni con i fornitori (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Gestione dei prodotti (PM)
 ModuleFamilyHr=Gestione delle risorse umane (HR)
 ModuleFamilyProjects=Progetti/collaborazioni
@@ -373,7 +374,8 @@ NoSmsEngine=Nessun manager mittente SMS disponibili. SMS gestore del mittente no
 PDF=PDF
 PDFDesc=Si possono impostare tutte le opzioni globali relative alla generazione di file pdf
 PDFAddressForging=Regole per il forge di caselle di indirizzi
-HideAnyVATInformationOnPDF=Nascondi tutte le informazioni relative all'IVA sui pdf generati.
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Regole per %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=Nascondi le descrizioni dei prodotti nel pdf generato
@@ -392,7 +394,7 @@ PriceBaseTypeToChange=Modifica i prezzi con la valuta di base definita.
 MassConvert=Avvia conversione di massa
 String=Stringa
 TextLong=Testo Lungo
-HtmlText=Html text
+HtmlText=Testo html
 Int=Intero
 Float=Decimale
 DateAndTime=Data e ora
@@ -410,7 +412,7 @@ ExtrafieldRadio=Radio button (una sola scelta)
 ExtrafieldCheckBox=Checkboxes
 ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
-ComputedFormula=Computed field
+ComputedFormula=Campo calcolato
 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, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties 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>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->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->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
 ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
@@ -445,7 +447,8 @@ DisplayCompanyInfo=Mostra indirizzo dell'azienda
 DisplayCompanyManagers=Visualizza nomi responsabili
 DisplayCompanyInfoAndManagers=Mostra l'indirizzo dell'azienda ed il nome del manager
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party 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.
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Set this to 1 if you want to attach main document to emai
 FilesAttachedToEmail=Allega file
 SendEmailsReminders=Invia promemoria agenda via email
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=Utenti e gruppi
 Module0Desc=Gestione utenti/impiegati e gruppi
@@ -479,7 +485,7 @@ Module1Desc=Gestione aziende e contatti
 Module2Name=Commerciale
 Module2Desc=Gestione commerciale
 Module10Name=Contabilità
-Module10Desc=Gestione contabile semplice (fatture e pagamenti)
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=Proposte
 Module20Desc=Gestione proposte commerciali
 Module22Name=Posta massiva
@@ -546,29 +552,29 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Calendario web
 Module410Desc=Integrazione calendario web
-Module500Name=Spese speciali
-Module500Desc=Gestione delle sepse speciali (tasse, contributi, dividendi)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Pagamento stipendi dipendenti
 Module510Desc=Record and follow payment of your employee wages
 Module520Name=Prestito
 Module520Desc=Gestione dei prestiti
 Module600Name=Notifiche di eventi lavorativi
 Module600Desc=Inviare notifiche EMail (generate da eventi aziendali) ad utenti (impostazione definita per ogni utente) o contatti di terze parti (impostazione definita per ogni terza parte) o a email predefinite
-Module600Long=Note that this module is dedicated to send real time emails when a dedicated business event occurs. If you are looking for a feature to send reminders by email of your agenda events, go into setup of module Agenda.
+Module600Long=Nota che questo modulo è dedicato all'invio di e-mail in tempo reale quando si verifica un evento aziendale dedicato. Se stai cercando una funzione per inviare promemoria via e-mail dei tuoi eventi in agenda, vai alla configurazione del modulo Agenda.
 Module610Name=Varianti prodotto
 Module610Desc=Allows creation of products variant based on attributes (color, size, ...)
 Module700Name=Donazioni
 Module700Desc=Gestione donazioni
 Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Integrazione Mantis
 Module1520Name=Generazione dei documenti
 Module1520Desc=Mass mail document generation
 Module1780Name=Tag/categorie
-Module1780Desc=Crea tag / categorie (prodotti, clienti, fornitori, contatti o membri)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=FCKeditor
 Module2000Desc=Permette di utilizzare per alcune aree di testo un edito avanzato (basato su CKEditor)
 Module2200Name=Prezzi dinamici
@@ -576,7 +582,7 @@ Module2200Desc=Abilita l'utilizzo di espressioni matematiche per i prezzi
 Module2300Name=Processi pianificati
 Module2300Desc=Gestione delle operazioni pianificate
 Module2400Name=Eventi/Agenda
-Module2400Desc=Gestione eventi/compiti e ordine del giorno. Registra manualmente eventi nell'agenda o consenti all'applicazione di registrare eventi automaticamente a scopo di monitoraggio
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API/Web services (SOAP server)
@@ -613,7 +619,7 @@ Module50100Desc=Modulo per la creazione di un punto vendita (POS)
 Module50200Name=Paypal
 Module50200Desc=Modulo per offrire una pagina di pagamento che accetti pagamenti PayPal (carte di credito o credito PayPal). Può essere usato per tutti i pagamenti dei clienti o solo per alcune specifiche tipologie di pagamenti in Dolibarr (fatture, ordini, ...) 
 Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=PrintIPP
 Module54000Desc=Stampa diretta (senza aprire i documenti) tramite l'interfaccia CUPS IPP (la stampante deve essere visibile dal server, e il server deve avere CUPS installato).
 Module55000Name=Sondaggio, Indagine o Votazione
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolleranza sul ritardo (in giorni) prima di un avverti
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolleranza sul ritardo (in giorni) prima un avvertimento per deposito di assegni da fare
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolleranza (in giorni) prima di avvisare per l'approvazione delle note spese
 SetupDescription1=La sezione impostazioni consente il setup iniziale di Dolibarr prima del suo utilizzo.
-SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=Altre voci di menu consentono la gestione di parametri opzionali.
 LogEvents=Eventi di audit di sicurezza
 Audit=Audit
@@ -1054,8 +1060,9 @@ LogEventDesc=Qui è possibile attivare il registro eventi di sicurezza di Doliba
 AreaForAdminOnly=I parametri di setup possono essere definiti solo da utenti di tipo <b>amministratore</b>.
 SystemInfoDesc=Le informazioni di sistema sono dati tecnici visibili in sola lettura e solo dagli amministratori.
 SystemAreaForAdminOnly=Questa sezione è disponibile solo agli utenti di tipo <b>amministratore</b>. Nessuna delle autorizzazioni disponibili può alterare questo limite.
-CompanyFundationDesc=In questa pagina puoi modificare tutte le informazioni della società o fondazione che intendi gestire (Per farlo clicca sui pulsanti "Modifica" o "Salva" in fondo alla pagina)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=Qui è possibile scegliere i parametri relativi all'aspetto di Dolibarr
 AvailableModules=Moduli disponibili
 ToActivateModule=Per attivare i moduli, andare nell'area <b>Impostazioni</b> (Home->Impostazioni->Moduli).
@@ -1188,11 +1195,11 @@ UserMailRequired=È obbligatorio inserire un indirzzo email per creare un nuovo
 HRMSetup=Impostazioni modulo risorse umane
 ##### Company setup #####
 CompanySetup=Impostazioni modulo aziende
-CompanyCodeChecker=Modulo per la generazione e verifica dei codici di terzi  (cliente o fornitore)
-AccountCodeManager=Module for accounting code generation (customer or supplier)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
 NotificationsDescUser=* per utente, un utente alla volta.
-NotificationsDescContact=** per contatto di soggetti terzi (clienti o fornitori), un contatto alla volta.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
 ModelModules=Modelli per i documenti
 DocumentModelOdt=Generare documenti da modelli OpenDocuments (file .ODT o .ODS per OpenOffice, KOffice, TextEdit, ecc...)
@@ -1203,6 +1210,9 @@ MustBeUnique=Deve essere unico?
 MustBeMandatory=Obbligatorio per creare il soggetto terzo?
 MustBeInvoiceMandatory=Obbligatorio per convalidare le fatture?
 TechnicalServicesProvided=Servizi tecnici forniti
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Un link per esportare <b>%s</b> è disponibile al seguente link: %s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=Testo libero sulle proposte commerciali
 WatermarkOnDraftProposal=Bozze dei preventivi filigranate (nessuna filigrana se vuoto)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
 ##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=Configurazione della gestione ordini
 OrdersNumberingModules=Modelli di numerazione degli ordini
@@ -1264,7 +1274,7 @@ MemberMainOptions=Opzioni principali
 AdherentLoginRequired= Gestire un account di accesso per ogni membro
 AdherentMailRequired=Email obbligatoria per creare un nuovo membro
 MemberSendInformationByMailByDefault=Checkbox per inviare una mail di conferma per i membri (è attiva per impostazione predefinita)
-VisitorCanChooseItsPaymentMode=Visitor can choose among available payment modes
+VisitorCanChooseItsPaymentMode=Il visitatore può scegliere tra le modalità di pagamento disponibili
 ##### LDAP setup #####
 LDAPSetup=Impostazioni del protocollo LDAP
 LDAPGlobalParameters=Parametri globali
@@ -1449,7 +1459,7 @@ YouCanUseDOL_DATA_ROOT=È possibile utilizzare DOL_DATA_ROOT/dolibarr.log come f
 ErrorUnknownSyslogConstant=La costante %s è sconosciuta a syslog.
 OnlyWindowsLOG_USER=Solo utenti Windows supportano LOG_USER
 CompressSyslogs=Syslog files compression and backup
-SyslogFileNumberOfSaves=Log backups
+SyslogFileNumberOfSaves=Backup dei registri
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Impostazioni modulo donazioni
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=Connessione al server ' %s' sul database' %s' con l'utente ' %s
 OSCommerceTestKo1=Connessione al server ' %s' riuscita, ma il database' %s' non è raggiungibile.
 OSCommerceTestKo2=Connessione al server ' %s' con l'utente' %s' fallita.
 ##### Stock #####
-StockSetup=Impostazioni modulo magazzino
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
 ##### Menu #####
 MenuDeleted=Menu soppresso
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
 MultiCompanySetup=Impostazioni modulo multiazienda
 ##### Suppliers #####
 SuppliersSetup=Impostazioni modulo fornitori
-SuppliersCommandModel=Modello completo di ordine fornitore (logo...)
-SuppliersInvoiceModel=Modello completo di fattura fornitore (logo...)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Modello per la numerazione delle fatture fornitore
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=Non utilizzare caratteri ambigui ("1", "l", "i", "|",
 SalariesSetup=Impostazioni del modulo stipendi
 SortOrder=Ordina
 Format=Formato
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Impostazioni del modulo note spese
 TemplatePDFExpenseReports=Document templates to generate expense report document
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Install of external module from applic
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Evidenzia le righe delle tabelle passandoci sopra con il mouse
-TextTitleColor=Colore del titolo di pagina
+TextTitleColor=Text color of Page title
 LinkColor=Colore dei link
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Funziona con il tema Eldy ma non è supportato da tutti gli altri temi
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=Background color for Top menu
 TopMenuDisableImages=Nascondi le icone nel menu superiore
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Colore di sfondo della riga di intestazione
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Periodo minimo di avviso (le richieste di ferie/permesso dovranno essere effettuate prima di questo periodo)
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Checksum previsto
 CurrentChecksum=Checksum attuale
 ForcedConstants=Required constant values
-MailToSendProposal=Inviare proposta cliente
-MailToSendOrder=Inviare ordine cliente
-MailToSendInvoice=Inviare fattura
-MailToSendShipment=Inviare spedizione
-MailToSendIntervention=Inviare intervento
-MailToSendSupplierRequestForQuotation=Inviare richiesta di preventivo a fornitore
-MailToSendSupplierOrder=Inviare ordine fornitore
-MailToSendSupplierInvoice=Inviare fattura fornitore
-MailToSendContract=Per spedire un contratto
-MailToThirdparty=To send email from third party page
-MailToMember=To send email from member page
-MailToUser=Per inviare un mail dalla pagina utente
-MailToProject= To send email from project page
+MailToSendProposal=Proposte del cliente
+MailToSendOrder=Ordini dei clienti
+MailToSendInvoice=Fatture attive
+MailToSendShipment=Spedizioni
+MailToSendIntervention=Interventi
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Contratti
+MailToThirdparty=Soggetti terzi
+MailToMember=Membri
+MailToUser=Utenti
+MailToProject=Projects page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=Stai usando l'ultima versione stabile
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1774,16 +1785,19 @@ WarningNoteModuleInvoiceForFrenchLaw=This module %s is compliant with french law
 WarningNoteModulePOSForFrenchLaw=This module %s is compliant with french laws (Loi Finance 2016) because module Non Reversible Logs is automatically activated.
 WarningInstallationMayBecomeNotCompliantWithLaw=You try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
 MAIN_PDF_MARGIN_LEFT=Margine sinistro sul PDF
-MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
+MAIN_PDF_MARGIN_RIGHT=Margine destro sul PDF
 MAIN_PDF_MARGIN_TOP=Margine superiore sul PDF
 MAIN_PDF_MARGIN_BOTTOM=Margine inferiore su PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Configurazione del modulo Risorse
 UseSearchToSelectResource=Utilizza il form di ricerca per scegliere una risorsa (invece della lista a tendina)
 DisabledResourceLinkUser=Disable feature to link a resource to users
 DisabledResourceLinkContact=Disable feature to link a resource to contacts
-ConfirmUnactivation=Confirm module reset
+ConfirmUnactivation=Conferma reset del modulo
diff --git a/htdocs/langs/it_IT/agenda.lang b/htdocs/langs/it_IT/agenda.lang
index 730a8530303..c1a87614c94 100644
--- a/htdocs/langs/it_IT/agenda.lang
+++ b/htdocs/langs/it_IT/agenda.lang
@@ -35,7 +35,7 @@ AgendaAutoActionDesc= Definire qui gli eventi per i quali si desidera che Doliba
 AgendaSetupOtherDesc= Questa pagina consente di configurare gli altri parametri del modulo calendario.
 AgendaExtSitesDesc=Questa pagina consente di configurare i calendari esterni da includere nell'agenda di dolibarr.
 ActionsEvents=Eventi per i quali creare un'azione
-EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into Agenda module setup.
+EventRemindersByEmailNotEnabled=I promemoria degli eventi via e-mail non sono stati abilitati nell'impostazione del modulo Agenda.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Soggetto terzo %s creato
 ContractValidatedInDolibarr=Contratto %s convalidato
@@ -53,9 +53,9 @@ MemberValidatedInDolibarr=Membro %s convalidato
 MemberModifiedInDolibarr=Membro %s modificato
 MemberResiliatedInDolibarr=Membro %s terminato
 MemberDeletedInDolibarr=Membro %s eliminato
-MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
-MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
-MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
+MemberSubscriptionAddedInDolibarr=Adesione %s per membro %s aggiunta
+MemberSubscriptionModifiedInDolibarr=Adesione %s per membro %s modificata
+MemberSubscriptionDeletedInDolibarr=Adesione %s per membro %s eliminata
 ShipmentValidatedInDolibarr=Spedizione %s convalidata
 ShipmentClassifyClosedInDolibarr=Spedizione %s classificata come fatturata
 ShipmentUnClassifyCloseddInDolibarr=Spedizione %s classificata come riaperta
@@ -97,10 +97,10 @@ DateActionStart=Data di inizio
 DateActionEnd=Data di fine
 AgendaUrlOptions1=È inoltre possibile aggiungere i seguenti parametri ai filtri di output:
 AgendaUrlOptions3=<b>logina = %s</b> per limitare l'output alle azioni amministrate dall'utente<b>%s</b>
-AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
-AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
-AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
+AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> per limitare l'output alle azioni non di proprietà dell'utente <b>%s</b>.
+AgendaUrlOptions4=<b>logint=%s</b> per limitare l'output alle azioni assegnate all'utente <b>%s</b> (proprietario e altri).
+AgendaUrlOptionsProject=<b>project= __PROJECT_ID__</b> per limitare l'output alle azioni collegate al progetto <b>__PROJECT_ID__ </b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> per escludere l'evento automatico.
 AgendaShowBirthdayEvents=Visualizza i compleanni dei contatti
 AgendaHideBirthdayEvents=Nascondi i compleanni dei contatti
 Busy=Occupato
@@ -112,7 +112,7 @@ ExportCal=Esporta calendario
 ExtSites=Calendari esterni
 ExtSitesEnableThisTool=Mostra calendari esterni (definiti nelle impostazioni generali) nell'agenda. Questo non influisce sui calendari esterni definiti dall'utente.
 ExtSitesNbOfAgenda=Numero di calendari
-AgendaExtNb=Calendar no. %s
+AgendaExtNb=Calendario n. %s
 ExtSiteUrlAgenda=URL per accedere al file ICal
 ExtSiteNoLabel=Nessuna descrizione
 VisibleTimeRange=Filtro orari visibili
diff --git a/htdocs/langs/it_IT/bills.lang b/htdocs/langs/it_IT/bills.lang
index 32b51ef793d..40d4bb983ec 100644
--- a/htdocs/langs/it_IT/bills.lang
+++ b/htdocs/langs/it_IT/bills.lang
@@ -11,8 +11,8 @@ BillsSuppliersUnpaidForCompany=Fatture passive non pagate per %s
 BillsLate=Ritardi nei pagamenti
 BillsStatistics=Statistiche fatture attive
 BillsStatisticsSuppliers=Statistiche fatture passive
-DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping
-DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter.
+DisabledBecauseDispatchedInBookkeeping=Disabilitato perché la fattura è stata inviata alla contabilità
+DisabledBecauseNotLastInvoice=Disabilitato perché la fattura non è cancellabile. Alcune fatture sono state registrate dopo questa e si creerebbero errori nella sequenza di numerazione.
 DisabledBecauseNotErasable=Disabilitata perché impossibile da cancellare
 InvoiceStandard=Fattura Standard
 InvoiceStandardAsk=Fattura Standard
@@ -62,12 +62,12 @@ PaymentBack=Rimborso
 CustomerInvoicePaymentBack=Rimborso
 Payments=Pagamenti
 PaymentsBack=Rimborsi
-paymentInInvoiceCurrency=in invoices currency
+paymentInInvoiceCurrency=nella valuta delle fatture
 PaidBack=Rimborsato
 DeletePayment=Elimina pagamento
 ConfirmDeletePayment=Vuoi davvero cancellare questo pagamento?
 ConfirmConvertToReduc=Vuoi trasformare questa nota di credito in uno sconto assoluto?<br/> L'importo di tale credito verrà salvato nello sconto assoluto del cliente e potrà essere utilizzato come sconto per una successiva fattura a questo cliente.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this supplier.
+ConfirmConvertToReducSupplier=Vuoi convertire %s in uno sconto assoluto?<br>L'importo verrà salvato tra tutti gli sconti e potrebbe essere utilizzato come sconto per una fattura attuale o futura di questo fornitore.
 SupplierPayments=Pagamenti fornitori
 ReceivedPayments=Pagamenti ricevuti
 ReceivedCustomersPayments=Pagamenti ricevuti dai clienti
@@ -92,7 +92,7 @@ PaymentAmount=Importo del pagamento
 ValidatePayment=Convalidare questo pagamento?
 PaymentHigherThanReminderToPay=Pagamento superiore alla rimanenza da pagare
 HelpPaymentHigherThanReminderToPay=Attenzione, l'importo del pagamento di una o più fatture è più elevato rispetto al dovuto.<br/> Modifica l'importo, oppure conferma e crea una nota di credito per la differenza riscossa.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPaySupplier=Attenzione, l'importo del pagamento di una o più fatture è superiore al residuo da pagare. <br> Modifica l'importo, altrimenti conferma e crea una nota di credito per l'eccedenza pagata.
 ClassifyPaid=Classifica come "pagata"
 ClassifyPaidPartially=Classifica come "parzialmente pagata"
 ClassifyCanceled=Classifica come "abbandonata"
@@ -109,9 +109,9 @@ CancelBill=Annulla una fattura
 SendRemindByMail=Promemoria tramite email
 DoPayment=Registra pagamento
 DoPaymentBack=Emetti rimborso
-ConvertToReduc=Converti in futuro sconto
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Converti l'eccedenza ricevuta in un futuro sconto
-ConvertExcessPaidToReduc=Convert excess paid into future discount
+ConvertExcessPaidToReduc=Converti l'eccesso pagato in sconto futuro
 EnterPaymentReceivedFromCustomer=Inserisci il pagamento ricevuto dal cliente
 EnterPaymentDueToCustomer=Emettere il pagamento dovuto al cliente
 DisabledBecauseRemainderToPayIsZero=Disabilitato perché il restante da pagare vale zero
@@ -120,8 +120,8 @@ BillStatus=Stato fattura
 StatusOfGeneratedInvoices=Stato delle fatture generate
 BillStatusDraft=Bozza (deve essere convalidata)
 BillStatusPaid=Pagata
-BillStatusPaidBackOrConverted=Nota di credito rimborsata o convertita in sconto
-BillStatusConverted=Paid (ready for consumption in final invoice)
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
+BillStatusConverted=Pagato (pronto per l'utilizzo nella fattura finale)
 BillStatusCanceled=Annullata
 BillStatusValidated=Convalidata (deve essere pagata)
 BillStatusStarted=Iniziata
@@ -150,19 +150,19 @@ ErrorDiscountAlreadyUsed=Errore, sconto già utilizzato
 ErrorInvoiceAvoirMustBeNegative=Errore, la fattura a correzione deve avere un importo negativo
 ErrorInvoiceOfThisTypeMustBePositive=Errore, questo tipo di fattura deve avere importo positivo
 ErrorCantCancelIfReplacementInvoiceNotValidated=Errore, non si può annullare una fattura che è stato sostituita da un'altra fattura non ancora convalidata
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount serie cant be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Questa parte o un'altra è già utilizzata in modo che la serie di sconti non possa essere rimossa.
 BillFrom=Da
 BillTo=A
 ActionsOnBill=Azioni su fattura
 RecurringInvoiceTemplate=Template/fatture ricorrenti
-NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
-FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
-NotARecurringInvoiceTemplate=Not a recurring template invoice
+NoQualifiedRecurringInvoiceTemplateFound=Nessun modello ricorrente di fattura è abilitato per la generazione.
+FoundXQualifiedRecurringInvoiceTemplate=Trovato %s modelli ricorrenti di fattura abilitati per la generazione.
+NotARecurringInvoiceTemplate=Non un modello ricorrente di fattura
 NewBill=Nuova fattura
 LastBills=Ultime %s fatture
-LatestTemplateInvoices=Latest %s template invoices
-LatestCustomerTemplateInvoices=Latest %s customer template invoices
-LatestSupplierTemplateInvoices=Latest %s supplier template invoices
+LatestTemplateInvoices=Ultimi %s modelli fattura
+LatestCustomerTemplateInvoices=Ultimi %s modelli fattura cliente
+LatestSupplierTemplateInvoices=Ultimi %s modelli fattura fornitore
 LastCustomersBills=Ultime %s fatture attive
 LastSuppliersBills=Ultime %s fatture passive
 AllBills=Tutte le fatture
@@ -181,7 +181,7 @@ ConfirmCancelBillQuestion=Perché vuoi classificare questa fattura come "abbando
 ConfirmClassifyPaidPartially=Vuoi davvero cambiare lo stato della fattura <b>%s</b> in "pagato"?
 ConfirmClassifyPaidPartiallyQuestion=La fattura non è stata pagata completamente. Per quale ragione vuoi chiudere questa fattura?
 ConfirmClassifyPaidPartiallyReasonAvoir=Il restante da pagare <b>(%s %s)</b> viene scontato perché il pagamento è stato eseguito entro il termine. L'IVA sarà regolarizzata mediante nota di credito.
-ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
+ConfirmClassifyPaidPartiallyReasonDiscount=Il restante da pagare <b>(%s %s)</b> viene scontato perché il pagamento è stato effettuato entro il termine.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Il restante da pagare <b>(%s %s)</b> viene scontato perché il pagamento è stato eseguito entro il termine. Accetto di perdere l'IVA sullo sconto.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Il restante da pagare <b>(%s %s)</b> viene scontato perché il pagamento è stato eseguito entro il termine. L'IVA sullo sconto sarà recuperata senza nota di credito.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Cliente moroso
@@ -222,7 +222,7 @@ RemainderToPayBack=Restante da rimborsare
 Rest=In attesa
 AmountExpected=Importo atteso
 ExcessReceived=Ricevuto in eccesso
-ExcessPaid=Excess paid
+ExcessPaid=Eccesso pagato
 EscompteOffered=Sconto offerto (pagamento prima del termine)
 EscompteOfferedShort=Sconto
 SendBillRef=Invio della fattura %s
@@ -240,9 +240,9 @@ SendReminderBillByMail=Inviare promemoria via email
 RelatedCommercialProposals=Proposte commerciali correlate
 RelatedRecurringCustomerInvoices=Fatture attive ricorrenti correlate
 MenuToValid=Da validare
-DateMaxPayment=Payment due on
+DateMaxPayment=Pagamento dovuto per
 DateInvoice=Data di fatturazione
-DatePointOfTax=Point of tax
+DatePointOfTax=Punto di imposta
 NoInvoice=Nessuna fattura
 ClassifyBill=Classificazione fattura
 SupplierBillsToPay=Fatture passive non pagate
@@ -250,7 +250,7 @@ CustomerBillsUnpaid=Fatture attive non pagate
 NonPercuRecuperable=Non recuperabile
 SetConditions=Imposta le condizioni di pagamento
 SetMode=Imposta la modalità di pagamento
-SetRevenuStamp=Set revenue stamp
+SetRevenuStamp=Imposta marca da bollo
 Billed=Fatturati
 RecurringInvoices=Fatture ricorrenti
 RepeatableInvoice=Modello fattura
@@ -286,20 +286,20 @@ Deposit=Anticipo
 Deposits=Anticipi
 DiscountFromCreditNote=Sconto da nota di credito per %s
 DiscountFromDeposit=Anticipi per fatture %s
-DiscountFromExcessReceived=Payments in excess of invoice %s
-DiscountFromExcessPaid=Payments in excess of invoice %s
+DiscountFromExcessReceived=Pagamenti in eccesso della fattura %s
+DiscountFromExcessPaid=Pagamenti in eccesso della fattura %s
 AbsoluteDiscountUse=Questo tipo di credito può essere utilizzato su fattura prima della sua convalida
 CreditNoteDepositUse=La fattura deve essere convalidata per l'utilizzo di questo credito
 NewGlobalDiscount=Nuovo sconto globale
 NewRelativeDiscount=Nuovo sconto relativo
-DiscountType=Discount type
+DiscountType=Tipo sconto
 NoteReason=Note/Motivo
 ReasonDiscount=Motivo dello sconto
 DiscountOfferedBy=Sconto concesso da
-DiscountStillRemaining=Sconto ancora disponibile
-DiscountAlreadyCounted=Sconto già applicato
-CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
+CustomerDiscounts=Sconto clienti
+SupplierDiscounts=Vendors discounts
 BillAddress=Indirizzo di fatturazione
 HelpEscompte=Questo sconto è concesso al cliente perché il suo pagamento è stato effettuato prima del termine.
 HelpAbandonBadCustomer=Tale importo è stato abbandonato (cattivo cliente) ed è considerato come un abbandono imprevisto.
@@ -334,24 +334,30 @@ RelatedSupplierInvoices=Fatture passive correlate
 LatestRelatedBill=Ultima fattura correlata
 WarningBillExist=Attenzione, una o più fatture già esistenti
 MergingPDFTool=Strumento di fusione dei PDF
-AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+AmountPaymentDistributedOnInvoice=Importo del pagamento distribuito in fattura
+PaymentOnDifferentThirdBills=Consenti pagamenti su diverse fatture di terze parti ma appartenenti alla stessa società madre
 PaymentNote=Nota di pagamento
 ListOfPreviousSituationInvoices=Elenco delle fatture di avanzamento lavori precedenti
 ListOfNextSituationInvoices=Elenco delle prossime fatture di avanzamento lavori
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Ogni %s giorni
 FrequencyPer_m=Ogni %s mesi
 FrequencyPer_y=Ogni %s anni
-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
+FrequencyUnit=Unità di frequenza
+toolTipFrequency=Esempi:<br><b>Imposta 7, giorno</b>: invia una nuova fattura ogni 7 giorni<br><b>Imposta 3, mese </b>: invia una nuova fattura ogni 3 mesi
 NextDateToExecution=Data per la prossima generazione di fattura
-NextDateToExecutionShort=Date next gen.
+NextDateToExecutionShort=Data successiva gen.
 DateLastGeneration=Data dell'ultima generazione
-DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max number of invoice generation
-NbOfGenerationDone=Number of invoice generation already done
-NbOfGenerationDoneShort=Number of generation done
-MaxGenerationReached=Maximum number of generations reached
+DateLastGenerationShort=Data ultima gen.
+MaxPeriodNumber=Numero massimo di fatture generate
+NbOfGenerationDone=Numero di fatture generate già create
+NbOfGenerationDoneShort=Numero di generazione eseguita
+MaxGenerationReached=Numero massimo di generazioni raggiunto
 InvoiceAutoValidate=Convalida le fatture automaticamente
 GeneratedFromRecurringInvoice=Fattura ricorrente %s generata dal modello
 DateIsNotEnough=Data non ancora raggiunta
@@ -420,7 +426,7 @@ ExtraInfos=Extra info
 RegulatedOn=Regolamentato su
 ChequeNumber=Assegno N°
 ChequeOrTransferNumber=Assegno/Bonifico N°
-ChequeBordereau=Check schedule
+ChequeBordereau=Controlla programma
 ChequeMaker=Traente dell'assegno
 ChequeBank=Banca emittente
 CheckBank=Controllo
@@ -470,7 +476,7 @@ CantRemoveConciliatedPayment=Impossibile eliminare il pagamento conciliato
 PayedByThisPayment=Pagato con questo pagamento
 ClosePaidInvoicesAutomatically=Classifica come "Pagata" tutte le fatture, le note d'addebitoo le note di credito interamente pagate.
 ClosePaidCreditNotesAutomatically=Classifica come "Pagata" tutte le note di credito interamente rimborsate
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
+ClosePaidContributionsAutomatically=Classificare "Pagato" tutti i contributi sociali o fiscali interamente versati.
 AllCompletelyPayedInvoiceWillBeClosed=Tutte le fatture totalmente pagate saranno automaticamente chiuse allo stato "Pagato".
 ToMakePayment=Paga
 ToMakePaymentBack=Rimborsa
@@ -478,14 +484,14 @@ ListOfYourUnpaidInvoices=Elenco fatture non pagate
 NoteListOfYourUnpaidInvoices=Nota: questo elenco contiene solo fatture che hai collegato ad un rappresentante.
 RevenueStamp=Marca da bollo
 YouMustCreateInvoiceFromThird=Questa opzione è disponibile solo per la creazione di una fattura dalla maschera "cliente" del soggetto terzo.
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
+YouMustCreateInvoiceFromSupplierThird=Questa opzione è disponibile solo quando si crea la fattura dalla scheda "fornitore" del soggetto terzo
 YouMustCreateStandardInvoiceFirstDesc=Per creare un nuovo modelo bisogna prima creare una fattura normale e poi convertirla.
 PDFCrabeDescription=Modello di fattura Crabe. (Modello raccomandatoi)
 PDFCrevetteDescription=Modello di fattura Crevette. Template completo per le fatture (Modello raccomandato)
 TerreNumRefModelDesc1=Restituisce un numero nel formato %syymm-nnnn per le fatture, %syymm-nnnn per le note di credito e %syymm-nnnn per i versamenti, dove yy è l'anno, mm è il mese e nnnn è una sequenza progressiva, senza salti e che non si azzera.
 MarsNumRefModelDesc1=restituisce un numero nel formato %saamm-nnnn per fatture standard, %syymm-nnnn per le fatture sostitutive, %syymm-nnnn per le note d'addebito e %syymm-nnnn per le note di credito dove yy sta per anno, mm per mese e nnnn è una sequenza progressiva, senza salti e che non si azzera.
 TerreNumRefModelError=Un altro modello di numerazione con sequenza $ syymm è già esistente e non è compatibile con questo modello. Rimuovere o rinominare per attivare questo modulo.
-CactusNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+CactusNumRefModelDesc1=Restituisce il numero con formato %syymm-nnnn per le fatture standard, %syymm-nnnn per le note di credito e %syymm-nnnn per le fatture di acconto dove yy è l'anno, mm è il mese e nnnn è una sequenza senza interruzioni e senza ritorno a 0
 ##### Types de contacts #####
 TypeContact_facture_internal_SALESREPFOLL=Responsabile pagamenti clienti
 TypeContact_facture_external_BILLING=Contatto fatturazioni clienti
@@ -502,33 +508,39 @@ InvoiceSituation=Fattura ad avanzamento lavori
 InvoiceSituationAsk=Fattura a seguito di avanzamento lavori
 InvoiceSituationDesc=Crea un nuovo avanzamento lavori a seguito di uno già esistente
 SituationAmount=Importo della fattura di avanzamento lavori (al netto delle imposte)
-SituationDeduction=Situation subtraction
+SituationDeduction=Sottrazione avanzamento
 ModifyAllLines=Modifica tutte le righe
 CreateNextSituationInvoice=Crea il prossimo avanzamento lavori
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=Questa fattura non è la più recente e non può essere modificata
 DisabledBecauseNotLastInCycle=Il prossimo avanzamento lavori esiste già
 DisabledBecauseFinal=Questo è l'avanzamento lavori finale
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=Dom
 CantBeLessThanMinPercent=Il valore dell'avanzamento non può essere inferiore al valore precedente.
 NoSituations=Nessuna situazione aperta
 InvoiceSituationLast=Fattura a conclusione lavori
 PDFCrevetteSituationNumber=Situazione n°%s
-PDFCrevetteSituationInvoiceLineDecompte=Situation invoice - COUNT
+PDFCrevetteSituationInvoiceLineDecompte=Fattura ad avanzamento lavori - COUNT
 PDFCrevetteSituationInvoiceTitle=Fattura di avanzamento lavori
-PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
+PDFCrevetteSituationInvoiceLine=Avanzamento N°%s: Inv. N°%s su %s
 TotalSituationInvoice=Totale avanzamento lavori
-invoiceLineProgressError=Invoice line progress can't be greater than or equal to the next invoice line
+invoiceLineProgressError=L'avanzamento della riga fattura non può essere maggiore o uguale alla successiva riga fattura
 updatePriceNextInvoiceErrorUpdateline=Errore: aggiornamento prezzo della riga di fattura: %s
 ToCreateARecurringInvoice=Per creare una fattura ricorrente per questo contratto, creare inizialmente la bozza di fattura, poi convertirla in un modello di fattura e definire quindi la frequenza di generazione delle future fatture.
 ToCreateARecurringInvoiceGene=Per generare regolarmente e manualmente le prossime fatture, basta andare sul menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+ToCreateARecurringInvoiceGeneAuto=Se è necessario che tali fatture vengano generate automaticamente, chiedere all'amministratore di abilitare e impostare il modulo <strong>%s</strong>. Si noti che entrambi i metodi (manuale e automatico) possono essere utilizzati insieme senza alcun rischio di duplicazione.
 DeleteRepeatableInvoice=Elimina template di fattura
-ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
+ConfirmDeleteRepeatableInvoice=Sei sicuro di voler eliminare il modello di fattura?
 CreateOneBillByThird=Crea una fattura per soggetto terzo (altrimenti, una fatture per ordine)
-BillCreated=%s bill(s) created
-StatusOfGeneratedDocuments=Status of document generation
-DoNotGenerateDoc=Do not generate document file
-AutogenerateDoc=Auto generate document file
-AutoFillDateFrom=Set start date for service line with invoice date
-AutoFillDateFromShort=Set start date
-AutoFillDateTo=Set end date for service line with next invoice date
-AutoFillDateToShort=Set end date
+BillCreated=%s fattura creata
+StatusOfGeneratedDocuments=Stato della generazione del documento
+DoNotGenerateDoc=Non generare il documento
+AutogenerateDoc=Genera automaticamente il documento
+AutoFillDateFrom=Imposta data di inizio per la riga di servizio con la data fattura
+AutoFillDateFromShort=Imposta data di inizio
+AutoFillDateTo=Imposta data di fine per la riga di servizio con la successiva data fattura
+AutoFillDateToShort=Imposta data di fine
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/it_IT/categories.lang b/htdocs/langs/it_IT/categories.lang
index f8d31fd6bfd..439f5584965 100644
--- a/htdocs/langs/it_IT/categories.lang
+++ b/htdocs/langs/it_IT/categories.lang
@@ -85,3 +85,4 @@ CategorieRecursivHelp=Se attivata, il prodotto sarà inserito anche nella catego
 AddProductServiceIntoCategory=Aggiungi il seguente prodotto/servizio
 ShowCategory=Mostra tag/categoria
 ByDefaultInList=Default nella lista
+ChooseCategory=Choose category
diff --git a/htdocs/langs/it_IT/commercial.lang b/htdocs/langs/it_IT/commercial.lang
index 9bdea5d06e7..21e2bd41b1d 100644
--- a/htdocs/langs/it_IT/commercial.lang
+++ b/htdocs/langs/it_IT/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=Chiudere
 ActionAC_EMAILING=Invia email di massa
 ActionAC_COM=Per inviare via email
 ActionAC_SHIP=Invia spedizione per posta
-ActionAC_SUP_ORD=Invia ordine fornitore tramite email
-ActionAC_SUP_INV=Invia fattura fornitore tramite email
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=Altro
 ActionAC_OTH_AUTO=Eventi aggiunti automaticamente
 ActionAC_MANUAL=Eventi inseriti a mano
@@ -71,9 +71,9 @@ Stats=Statistiche vendite
 StatusProsp=Stato del cliente potenziale
 DraftPropals=Bozze di proposte commerciali
 NoLimit=Nessun limite
-ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
-ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
-ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
-FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
+ToOfferALinkForOnlineSignature=Link per firma online
+WelcomeOnOnlineSignaturePage=Benvenuti nella pagina per accettare proposte commerciali da %s
+ThisScreenAllowsYouToSignDocFrom=Questa schermata consente di accettare e firmare, o rifiutare, un preventivo/proposta commerciale
+ThisIsInformationOnDocumentToSign=Queste sono informazioni sul documento da accettare o rifiutare
+SignatureProposalRef=Firma del preventivo/proposta commerciale %s
+FeatureOnlineSignDisabled=Funzionalità per la firma online disattivata o documento generato prima che la funzione fosse abilitata
diff --git a/htdocs/langs/it_IT/companies.lang b/htdocs/langs/it_IT/companies.lang
index bbc0e66f367..92d91250a90 100644
--- a/htdocs/langs/it_IT/companies.lang
+++ b/htdocs/langs/it_IT/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Vuoi davvero eliminare questo contatto e tutte le informazi
 MenuNewThirdParty=Nuovo soggetto terzo
 MenuNewCustomer=Nuovo cliente
 MenuNewProspect=Nuovo cliente potenziale
-MenuNewSupplier=Nuovo fornitore
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=Nuovo privato
-NewCompany=Nuova società (cliente, cliente potenziale, fornitore)
-NewThirdParty=Nuovo soggetto terzo (cliente, cliente potenziale, fornitore)
-CreateDolibarrThirdPartySupplier=Crea una terza parte (fornitore)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=Crea soggetto terzo
 CreateThirdPartyAndContact=Crea un soggetto terzo + un contatto
 ProspectionArea=Area clienti potenziali
@@ -37,14 +37,14 @@ ThirdPartyProspectsStats=Clienti potenziali
 ThirdPartyCustomers=Clienti
 ThirdPartyCustomersStats=Clienti
 ThirdPartyCustomersWithIdProf12=Clienti con %s o %s
-ThirdPartySuppliers=Fornitori
+ThirdPartySuppliers=Vendors
 ThirdPartyType=Tipo di soggetto terzo
 Individual=Privato
 ToCreateContactWithSameName=Sarà creato automaticamente un contatto/indirizzo con le stesse informazione del soggetto terzo. Nella maggior parte dei casi, anche se il soggetto terzo è una persona fisica, creare solo la terza parte è sufficiente.
 ParentCompany=Società madre
 Subsidiaries=Controllate
-ReportByMonth=Report by month
-ReportByCustomers=Report by customer
+ReportByMonth=Rapporto per mese
+ReportByCustomers=Segnalato dal cliente
 ReportByQuarter=Report per trimestre
 CivilityCode=Titolo
 RegisteredOffice=Sede legale
@@ -76,12 +76,12 @@ Town=Città
 Web=Sito web
 Poste= Posizione
 DefaultLang=Lingua predefinita
-VATIsUsed=Sales tax is used
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
-VATIsNotUsed=Sales tax is not used
+VATIsUsed=L'imposta sulle vendite viene utilizzata
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=L'imposta sulle vendite non viene utilizzata
 CopyAddressFromSoc=Compila l'indirizzo con l'indirizzo del soggetto terzo
-ThirdpartyNotCustomerNotSupplierSoNoRef=Soggetto terzo né cliente né fornitore, nessun oggetto di riferimento disponibile
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Conto bancario usato per il pagamento:
 OverAllProposals=Proposte
 OverAllOrders=Ordini
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=Re-inserisci
 TypeLocaltax2ES=Tipo IRPF
 WrongCustomerCode=Codice cliente non valido
-WrongSupplierCode=Codice fornitore non valido
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Modello codice cliente
-SupplierCodeModel=Modello codice fornitore
+SupplierCodeModel=Vendor code model
 Gencod=Codice a barre
 ##### Professional ID #####
 ProfId1Short=C.C.I.A.A.
@@ -258,34 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=Sales tax ID
-VATIntraShort=Tax ID
+VATIntra=ID imposta sulle vendite
+VATIntraShort=ID imposta
 VATIntraSyntaxIsValid=La sintassi è valida
-VATReturn=VAT return
+VATReturn=Rimborso IVA
 ProspectCustomer=Cliente/Cliente potenziale
 Prospect=Cliente potenziale
 CustomerCard=Scheda del cliente
 Customer=Cliente
 CustomerRelativeDiscount=Sconto relativo del cliente
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=Sconto relativo
 CustomerAbsoluteDiscountShort=Sconto assoluto
 CompanyHasRelativeDiscount=Il cliente ha uno sconto del <b> %s%% </b>
 CompanyHasNoRelativeDiscount=Il cliente non ha alcuno sconto relativo impostato
-HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
-HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
+HasRelativeDiscountFromSupplier=Hai uno sconto predefinito di <b>%s%%</b> da questo fornitore
+HasNoRelativeDiscountFromSupplier=Non hai uno sconto relativo predefinito da questo fornitore
 CompanyHasAbsoluteDiscount=Questo cliente ha degli sconti disponibili (note di crediti o anticipi) per un totale di <b>%s</b>%s
 CompanyHasDownPaymentOrCommercialDiscount=Questo cliente ha uno sconto disponibile (commerciale, nota d'accredito) per <b>%s</b>%s
 CompanyHasCreditNote=Il cliente ha ancora note di credito per <b> %s %s </b>
-HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
-HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
-HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
-HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
+HasNoAbsoluteDiscountFromSupplier=Non hai crediti di sconto disponibili da questo fornitore
+HasAbsoluteDiscountFromSupplier=Hai sconti disponibili (note di credito o acconti) per <b>%s</b> %s da questo fornitore
+HasDownPaymentOrCommercialDiscountFromSupplier=Hai sconti disponibili (commerciali, acconti) per <b>%s</b> %s da questo fornitore
+HasCreditNoteFromSupplier=Hai note di credito per <b>%s</b> %s da questo fornitore
 CompanyHasNoAbsoluteDiscount=Il cliente non ha disponibile alcuno sconto assoluto per credito
-CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
-CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+CustomerAbsoluteDiscountAllUsers=Sconti assoluti per il cliente (concessi da tutti gli utenti)
+CustomerAbsoluteDiscountMy=Sconti assoluti per il cliente (concesso da te)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=Nessuno
 Supplier=Fornitore
 AddContact=Crea contatto
@@ -304,13 +304,13 @@ DeleteACompany=Elimina una società
 PersonalInformations=Dati personali
 AccountancyCode=Account di contabilità
 CustomerCode=Codice cliente
-SupplierCode=Codice fornitore
+SupplierCode=Vendor code
 CustomerCodeShort=Codice cliente
-SupplierCodeShort=Codice fornitore
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=Codice cliente, univoco
-SupplierCodeDesc=Codice fornitore, univoco
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=Obbligatorio se il soggetto terzo è un cliente o un cliente potenziale
-RequiredIfSupplier=Obbligatorio se il soggetto terzo è un fornitore
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=Validità controllata dal modulo
 ThisIsModuleRules=Regole per questo modulo
 ProspectToContact=Cliente potenziale da contattare
@@ -338,7 +338,7 @@ MyContacts=I miei contatti
 Capital=Capitale
 CapitalOf=Capitale di %s
 EditCompany=Modifica società
-ThisUserIsNot=Questo utente non è un cliente , né un cliente potenziale, né un fornitore
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=Controllo partita IVA
 VATIntraCheckDesc=Il link <b>%s</b> permette di controllare la partita IVA tramite un servizio esterno. È necessario che il server possa accedere ad internet.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -390,13 +390,13 @@ NoDolibarrAccess=Senza accesso a Dolibarr
 ExportDataset_company_1=Terze parti (Aziende/fondazioni/persone fisiche) e proprietà
 ExportDataset_company_2=Contatti e attributi
 ImportDataset_company_1=Terze parti (Aziende/fondazioni/persone fisiche) e proprietà
-ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
-ImportDataset_company_3=Bank accounts of third parties
-ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
+ImportDataset_company_2=Contatti/indirizzi (di terze parti o meno) e attributi
+ImportDataset_company_3=Conti bancari di terzi
+ImportDataset_company_4=Terze parti/Rappresentanti di vendita (Assegna utenti rappresentanti di vendita alle aziende)
 PriceLevel=Livello dei prezzi
 DeliveryAddress=Indirizzo di consegna
 AddAddress=Aggiungi un indirizzo
-SupplierCategory=Categoria fornitore
+SupplierCategory=Vendor category
 JuridicalStatus200=Indipendente
 DeleteFile=Cancella il file
 ConfirmDeleteFile=Vuoi davvero cancellare questo file?
@@ -406,7 +406,7 @@ FiscalYearInformation=Informazioni sull'anno fiscale
 FiscalMonthStart=Il mese di inizio dell'anno fiscale
 YouMustAssignUserMailFirst=E' necessario creare una email per questo utente per poter mandargli una notifica via email
 YouMustCreateContactFirst=Per poter inviare notifiche via email, è necessario definire almeno un contatto con una email valida all'interno del soggetto terzo
-ListSuppliersShort=Elenco fornitori
+ListSuppliersShort=List of vendors
 ListProspectsShort=Elenco clienti potenziali
 ListCustomersShort=Elenco clienti
 ThirdPartiesArea=Area soggetti terzi e contatti
@@ -419,16 +419,16 @@ ProductsIntoElements=Elenco dei prodotti/servizi in %s
 CurrentOutstandingBill=Fatture scadute
 OutstandingBill=Max. fattura in sospeso
 OutstandingBillReached=Raggiunto il massimo numero di fatture scadute
-OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Restituisce un numero con formato %syymm-nnnn per codice cliente e %syymm-nnnn per il fornitore, in cui yy è  l'anno, mm è il mese e nnnn è una sequenza progressiva che non ritorna a 0.
+OrderMinAmount=Quantità minima per l'ordine
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=Codice cliente/fornitore libero. Questo codice può essere modificato in qualsiasi momento.
 ManagingDirectors=Nome Manager(s) (CEO, direttore, presidente...)
 MergeOriginThirdparty=Duplica soggetto terzo (soggetto terzo che stai eliminando)
 MergeThirdparties=Unisci soggetti terzi
 ConfirmMergeThirdparties=Sei sicuro che vuoi fondere questo soggetto terzo in quello corrente? Tutti gli oggetti linkati (fatture, ordini, ...) saranno spostati al soggetto terzo corrente, poi il precedente verrà eliminato.
-ThirdpartiesMergeSuccess=Third parties have been merged
+ThirdpartiesMergeSuccess=Terze parti sono state unite
 SaleRepresentativeLogin=Login del rappresentante commerciale
 SaleRepresentativeFirstname=Nome del commerciale
 SaleRepresentativeLastname=Cognome del commerciale
-ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=Il nuovo codice cliente o codice fornitore suggerito è duplicato.
+ErrorThirdpartiesMerge=Si è verificato un errore durante l'eliminazione di terze parti. Si prega di controllare il registro. Le modifiche sono state ripristinate.
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/it_IT/compta.lang b/htdocs/langs/it_IT/compta.lang
index 9d5e2d9279d..e38d574dda3 100644
--- a/htdocs/langs/it_IT/compta.lang
+++ b/htdocs/langs/it_IT/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=Totale pagato
 VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
-VATSummary=Tax Balance
+VATSummary=Tax monthly
+VATBalance=Tax Balance
 VATPaid=Tax paid
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=Area contabilità/tesoreria
 NewPayment=Nuovo pagamento
 Payments=Pagamenti
 PaymentCustomerInvoice=Pagamento fattura attiva
-PaymentSupplierInvoice=Pagamento fattura fornitori
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Pagamento delle imposte sociali/fiscali
 PaymentVat=Pagamento IVA
 ListPayment=Elenco dei pagamenti
 ListOfCustomerPayments=Elenco dei pagamenti dei clienti
-ListOfSupplierPayments=Elenco dei pagamenti fornitore
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Data di inzio
 DateEndPeriod=Data di fine
 newLT1Payment=New tax 2 payment
@@ -110,7 +111,7 @@ ShowVatPayment=Visualizza pagamento IVA
 TotalToPay=Totale da pagare
 BalanceVisibilityDependsOnSortAndFilters=Il bilancio è visibile in questo elenco solo se la tabella è ordinata in verso ascendente per %s e filtrata per un conto bancario
 CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cod. cont. cliente
 SupplierAccountancyCodeShort=Cod. cont. fornitore
 AccountNumber=Numero di conto
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=IRPF soggetti terzi(Spagna)
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report per IVA cliente riscossa e pagata
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Chart of accounts models
 Pcg_type=Tipo pcg
 Pcg_subtype=Sottotipo Pcg
 InvoiceLinesToDispatch=Riga di fattura da spedire *consegnare
-ByProductsAndServices=Per prodotti e servizi
+ByProductsAndServices=By product and service
 RefExt=Referente esterno
 ToCreateAPredefinedInvoice=Per creare un modello di fattura, crea una fattura standard e poi, senza convalidarla, clicca sul pulsante "%s".
 LinkedOrder=Collega a ordine
@@ -215,7 +218,8 @@ Mode1=Metodo 1
 Mode2=Metodo 2
 CalculationRuleDesc=Ci sono due metodi per calcolare l'IVA totale:<br/>Metodo 1: arrotondare l'IVA per ogni riga e poi sommare.<br/>Metodo 2: sommare l'IVA di ogni riga e poi arrotondare il risultato della somma.<br/>Il risultato finale può differire di alcuni centesimi tra i due metodi. Il metodo di default è il <b>%s</b>.
 CalculationRuleDescSupplier=According to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Metodo di calcolo
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Codice contabile predefinito per il pagamento dell'IVA
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=Clonare tassa/contributo
 ConfirmCloneTax=Conferma la clonazione del pagamento tassa/contributo
@@ -242,3 +246,10 @@ FiscalPeriod=Scheda periodo di esercizio
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/it_IT/contracts.lang b/htdocs/langs/it_IT/contracts.lang
index 690944f4369..9d65d1056e7 100644
--- a/htdocs/langs/it_IT/contracts.lang
+++ b/htdocs/langs/it_IT/contracts.lang
@@ -31,11 +31,11 @@ NewContract=Nuovo contratto
 NewContractSubscription=Nuovo contratto/sottoscrizione
 AddContract=Crea contratto
 DeleteAContract=Eliminazione di un contratto
-ActivateAllOnContract=Activate all services
+ActivateAllOnContract=Attiva tutti i servizi
 CloseAContract=Chiudere un contratto
 ConfirmDeleteAContract=Vuoi davvero eliminare questo contratto e tutti i suoi servizi?
 ConfirmValidateContract=Vuoi davvero convalidare questo contratto con il nome <b>%s</b>?
-ConfirmActivateAllOnContract=This will open all services (not yet active). Are you sure you want to open all services?
+ConfirmActivateAllOnContract=Questo aprirà tutti i servizi (non ancora attivi). Sei sicuro di voler aprire tutti i servizi?
 ConfirmCloseContract=Questo chiuderà tutti i servizi (attivi e non attivi). Vuoi davvero chiudere questo contratto?
 ConfirmCloseService=Vuoi davvero chiude questo servizio con la data <b>%s</b>?
 ValidateAContract=Convalidare un contratto
@@ -68,7 +68,7 @@ BoardRunningServices=Servizi scaduti attivi
 ServiceStatus=Stato di servizio
 DraftContracts=Bozze contratti
 CloseRefusedBecauseOneServiceActive=Il contratto non può essere chiuso in quanto vi è almeno un servizio attivo
-ActivateAllContracts=Activate all contract lines
+ActivateAllContracts=Attiva tutte le linee del contratto
 CloseAllContracts=Chiudere tutti i contratti
 DeleteContractLine=Eliminazione di una riga di contratto
 ConfirmDeleteContractLine=Vuoi davvero eliminare questa riga di contratto?
@@ -85,10 +85,10 @@ NoteListOfYourExpiredServices=Questa lista contiene i servizi relativi a contrat
 StandardContractsTemplate=Template standard per i contratti
 ContactNameAndSignature=Per %s, nome e firma:
 OnlyLinesWithTypeServiceAreUsed=Verranno clonate solo le righe di tipo "servizio"
-CloneContract=Clone contract
-ConfirmCloneContract=Are you sure you want to clone the contract <b>%s</b>?
-LowerDateEndPlannedShort=Lower planned end date of active services
-SendContractRef=Contract information __REF__
+CloneContract=Clona contratto
+ConfirmCloneContract=Sei sicuro di voler clonare il contratto <b>%s</b>?
+LowerDateEndPlannedShort=Data di fine pianificata inferiore dei servizi attivi
+SendContractRef=Informazione del contratto __REF__
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Contatto interno per la firma del contratto
 TypeContact_contrat_internal_SALESREPFOLL=Contatto interno per i rapporti successivi alla firma
diff --git a/htdocs/langs/it_IT/cron.lang b/htdocs/langs/it_IT/cron.lang
index daa20b5b2d0..348f3c48db8 100644
--- a/htdocs/langs/it_IT/cron.lang
+++ b/htdocs/langs/it_IT/cron.lang
@@ -20,7 +20,7 @@ CronJobProfiles=Lista dei profili cron predefiniti
 EnabledAndDisabled=Attivato e disattivato
 # Page list
 CronLastOutput=Output dell'ultimo avvio
-CronLastResult=Latest result code
+CronLastResult=Ultimo codice risultato
 CronCommand=Comando
 CronList=Processi pianificati
 CronDelete=Cancella i processi pianificati
@@ -43,7 +43,7 @@ CronNoJobs=Nessun processo registrato
 CronPriority=Priorità
 CronLabel=Titolo
 CronNbRun=Num. lancio
-CronMaxRun=Max number launch
+CronMaxRun=Numero massimo di lanci
 CronEach=Ogni
 JobFinished=Processo eseguito e completato
 #Page card
diff --git a/htdocs/langs/it_IT/dict.lang b/htdocs/langs/it_IT/dict.lang
index 03c520be8bf..dd17e81a7f2 100644
--- a/htdocs/langs/it_IT/dict.lang
+++ b/htdocs/langs/it_IT/dict.lang
@@ -5,7 +5,8 @@ CountryIT=Italia
 CountryES=Spagna
 CountryDE=Germania
 CountryCH=Svizzera
-CountryGB=Gran Bretagna
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=Regno Unito
 CountryUK=Regno Unito
 CountryIE=Irlanda
 CountryCN=Cina
diff --git a/htdocs/langs/it_IT/ecm.lang b/htdocs/langs/it_IT/ecm.lang
index 500c287d4f3..d704f06a964 100644
--- a/htdocs/langs/it_IT/ecm.lang
+++ b/htdocs/langs/it_IT/ecm.lang
@@ -14,8 +14,8 @@ ECMNbOfFilesInDir=Numero di file nella directory
 ECMNbOfSubDir=Numero di sottodirectory
 ECMNbOfFilesInSubDir=Numero di file nelle sub-directory
 ECMCreationUser=Creatore
-ECMArea=DMS/ECM area
-ECMAreaDesc=The DMS/ECM (Document Management System / Electronic Content Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
+ECMArea=Area DMS/ECM
+ECMAreaDesc=L'area DMS/ECM (Document Management System / Electronic Content Management) consente di salvare, condividere e cercare rapidamente tutti i tipi di documenti in Dolibarr.
 ECMAreaDesc2=* Le directory vengono riempite automaticamente quando si aggiungono dei documenti dalla scheda di un elemento.<br/>* Per salvare documenti non legati ad un elemento si può usare l'aggiunta manuale.
 ECMSectionWasRemoved=La directory<b>%s</b> è stata eliminata.
 ECMSectionWasCreated=Cartella <b>%s</b> è stata creata.
@@ -39,9 +39,10 @@ ShowECMSection=Visualizza la directory
 DeleteSection=Eliminare la directory
 ConfirmDeleteSection=Vuoi davvero eliminare la cartella <b>%s</b>?
 ECMDirectoryForFiles=Directory dei file
-CannotRemoveDirectoryContainsFiles=Directory non vuota: eliminazione impossibile!
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=Filemanager
-ECMSelectASection=Seleziona una directory dall'albero sulla sinistra ...
+ECMSelectASection=Seleziona una directory nell'albero...
 DirNotSynchronizedSyncFirst=Sembra che questa directory sia stata creata o modifica al di fuori del modulo ECM. Per visualizzarne correttamente i contenuti, clicca su "aggiorna" per sincronizzare database e dischi.
 ReSyncListOfDir=Aggiorna la lista delle cartelle
 HashOfFileContent=Hash contenuto file
diff --git a/htdocs/langs/it_IT/errors.lang b/htdocs/langs/it_IT/errors.lang
index dfe6d01a637..e25d60983e4 100644
--- a/htdocs/langs/it_IT/errors.lang
+++ b/htdocs/langs/it_IT/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Barcode richiesto
 ErrorCustomerCodeAlreadyUsed=Codice cliente già utilizzato
 ErrorBarCodeAlreadyUsed=Barcode già in uso
 ErrorPrefixRequired=È richiesto il prefisso
-ErrorBadSupplierCodeSyntax=Sintassi del codice fornitore errata
-ErrorSupplierCodeRequired=Il codice fornitore è obbligatorio
-ErrorSupplierCodeAlreadyUsed=Codice fornitore già utilizzato
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Parametri errati
 ErrorBadValueForParameter=Valore '%s' non corretto per il parametro '%s'
 ErrorBadImageFormat=Tipo file immagine non supportato (la tua installazione di PHP non supporta le funzioni per convertire le immagini di questo formato)
@@ -87,7 +87,7 @@ ErrorsOnXLines=Errori in <b>%s</b> righe del sorgente
 ErrorFileIsInfectedWithAVirus=Il programma antivirus non è stato in grado di convalidare il file (il file potrebbe essere infetto)
 ErrorSpecialCharNotAllowedForField=I caratteri speciali non sono ammessi per il campo "%s"
 ErrorNumRefModel=Esiste un riferimento nel database (%s) e non è compatibile con questa regola di numerazione. Rimuovere o rinominare il record per attivare questo modulo.
-ErrorQtyTooLowForThisSupplier=Quantità troppa bassa per questo fornitore o nessun prezzo definito sul prodotto per questo fornitore
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Errore sulla maschera
 ErrorBadMaskFailedToLocatePosOfSequence=Errore, maschera senza numero di sequenza
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
 ErrorSavingChanges=Si è verificato un errore nel salvataggio delle modifiche
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=Il file deve essere nel formato %s
-ErrorSupplierCountryIsNotDefined=Nazione fornitore non definita. Correggere per proseguire.
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
diff --git a/htdocs/langs/it_IT/install.lang b/htdocs/langs/it_IT/install.lang
index abd02017cd8..58a8ebed6a8 100644
--- a/htdocs/langs/it_IT/install.lang
+++ b/htdocs/langs/it_IT/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=Il file di configurazione <b>%s</b> no
 ConfFileCouldBeCreated=Il file <b>%s</b> può essere creato.
 ConfFileIsNotWritable=Il file di configurazione <b>%s</b> non è scrivibile. Controllare le autorizzazioni. Durante la prima installazione, il server web deve essere in grado di scrivere in questo file durante il processo di configurazione (usa, per esempio il comando "chmod 666" per renderlo scrivibile da tutti gli utenti su sistemi operativi Unix e simili).
 ConfFileIsWritable=Il file di configurazione <b>%s</b> è scrivibile.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Ricarica tutte le informazioni dal file di configurazione
 PHPSupportSessions=PHP supporta le sessioni.
 PHPSupportPOSTGETOk=PHP supporta le variabili GET e POST.
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Impossibile creare l'account amministratore di Dolibarr
 WarningRemoveInstallDir=Attenzione, per motivi di sicurezza, una volta completata l'installazione o l'aggiornamento, rimuovere la directory <b>install</b> o rinominarla <b>install.lock</b>, al fine di evitarne un uso malevolo.
 FunctionNotAvailableInThisPHP=Non disponibile su questa installazione di PHP
 ChoosedMigrateScript=Scegli script di migrazione
-DataMigration=Migrazione dei dati
-DatabaseMigration=Migrazione della struttura del database
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Elaborazione dello script
 ChooseYourSetupMode=Scegli la modalità di impostazione e clicca "start"
 FreshInstall=Nuova installazione
@@ -139,14 +140,14 @@ KeepDefaultValuesDeb=Si sta utilizzando la configurazione guidata di un pacchett
 KeepDefaultValuesMamp=Si sta utilizzando la configurazione guidata DoliMamp, quindi i valori proposti sono già ottimizzati. Modifica i parametri solo se sai quello che fai.
 KeepDefaultValuesProxmox=Si sta utilizzando la configurazione guidata di una virtual appliance Proxmox, quindi i valori proposti sono già ottimizzati. Modifica i parametri solo se sai quello che fai.
 UpgradeExternalModule=Run dedicated upgrade process of external modules
-SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
-NothingToDelete=Nothing to clean/delete
-NothingToDo=Nothing to do
+SetAtLeastOneOptionAsUrlParameter=Inserisci almeno una opzione come parametro nell'indirizzo URL. Per esempio: '...repair.php?standard=confirmed'
+NothingToDelete=Nulla da ripulire/eliminare
+NothingToDo=Nessuna azione da fare
 #########
 # upgrade
 MigrationFixData=Fix per i dati denormalizzati
 MigrationOrder=Migrazione dei dati per gli ordini dei clienti
-MigrationSupplierOrder=Migrazione dei dati degli ordini fornitori
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Migrazione dei dati delle proposte commerciali
 MigrationInvoice=Migrazione dei dati della fatturazione attiva
 MigrationContract=Migrazione dei dati per i contratti
@@ -193,11 +194,13 @@ MigrationActioncommElement=Aggiornare i dati sulle azioni
 MigrationPaymentMode=Migrazione dei dati delle modalità di pagamento
 MigrationCategorieAssociation=Migrazione delle categorie
 MigrationEvents=Migrazione degli eventi per aggiungere i proprietari nella tabella degli utilizzatori assegnati
-MigrationEventsContact=Migration of events to add event contact into assignement table
+MigrationEventsContact=Migrazione di eventi per aggiungere un contatto evento nella tabella assegnazioni
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationUserRightsEntity=Aggiorna il valore del campo entità di llx_user_rights
+MigrationUserGroupRightsEntity=Aggiorna il valore del campo entità di llx_usergroup_rights
 MigrationReloadModule=Ricarica modulo %s
-MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
+MigrationResetBlockedLog=Reset del modulo BlockedLog per l'algoritmo v7
 ShowNotAvailableOptions=Mostra opzioni non disponibili
 HideNotAvailableOptions=Nascondi opzioni non disponibili
 ErrorFoundDuringMigration=L'errore si è verificato durante il processo di migrazione quindi il prossimo step non sarà disponibile. Per ignorare gli errori puoi <a href="%s">cliccare qui</a>, ma l'applicazione o qualche funzionalità potrebbe non funzionare correttamente fino alla correzione dell'errore.
diff --git a/htdocs/langs/it_IT/ldap.lang b/htdocs/langs/it_IT/ldap.lang
index 377213afd48..6986538c5da 100644
--- a/htdocs/langs/it_IT/ldap.lang
+++ b/htdocs/langs/it_IT/ldap.lang
@@ -1,12 +1,11 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Password del dominio
 YouMustChangePassNextLogon=La password dell'utente <b>%s</ b> per il dominio <b>%s</ b> deve essere cambiata.
 UserMustChangePassNextLogon=L'utente deve cambiare password per il dominio %s
 LDAPInformationsForThisContact=Informazioni nel database LDAP per questo contatto
 LDAPInformationsForThisUser=Informazioni nel database LDAP per questo utente
 LDAPInformationsForThisGroup=Informazioni nel database LDAP per questo gruppo
 LDAPInformationsForThisMember=Informazioni nel database LDAP per questo membro
-LDAPInformationsForThisMemberType=Information in LDAP database for this member type
+LDAPInformationsForThisMemberType=Informazioni nel database LDAP per questo tipo di membro
 LDAPAttributes=Attributi LDAP
 LDAPCard=Scheda LDAP
 LDAPRecordNotFound=Il record non è stato trovato in LDAP
@@ -14,14 +13,15 @@ LDAPUsers=Utenti nel database LDAP
 LDAPFieldStatus=Stato
 LDAPFieldFirstSubscriptionDate=Prima data di sottoscrizione
 LDAPFieldFirstSubscriptionAmount=Importo della prima sottoscrizione
-LDAPFieldLastSubscriptionDate=Latest subscription date
-LDAPFieldLastSubscriptionAmount=Latest subscription amount
+LDAPFieldLastSubscriptionDate=Data della sottoscrizione più recente
+LDAPFieldLastSubscriptionAmount=Ultimo importo della sottoscrizione
 LDAPFieldSkype=Identificativo Skype
 LDAPFieldSkypeExample=Esempio: nomeSkype
 UserSynchronized=Utente sincronizzato
 GroupSynchronized=Gruppo sincronizzato
 MemberSynchronized=Membro sincronizzato
-MemberTypeSynchronized=Member type synchronized
+MemberTypeSynchronized=Tipo di membro sincronizzato
 ContactSynchronized=Contatto sincronizzato
 ForceSynchronize=Forza la sincronizzazione Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Impossibile leggere dal database LDAP. Controlla la configurazione del modulo LDAP e l'accesso al database.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/it_IT/loan.lang b/htdocs/langs/it_IT/loan.lang
index c9cf861780b..042c011ae07 100644
--- a/htdocs/langs/it_IT/loan.lang
+++ b/htdocs/langs/it_IT/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=Capitale
 Insurance=Assicurazione
 Interest=Interesse
 Nbterms=Numero di rate
+Term=Term
 LoanAccountancyCapitalCode=Accounting account capital
 LoanAccountancyInsuranceCode=Accounting account insurance
 LoanAccountancyInterestCode=Accounting account interest
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=Conferma l'eliminazione di questo prestito
 LoanDeleted=Prestito eliminato correttamente
 ConfirmPayLoan=Conferma questo prestito come ripagato
 LoanPaid=Prestito ripagato
-# Calc
-LoanCalc=Bank Loans Calculator
-PurchaseFinanceInfo=Purchase & Financing Information
-SalePriceOfAsset=Sale Price of Asset
-PercentageDown=Percentage Down
-LengthOfMortgage=Durata del prestito
-AnnualInterestRate=Tasso di interesse annuo
-ExplainCalculations=Explain Calculations
-ShowMeCalculationsAndAmortization=Mostrami interessi ed ammortamento
-MortgagePaymentInformation=Informazioni sul pagamento del mutuo ipotecario
-DownPayment=Anticipo
-DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
-InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
-MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
-MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
-MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
-MonthlyPaymentDesc=The montly payment is figured out using the following formula
-AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
-AmountFinanced=Ammontare finanziato
-AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
-Totalsforyear=Totali annui
-MonthlyPayment=Rata mensile
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
-GoToInterest=%s will go towards INTEREST
-GoToPrincipal=%s will go towards PRINCIPAL
-YouWillSpend=Spenderete %s in %s anni
 ListLoanAssociatedProject=List of loan associated with the project
 AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Interesse
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=Configurazione del modulo prestiti
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-FinancialCommitment=Financial commitment
 CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/langs/it_IT/mails.lang b/htdocs/langs/it_IT/mails.lang
index b9e104fa715..0173b1d00b0 100644
--- a/htdocs/langs/it_IT/mails.lang
+++ b/htdocs/langs/it_IT/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Mittente
 MailErrorsTo=Errors to
 MailReply=Rispondi a
 MailTo=Destinatario(i)
+MailToUsers=To user(s)
 MailCC=Copia carbone (CC)
+MailToCCUsers=Copy to users(s)
 MailCCC=Copia carbone cache (CCC)
 MailTopic=Titolo
 MailText=Testo
@@ -164,4 +166,4 @@ InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Informazioni
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang
index 58bd2420084..2b7b2f711ca 100644
--- a/htdocs/langs/it_IT/main.lang
+++ b/htdocs/langs/it_IT/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=Parametro %s non definito
 ErrorUnknown=Errore sconosciuto
 ErrorSQL=Errore di SQL
 ErrorLogoFileNotFound=Impossibile trovare il file <b>%s</b> per il logo
-ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
+ErrorGoToGlobalSetup=Vai su impostazioni "Azienda/Fondazione" per sistemare
 ErrorGoToModuleSetup=Vai alle impostazioni del modulo per risolvere il problema
 ErrorFailedToSendMail=Impossibile inviare l'email (mittente=%s, destinatario=%s)
 ErrorFileNotUploaded=Upload fallito. Controllare che la dimensione del file non superi il numero massimo consentito, che lo spazio libero su disco sia sufficiente e che non esista già un file con lo stesso nome nella directory.
@@ -63,15 +63,15 @@ ErrorCantLoadUserFromDolibarrDatabase=Impossibile trovare l'utente <b>%s</b> nel
 ErrorNoVATRateDefinedForSellerCountry=Errore, non sono state definite le aliquote IVA per: <b>%s</b>.
 ErrorNoSocialContributionForSellerCountry=Errore, non sono stati definiti i tipi di contributi per: '%s'.
 ErrorFailedToSaveFile=Errore, file non salvato.
-ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max number of record per page
+ErrorCannotAddThisParentWarehouse=Stai tentando di aggiungere un magazzino principale che è già figlio di quello corrente
+MaxNbOfRecordPerPage=Numero massimo di record per pagina
 NotAuthorized=Non sei autorizzato.
 SetDate=Imposta data
 SelectDate=Seleziona una data
 SeeAlso=Vedi anche %s
 SeeHere=Vedi qui
 ClickHere=Clicca qui
-Here=Here
+Here=Qui
 Apply=Applica
 BackgroundColorByDefault=Colore di sfondo predefinito
 FileRenamed=Il file è stato rinominato con successo
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Modalità di autenticazione <b>%s<
 Administrator=Amministratore
 Undefined=Indefinito
 PasswordForgotten=Password dimenticata?
+NoAccount=No account?
 SeeAbove=Vedi sopra
 HomeArea=Area home
 LastConnexion=Ultima connessione
@@ -106,11 +107,11 @@ RequestLastAccessInError=Ultimo errore di accesso al database
 ReturnCodeLastAccessInError=Codice di ritorno per l'ultimo accesso errato al database
 InformationLastAccessInError=Informazioni sull'ultimo accesso errato al database
 DolibarrHasDetectedError=Dolibarr ha rilevato un errore tecnico
-YouCanSetOptionDolibarrMainProdToZero=You can read log file or set option $dolibarr_main_prod to '0' in your config file to get more information.
+YouCanSetOptionDolibarrMainProdToZero=Puoi leggere il file di registro o impostare l'opzione $dolibarr_main_prod su '0' nel tuo file di configurazione per ottenere maggiori informazioni.
 InformationToHelpDiagnose=Quest'informazione può essere utile per fini diagnostici (puoi settare l'opzione $dolibarr_main_prod su "1" per rimuovere questa notifica)
 MoreInformation=Maggiori informazioni
 TechnicalInformation=Informazioni tecniche
-TechnicalID=Technical ID
+TechnicalID=ID Tecnico
 NotePublic=Nota (pubblica)
 NotePrivate=Nota (privata)
 PrecisionUnitIsLimitedToXDecimals=Dolibarr è stato configurato per limitare la precisione dei prezzi unitari a <b>%s</b> decimali.
@@ -127,7 +128,7 @@ Home=Home
 Help=Aiuto
 OnlineHelp=Guida in linea
 PageWiki=Pagina wiki
-MediaBrowser=Media browser
+MediaBrowser=Browser multimediale
 Always=Sempre
 Never=Mai
 Under=sotto
@@ -187,7 +188,7 @@ ToLink=Link
 Select=Seleziona
 Choose=Scegli
 Resize=Ridimensiona
-ResizeOrCrop=Resize or Crop
+ResizeOrCrop=Ridimensiona o ritaglia
 Recenter=Ricentra
 Author=Autore
 User=Utente
@@ -231,7 +232,7 @@ Limit=Limite
 Limits=Limiti
 Logout=Logout
 NoLogoutProcessWithAuthMode=Nessuna funzione di disconnessione al programma con il metodo di autenticazione <b>%s</b>
-Connection=Connessione
+Connection=Login
 Setup=Impostazioni
 Alert=Avvertimento
 MenuWarnings=Avvisi e segnalazioni
@@ -269,10 +270,10 @@ DateApprove2=Data di approvazione (seconda approvazione)
 RegistrationDate=Data registrazione
 UserCreation=Creazione utente
 UserModification=Modifica utente
-UserValidation=Validation user
+UserValidation=Convalida utente
 UserCreationShort=Creaz. utente
 UserModificationShort=Modif. utente
-UserValidationShort=Valid. user
+UserValidationShort=Utente valido
 DurationYear=anno
 DurationMonth=mese
 DurationWeek=settimana
@@ -314,8 +315,8 @@ KiloBytes=Kilobyte
 MegaBytes=Megabyte
 GigaBytes=Gigabyte
 TeraBytes=Terabyte
-UserAuthor=User of creation
-UserModif=User of last update
+UserAuthor=Utente della creazione
+UserModif=Utente dell'ultimo aggiornamento
 b=b
 Kb=Kb
 Mb=Mb
@@ -328,10 +329,10 @@ Default=Predefinito
 DefaultValue=Valore predefinito
 DefaultValues=Valori predefiniti
 Price=Prezzo
-PriceCurrency=Price (currency)
+PriceCurrency=Prezzo (valuta)
 UnitPrice=Prezzo unitario
 UnitPriceHT=Prezzo unitario (netto)
-UnitPriceHTCurrency=Unit price (net) (currency)
+UnitPriceHTCurrency=Prezzo unitario (netto) (valuta)
 UnitPriceTTC=Prezzo unitario (lordo)
 PriceU=P.U.
 PriceUHT=P.U.(netto)
@@ -339,7 +340,7 @@ PriceUHTCurrency=P.U. (valuta)
 PriceUTTC=P.U.(lordo)
 Amount=Importo
 AmountInvoice=Importo della fattura
-AmountInvoiced=Amount invoiced
+AmountInvoiced=Importo fatturato
 AmountPayment=Importo del pagamento
 AmountHTShort=Importo (netto)
 AmountTTCShort=Importo (IVA inc.)
@@ -359,7 +360,7 @@ AmountLT2ES=Importo IRPF (Spagna)
 AmountTotal=Importo totale
 AmountAverage=Importo medio
 PriceQtyMinHT=Prezzo quantità min. tasse escluse
-PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
+PriceQtyMinHTCurrency=Prezzo per quantità min. (tasse escluse) (valuta)
 Percentage=Percentuale
 Total=Totale
 SubTotal=Totale parziale
@@ -372,7 +373,7 @@ Totalforthispage=Totale in questa pagina
 TotalTTC=Totale (IVA inclusa)
 TotalTTCToYourCredit=Totale (IVA inclusa) a tuo credito
 TotalVAT=Totale IVA
-TotalVATIN=Total IGST
+TotalVATIN=Totale IGST
 TotalLT1=Totale tassa 2
 TotalLT2=Totale tassa 3
 TotalLT1ES=Totale RE
@@ -396,12 +397,13 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=Aliquota IVA
-VATCode=Tax Rate code
-VATNPR=Tax Rate NPR
+VATCode=Codice aliquota
+VATNPR=Aliquota NPR
 DefaultTaxRate=Valore base tassa
 Average=Media
 Sum=Somma
 Delta=Delta
+RemainToPay=Remain to pay
 Module=Moduli/Applicazioni
 Modules=Moduli/Applicazioni
 Option=Opzione
@@ -414,7 +416,7 @@ Favorite=Preferito
 ShortInfo=Info.
 Ref=Rif.
 ExternalRef=Rif. esterno
-RefSupplier=Rif. fornitore
+RefSupplier=Ref. vendor
 RefPayment=Rif. pagamento
 CommercialProposalsShort=Preventivi/Proposte commerciali
 Comment=Commento
@@ -427,18 +429,18 @@ ActionRunningNotStarted=Non avviato
 ActionRunningShort=Avviato
 ActionDoneShort=Fatto
 ActionUncomplete=Incompleto
-LatestLinkedEvents=Latest %s linked events
+LatestLinkedEvents=Ultimi %s eventi collegati
 CompanyFoundation=Azienda/Organizzazione
-Accountant=Accountant
+Accountant=Contabile
 ContactsForCompany=Contatti per il soggetto terzo
 ContactsAddressesForCompany=Contatti/indirizzi per questo soggetto terzo
 AddressesForCompany=Indirizzi per questo soggetto terzo
 ActionsOnCompany=Azioni sul soggetto terzo
 ActionsOnMember=Azioni su questo membro
-ActionsOnProduct=Events about this product
+ActionsOnProduct=Eventi su questo prodotto
 NActionsLate=%s azioni in ritardo
 ToDo=Da fare
-Completed=Completed
+Completed=Completato
 Running=Avviato
 RequestAlreadyDone=Richiesta già registrata
 Filter=Filtro
@@ -453,7 +455,7 @@ TotalDuration=Durata totale
 Summary=Riepilogo
 DolibarrStateBoard=Statistiche Database
 DolibarrWorkBoard=Dashboard degli elementi aperti
-NoOpenedElementToProcess=No opened element to process
+NoOpenedElementToProcess=Nessun elemento aperto da elaborare
 Available=Disponibile
 NotYetAvailable=Non ancora disponibile
 NotAvailable=Non disponibile
@@ -493,7 +495,7 @@ Received=Ricevuto
 Paid=Pagato
 Topic=Oggetto
 ByCompanies=Per impresa
-ByUsers=Per utente
+ByUsers=By user
 Links=Link
 Link=Link
 Rejects=Respinge
@@ -502,7 +504,7 @@ NextStep=Passo successivo
 Datas=Dati
 None=Nessuno
 NoneF=Nessuno
-NoneOrSeveral=None or several
+NoneOrSeveral=Nessuno o più
 Late=Tardi
 LateDesc=Il ritardo di un'azione viene definito nel setup. Chiedi al tuo amministratore di modificarlo dal menu Home - Setup - Alerts.
 Photo=Immagine
@@ -576,7 +578,7 @@ MonthVeryShort10=O
 MonthVeryShort11=N
 MonthVeryShort12=D
 AttachedFiles=File e documenti allegati
-JoinMainDoc=Join main document
+JoinMainDoc=Iscriviti al documento principale
 DateFormatYYYYMM=AAAA-MM
 DateFormatYYYYMMDD=AAAA-MM-GG
 DateFormatYYYYMMDDHHMM=AAAA-MM-GG HH:MM
@@ -619,9 +621,9 @@ BuildDoc=Genera Doc
 Entity=Entità
 Entities=Entità
 CustomerPreview=Anteprima cliente
-SupplierPreview=Anteprima fornitore
+SupplierPreview=Vendor preview
 ShowCustomerPreview=Visualizza anteprima cliente
-ShowSupplierPreview=Visualizza anteprima fornitore
+ShowSupplierPreview=Show vendor preview
 RefCustomer=Rif. cliente
 Currency=Valuta
 InfoAdmin=Informazioni per gli amministratori
@@ -665,7 +667,7 @@ NotEnoughPermissions=Non hai l'autorizzazione per svolgere questa azione
 SessionName=Nome sessione
 Method=Metodo
 Receive=Ricevi
-CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+CompleteOrNoMoreReceptionExpected=Completa o non attendere altro
 ExpectedValue=Valore atteso
 CurrentValue=Valore attuale
 PartialWoman=Parziale
@@ -679,7 +681,7 @@ Color=Colore
 Documents=Documenti
 Documents2=Documenti
 UploadDisabled=Upload disabilitato
-MenuAccountancy=Contabilità
+MenuAccountancy=Contabilità avanzata
 MenuECM=Documenti
 MenuAWStats=AWStats
 MenuMembers=Membri
@@ -706,7 +708,7 @@ Notes=Note
 AddNewLine=Aggiungi una nuova riga
 AddFile=Aggiungi file
 FreeZone=Non è un prodotto/servizio predefinito
-FreeLineOfType=Not a predefined entry of type
+FreeLineOfType=Non una voce predefinita del tipo
 CloneMainAttributes=Clona oggetto con i suoi principali attributi
 PDFMerge=Unisci PDF
 Merge=Unisci
@@ -814,16 +816,16 @@ GoodBye=Addio
 Sincerely=Cordialmente
 DeleteLine=Elimina riga
 ConfirmDeleteLine=Vuoi davvero eliminare questa riga?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
-TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
+NoPDFAvailableForDocGenAmongChecked=Non è possibile generare il documento PDF dai record selezionati
+TooManyRecordForMassAction=Troppi record selezionati per l'azione di massa. L'azione è limitata a un elenco di %s record.
 NoRecordSelected=Nessun record selezionato
 MassFilesArea=File creati da azioni di massa
 ShowTempMassFilesArea=Mostra i file creati da azioni di massa
-ConfirmMassDeletion=Bulk delete confirmation
-ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
+ConfirmMassDeletion=Conferma eliminazione di massa
+ConfirmMassDeletionQuestion=Sei sicuro di voler cancellare il record selezionato %s?
 RelatedObjects=Oggetti correlati
 ClassifyBilled=Classificare  fatturata
-ClassifyUnbilled=Classify unbilled
+ClassifyUnbilled=Classifica non pagata
 Progress=Avanzamento
 FrontOffice=Front office
 BackOffice=Backoffice
@@ -838,7 +840,7 @@ Calendar=Calendario
 GroupBy=Raggruppa per...
 ViewFlatList=Vedi lista semplice
 RemoveString=Rimuovi la stringa '%s'
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Alcune lingue potrebbero essere parzialmente tradotte o contenere errori. Se ne rilevi, puoi correggere i file di lingua registrati su <a href="https://transifex.com/projects/p/dolibarr/" target="_blank"> https://transifex.com/projects/p/ Dolibarr / </a>.
 DirectDownloadLink=Link diretto per il download (pubblico/esterno)
 DirectDownloadInternalLink=Link per il download diretto (richiede accesso e permessi validi)
 Download=Download
@@ -847,11 +849,11 @@ ActualizeCurrency=Aggiorna tasso di cambio
 Fiscalyear=Anno fiscale
 ModuleBuilder=Mudulo programmatore
 SetMultiCurrencyCode=Imposta valuta
-BulkActions=Bulk actions
+BulkActions=Azioni in blocco
 ClickToShowHelp=Clicca per mostrare l'aiuto contestuale
 WebSite=Sito web
 WebSites=Siti web
-WebSiteAccounts=Web site accounts
+WebSiteAccounts=Account del sito web
 ExpenseReport=Nota spese
 ExpenseReports=Nota spese
 HR=HR
@@ -866,7 +868,7 @@ FileNotShared=File non condiviso pubblicamente
 Project=Progetto
 Projects=Progetti
 Rights=Autorizzazioni
-LineNb=Line no.
+LineNb=Linea n°
 IncotermLabel=Import-Export
 # Week day
 Monday=Lunedì
@@ -904,7 +906,7 @@ Select2NotFound=Nessun risultato trovato
 Select2Enter=Immetti
 Select2MoreCharacter=o più caratteri
 Select2MoreCharacters=o più caratteri
-Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
+Select2MoreCharactersMore=<strong>Sintassi di ricerca:</strong><br><kbd><strong> |</strong></kbd><kbd> O</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Qualsiasi carattere</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Inizia con</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> Termina con</kbd> (ab$)<br>
 Select2LoadingMoreResults=Caricamento di altri risultati ...
 Select2SearchInProgress=Ricerca in corso ...
 SearchIntoThirdparties=Soggetti terzi
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=Prodotti o servizi
 SearchIntoProjects=Progetti
 SearchIntoTasks=Compiti
 SearchIntoCustomerInvoices=Fatture attive
-SearchIntoSupplierInvoices=Fatture fornitori
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Ordini dei clienti
-SearchIntoSupplierOrders=Ordini fornitori
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=Proposte del cliente
-SearchIntoSupplierProposals=Proposte Fornitore
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Interventi
 SearchIntoContracts=Contratti
 SearchIntoCustomerShipments=Spedizioni cliente
@@ -927,17 +929,19 @@ SearchIntoExpenseReports=Nota spese
 SearchIntoLeaves=Assenze
 CommentLink=Commenti
 NbComments=Numero dei commenti
-CommentPage=Comments space
+CommentPage=Spazio per i commenti
 CommentAdded=Commento aggiunto
 CommentDeleted=Commento cancellato
 Everybody=Progetto condiviso
 PayedBy=Pagato da
 PayedTo=Pagato a
-Monthly=Monthly
-Quarterly=Quarterly
-Annual=Annual
-Local=Local
-Remote=Remote
-LocalAndRemote=Local and Remote
-KeyboardShortcut=Keyboard shortcut
+Monthly=Mensilmente
+Quarterly=Trimestralmente
+Annual=Annuale
+Local=Locale
+Remote=Remoto
+LocalAndRemote=Locale e Remoto
+KeyboardShortcut=Tasto scelta rapida
 AssignedTo=Azione assegnata a
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/it_IT/margins.lang b/htdocs/langs/it_IT/margins.lang
index b35ffad87f7..b5ae3bf037f 100644
--- a/htdocs/langs/it_IT/margins.lang
+++ b/htdocs/langs/it_IT/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=Come servizio
 UseDiscountOnTotal=Sul subtotale
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Definisce se, ai fini del calcolo del margine, uno sconto globale debba essere trattato come un prodotto, un servizio o usato solo sul subtotale.
 MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best supplier price
+MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Prezzo di costo
 UnitCharges=Carico unitario
 Charges=Carichi
diff --git a/htdocs/langs/it_IT/members.lang b/htdocs/langs/it_IT/members.lang
index 1f269b0f7f7..c8a43734164 100644
--- a/htdocs/langs/it_IT/members.lang
+++ b/htdocs/langs/it_IT/members.lang
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
@@ -156,8 +156,8 @@ DocForAllMembersCards=Genera schede per tutti i membri (formato di output impost
 DocForOneMemberCards=Genera scheda per un membro (formato di output impostato: <b>%s</b>)
 DocForLabels=Genera etichette con indirizzi (formato di output impostato: <b>%s</b>)
 SubscriptionPayment=Pagamento adesione
-LastSubscriptionDate=Latest subscription date
-LastSubscriptionAmount=Latest subscription amount
+LastSubscriptionDate=Data della sottoscrizione più recente
+LastSubscriptionAmount=Ultimo importo della sottoscrizione
 MembersStatisticsByCountries=Statistiche per paese
 MembersStatisticsByState=Statistiche per stato/provincia
 MembersStatisticsByTown=Statistiche per città
@@ -170,7 +170,7 @@ MembersByTownDesc=Questa schermata mostra le statistiche sui membri per città.
 MembersStatisticsDesc=Scegli quali statistiche visualizzare...
 MenuMembersStats=Statistiche
 LastMemberDate=Latest member date
-LatestSubscriptionDate=Latest subscription date
+LatestSubscriptionDate=Data della sottoscrizione più recente
 Nature=Natura
 Public=Pubblico
 NewMemberbyWeb=Nuovo membro aggiunto. In attesa di approvazione
diff --git a/htdocs/langs/it_IT/opensurvey.lang b/htdocs/langs/it_IT/opensurvey.lang
index 40781c799aa..a8e48ebb63c 100644
--- a/htdocs/langs/it_IT/opensurvey.lang
+++ b/htdocs/langs/it_IT/opensurvey.lang
@@ -58,3 +58,4 @@ MoreChoices=Aggiungi altre opzioni
 SurveyExpiredInfo=Il sondaggio è stato chiuso o è scaduto il tempo a disposizione.
 EmailSomeoneVoted=%s ha compilato una riga.\nTrovi l'indagine all'indirizzo: \n%s
 ShowSurvey=Mostra indagine
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/it_IT/orders.lang b/htdocs/langs/it_IT/orders.lang
index 7a89cc781a2..7b21612c815 100644
--- a/htdocs/langs/it_IT/orders.lang
+++ b/htdocs/langs/it_IT/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Area ordini dei clienti
-SuppliersOrdersArea=Area ordini dei fornitori
+SuppliersOrdersArea=Purchase orders area
 OrderCard=Scheda ordine
 OrderId=Identificativo ordine
 Order=Ordine
@@ -13,18 +13,18 @@ OrderToProcess=Ordine da processare
 NewOrder=Nuovo ordine
 ToOrder=Ordinare
 MakeOrder=Fare ordine
-SupplierOrder=Ordine fornitore
-SuppliersOrders=Ordini fornitori
-SuppliersOrdersRunning=Ordini fornitori avviati
-CustomerOrder=Ordine cliente
-CustomersOrders=Ordini dei clienti
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=Ordine del cliente
+CustomersOrders=Ordini clienti
 CustomersOrdersRunning=Ordini cliente attuali
 CustomersOrdersAndOrdersLines=Gli ordini dei clienti e le linee d'ordine
-OrdersDeliveredToBill=Customer orders delivered to bill
+OrdersDeliveredToBill=Ordini del cliente consegnati alla fattura
 OrdersToBill=Ordini dei clienti consegnati
 OrdersInProcess=Gli ordini dei clienti in corso
 OrdersToProcess=Ordini clienti da processare
-SuppliersOrdersToProcess=Ordini fornitore da processare
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=Annullato
 StatusOrderDraftShort=Bozza
 StatusOrderValidatedShort=Convalidato
@@ -75,15 +75,15 @@ ShowOrder=Visualizza ordine
 OrdersOpened=Ordini da processare
 NoDraftOrders=Nessuna bozza d'ordine
 NoOrder=Nessun ordine
-NoSupplierOrder=Nessun ordine fornitore
+NoSupplierOrder=No purchase order
 LastOrders=Ultimi %s ordini fornitore
 LastCustomerOrders=Ultimi %s ordini cliente
-LastSupplierOrders=ultimi %s ordini fornitore
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=ultimi %s ordini modificati
 AllOrders=Tutti gli ordini
 NbOfOrders=Numero di ordini
 OrdersStatistics=Statistiche ordini
-OrdersStatisticsSuppliers=Statistiche ordini dei fornitori
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Numero di ordini per mese
 AmountOfOrdersByMonthHT=Importo ordini per mese (al netto delle imposte)
 ListOfOrders=Elenco degli ordini
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Vuoi davvero confermare di aver creato questo ordine su <b>%s</
 GenerateBill=Genera fattura
 ClassifyShipped=Classifica come spedito
 DraftOrders=Bozze di ordini
-DraftSuppliersOrders=Bozza ordine fornitore
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=Ordini in lavorazione
 RefOrder=Rif. ordine
 RefCustomerOrder=Rif. fornitore
-RefOrderSupplier=Rif. fornitore
-RefOrderSupplierShort=Rif. ordine forn.
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=Invia ordine via email
 ActionsOnOrder=Azioni all'ordine
 NoArticleOfTypeProduct=Non ci sono articoli definiti "prodotto" quindi non ci sono articoli da spedire
@@ -113,11 +113,11 @@ PaymentOrderRef=Riferimento pagamento ordine %s
 CloneOrder=Clona ordine
 ConfirmCloneOrder=Vuoi davvero clonare l'ordine <b>%s</b>?
 DispatchSupplierOrder=Ricezione ordine fornitore %s
-FirstApprovalAlreadyDone=First approval already done
-SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=Supplier order %s received %s
-SupplierOrderSubmitedInDolibarr=Supplier order %s submited
-SupplierOrderClassifiedBilled=Supplier order %s set billed
+FirstApprovalAlreadyDone=Prima approvazione già fatta
+SecondApprovalAlreadyDone=Seconda approvazione già fatta
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Altri ordini
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Responsabile ordini cliente
@@ -125,11 +125,11 @@ TypeContact_commande_internal_SHIPPING=Responsabile spedizioni cliente
 TypeContact_commande_external_BILLING=Contatto fatturazione cliente
 TypeContact_commande_external_SHIPPING=Contatto spedizioni cliente
 TypeContact_commande_external_CUSTOMER=Contatto follow-up cliente
-TypeContact_order_supplier_internal_SALESREPFOLL=Responsabile ordini fornitore
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Responsabile spedizioni fornitore
-TypeContact_order_supplier_external_BILLING=Contatto fatturazione fornitore
-TypeContact_order_supplier_external_SHIPPING=Contatto spedizioni fornitore
-TypeContact_order_supplier_external_CUSTOMER=Contatto follow-up fornitore
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Costante COMMANDE_SUPPLIER_ADDON non definita
 Error_COMMANDE_ADDON_NotDefined=Costante COMMANDE_ADDON non definita
 Error_OrderNotChecked=Nessun ordine da fatturare selezionato
@@ -152,7 +152,7 @@ OrderCreated=I tuoi ordini sono stati creati
 OrderFail=C'è stato un errore durante la creazione del tuo ordine
 CreateOrders=Crea ordini
 ToBillSeveralOrderSelectCustomer=Per creare una fattura per ordini multipli, clicca prima sul cliente, poi scegli "%s".
-OptionToSetOrderBilledNotEnabled=Option (from module Workflow) to set order to 'Billed' automatically when invoice is validated is off, so you will have to set status of order to 'Billed' manually.
-IfValidateInvoiceIsNoOrderStayUnbilled=If invoice validation is 'No', the order will remain to status 'Unbilled' until the invoice is validated.
+OptionToSetOrderBilledNotEnabled=L'opzione (dal modulo flusso di lavoro) per impostare automaticamente l'ordine su "Fatturato" quando la fattura è convalidata è disattivata, quindi dovrai impostare manualmente lo stato dell'ordine su "Fatturato".
+IfValidateInvoiceIsNoOrderStayUnbilled=Se la convalida della fattura è "No", l'ordine rimarrà nello stato "Non fatturato" fino a quando la fattura non sarà convalidata.
 CloseReceivedSupplierOrdersAutomatically=Chiudi automaticamente l'ordine come "%s" se tutti i prodotti sono stati ricevuti.
 SetShippingMode=Imposta il metodo di spedizione
diff --git a/htdocs/langs/it_IT/other.lang b/htdocs/langs/it_IT/other.lang
index 3110780c26c..17820aa80e0 100644
--- a/htdocs/langs/it_IT/other.lang
+++ b/htdocs/langs/it_IT/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=File troppo grande
 PleaseBePatient=Attendere, prego...
 NewPassword=Nuova password
 ResetPassword=Reset password
-RequestToResetPasswordReceived=Una richiesta di cambio della tua password è stata ricevuta
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=Queste sono le tue nuove credenziali di accesso
 NewKeyWillBe=Le tue nuove credenziali per loggare al software sono
 ClickHereToGoTo=Clicca qui per andare a %s
@@ -233,6 +233,8 @@ PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=Area esportazioni
 AvailableFormats=Formati disponibili
diff --git a/htdocs/langs/it_IT/productbatch.lang b/htdocs/langs/it_IT/productbatch.lang
index 24c1d1ceed3..94881e30be0 100644
--- a/htdocs/langs/it_IT/productbatch.lang
+++ b/htdocs/langs/it_IT/productbatch.lang
@@ -16,7 +16,7 @@ printEatby=Consumare entro: %s
 printSellby=Da vendere entro: %s
 printQty=Quantità: %d
 AddDispatchBatchLine=Aggiungi una riga per la durata a scaffale
-WhenProductBatchModuleOnOptionAreForced=Con il modulo lotto/numero di serie attivo, la modalità di incremento/riduzione delle scorte è bloccata sull'ultima scelta effettuata e non può essere modificata. Le altre opzioni possono essere configurate a piacimento.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=Questo prodotto non usa lotto/numero di serie
 ProductLotSetup=Configurazione del modulo lotto/numero di serie
 ShowCurrentStockOfLot=Mostra la scorta disponibile per la coppia prodotto/lotto
diff --git a/htdocs/langs/it_IT/products.lang b/htdocs/langs/it_IT/products.lang
index ff1d763c317..1695d223237 100644
--- a/htdocs/langs/it_IT/products.lang
+++ b/htdocs/langs/it_IT/products.lang
@@ -22,12 +22,12 @@ MassBarcodeInit=Inizializzazione di massa dei codici a barre
 MassBarcodeInitDesc=Questa pagina può essere usata per inizializzare un codice a barre di un oggetto che non ha ancora un codice a barre definito. Controlla prima che il setup del modulo Codici a barre sia completo. 
 ProductAccountancyBuyCode=Codice contabile (acquisto)
 ProductAccountancySellCode=Codice contabile (vendita)
-ProductAccountancySellIntraCode=Accounting code (sale intra-community)
-ProductAccountancySellExportCode=Accounting code (sale export)
+ProductAccountancySellIntraCode=Codice contabile (vendita intracomunitaria)
+ProductAccountancySellExportCode=Codice contabile (vendita per esportazione)
 ProductOrService=Prodotto o servizio
 ProductsAndServices=Prodotti e Servizi
 ProductsOrServices=Prodotti o servizi
-ProductsPipeServices=Products | Services
+ProductsPipeServices=Prodotti | Servizi
 ProductsOnSaleOnly=Prodotto solo per la vendita
 ProductsOnPurchaseOnly=Prodotto solo per l'acquisto
 ProductsNotOnSell=Prodotto non in vendita e non acquistabili
@@ -70,6 +70,7 @@ SoldAmount=Quantità venduta
 PurchasedAmount=Quantità acquistata
 NewPrice=Nuovo prezzo
 MinPrice=Min. prezzo di vendita
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=Il prezzo di vendita non può essere inferiore al minimo consentito per questo prodotto ( %s IVA esclusa)
 ContractStatusClosed=Chiuso
 ErrorProductAlreadyExists=Un prodotto con riferimento %s esiste già.
@@ -123,7 +124,7 @@ ConfirmDeleteProductLine=Vuoi davvero cancellare questa linea di prodotti?
 ProductSpecial=Prodotto speciale
 QtyMin=Quantità minima
 PriceQtyMin=Prezzo per questa quantità minima (senza sconti)
-PriceQtyMinCurrency=Price for this min. qty (w/o discount) (currency)
+PriceQtyMinCurrency=Prezzo per questa quantità min. (senza sconto) (valuta)
 VATRateForSupplierProduct=Aliquota IVA (per questo prodotto)
 DiscountQtyMin=Sconto automatico per la quantità
 NoPriceDefinedForThisSupplier=Nessun prezzo/quantità definito per questo fornitore/prodotto
@@ -145,7 +146,7 @@ RowMaterial=Materia prima
 CloneProduct=Clona prodotto/servizio
 ConfirmCloneProduct=Vuoi davvero clonare il prodotto / servizio <b> %s </b>?
 CloneContentProduct=Clona tutte le principali informazioni del prodotto/servizio
-ClonePricesProduct=Clone prices
+ClonePricesProduct=Clona prezzi
 CloneCompositionProduct=Clona prodotto / servizio pacchetto
 CloneCombinationsProduct=Clona varianti di prodotto
 ProductIsUsed=Questo prodotto è in uso
@@ -155,7 +156,7 @@ BuyingPrices=Prezzi di acquisto
 CustomerPrices=Prezzi di vendita
 SuppliersPrices=Prezzi di acquisto
 SuppliersPricesOfProductsOrServices=Prezzi dei fornitori (di prodotti o servizi)
-CustomCode=Customs/Commodity/HS code
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=Paese di origine
 Nature=Natura
 ShortLabel=Etichetta breve
@@ -198,18 +199,18 @@ CurrentProductPrice=Prezzo corrente
 AlwaysUseNewPrice=Usa sempre il prezzo corrente di un prodotto/servizio
 AlwaysUseFixedPrice=Usa prezzo non negoziabile
 PriceByQuantity=Prezzi diversi in base alla quantità
-DisablePriceByQty=Disable prices by quantity
+DisablePriceByQty=Disabilitare i prezzi per quantità
 PriceByQuantityRange=Intervallo della quantità
-MultipriceRules=Price segment rules
-UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment
-PercentVariationOver=%% variation over %s
-PercentDiscountOver=%% discount over %s
+MultipriceRules=Regole del segmento di prezzo
+UseMultipriceRules=Utilizza le regole del segmento di prezzo (definite nell'impostazione del modulo del prodotto) per autocalcolare i prezzi di tutti gli altri segmenti in base al primo segmento
+PercentVariationOver=variazione %% su %s
+PercentDiscountOver=sconto %% su %s
 KeepEmptyForAutoCalculation=Lasciare libero se si vuole calcolare automaticamente da peso o volume del prodotto
-VariantRefExample=Example: COL
-VariantLabelExample=Example: Color
+VariantRefExample=Esempio: COL
+VariantLabelExample=Esempio: Colore
 ### composition fabrication
 Build=Produci
-ProductsMultiPrice=Products and prices for each price segment
+ProductsMultiPrice=Prodotti e prezzi per ogni segmento di prezzo
 ProductsOrServiceMultiPrice=I prezzi dei clienti (di prodotti o servizi, multi-prezzi)
 ProductSellByQuarterHT=Prodotti fatturato trimestrale ante imposte
 ServiceSellByQuarterHT=Servizi fatturato trimestrale ante imposte
@@ -253,9 +254,9 @@ ComposedProduct=Sottoprodotto
 MinSupplierPrice=Prezzo fornitore minimo
 MinCustomerPrice=Minimo prezzo di vendita
 DynamicPriceConfiguration=Configurazione dinamica dei prezzi
-DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able to use and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
-AddVariable=Add Variable
-AddUpdater=Add Updater
+DynamicPriceDesc=Sulla scheda prodotto, con questo modulo abilitato, dovresti essere in grado di impostare funzioni matematiche per calcolare i prezzi dei clienti o dei fornitori. Tale funzione può utilizzare tutti gli operatori matematici, alcune costanti e variabili. Puoi impostare qui le variabili che desideri usare e se la variabile necessita di un aggiornamento automatico, l'URL esterno da usare per chiedere a Dolibarr di aggiornare automaticamente il valore.
+AddVariable=Aggiungi variabile
+AddUpdater=Aggiungi Aggiornamento
 GlobalVariables=Variabili globali
 VariableToUpdate=Variabile da aggiornare
 GlobalVariableUpdaters=Aggiornamento variabili globali
@@ -264,7 +265,7 @@ GlobalVariableUpdaterHelp0=Esegue il parsing dei dati JSON da uno specifico indi
 GlobalVariableUpdaterHelpFormat0=Formato per la richiesta {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
 GlobalVariableUpdaterType1=Dati del WebService
 GlobalVariableUpdaterHelp1=Effettua il parsing dei dati del WebService da uno specifico indirizzo URL.\nNS: il namespace\nVALUE: la posizione di dati rilevanti\nDATA: contiene i dati da inviare\nMETHOD: il metodo WS da richiamare
-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"}}
+GlobalVariableUpdaterHelpFormat1=Il formato richiesto è {"URL": "http://example.com/urlofws", "VALORE": "array, targetvalue", "NS": "http://example.com/urlofns", "METODO" : "myWSMethod", "DATO": {"il_tuo": "dato", "da": "inviare"}}
 UpdateInterval=Frequenza di aggiornamento (in minuti)
 LastUpdated=Ultimo aggiornamento
 CorrectlyUpdated=Aggiornato correttamente
@@ -275,8 +276,8 @@ DefaultPriceRealPriceMayDependOnCustomer=Prezzo predefinito, prezzo reale può d
 WarningSelectOneDocument=Seleziona almeno un documento
 DefaultUnitToShow=Unità
 NbOfQtyInProposals=Q.ta in proposte
-ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
-ProductsOrServicesTranslations=Products or services translation
+ClinkOnALinkOfColumn=Fare clic su un collegamento della colonna %s per ottenere una vista dettagliata ...
+ProductsOrServicesTranslations=Prodotti o servizi di traduzione
 TranslatedLabel=Etichetta tradotta
 TranslatedDescription=Descrizione tradotta
 TranslatedNote=Note tradotte
@@ -290,20 +291,20 @@ ConfirmDeleteProductBuyPrice=Vuoi davvero eliminare questo prezzo di acquisto?
 SubProduct=Sottoprodotto
 ProductSheet=Scheda prodotto
 ServiceSheet=Scheda di servizio
-PossibleValues=Possible values
-GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
+PossibleValues=Valori possibili
+GoOnMenuToCreateVairants=Vai sul menu %s - %s per preparare le varianti degli attributi (come colori, dimensioni, ...)
 
 #Attributes
-VariantAttributes=Variant attributes
-ProductAttributes=Variant attributes for products
-ProductAttributeName=Variant attribute %s
-ProductAttribute=Variant attribute
-ProductAttributeDeleteDialog=Are you sure you want to delete this attribute? All values will be deleted
-ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with reference "%s" of this attribute?
-ProductCombinationDeleteDialog=Are you sure want to delete the variant of the product "<strong>%s</strong>"?
-ProductCombinationAlreadyUsed=There was an error while deleting the variant. Please check it is not being used in any object
+VariantAttributes=Variante attributi
+ProductAttributes=Variante attributi per i prodotti
+ProductAttributeName=Variante attributo %s
+ProductAttribute=Variante attributo
+ProductAttributeDeleteDialog=Sei sicuro di voler eliminare questo attributo? Tutti i valori saranno cancellati
+ProductAttributeValueDeleteDialog=Sei sicuro di voler eliminare il valore "%s" con riferimento a "%s" di questo attributo?
+ProductCombinationDeleteDialog=Sei sicuro di voler eliminare la variante del prodotto "<strong>%s</strong>"?
+ProductCombinationAlreadyUsed=Si è verificato un errore durante l'eliminazione della variante. Si prega di verificare che non venga utilizzato in alcun oggetto
 ProductCombinations=Varianti
-PropagateVariant=Propagate variants
+PropagateVariant=Propagare le varianti
 HideProductCombinations=Nascondi le varianti di prodotto
 ProductCombination=Variante
 NewProductCombination=Nuova variante
@@ -311,25 +312,25 @@ EditProductCombination=Edita variante
 NewProductCombinations=Nuove varianti
 EditProductCombinations=Edita varianti
 SelectCombination=Selezione combinazione
-ProductCombinationGenerator=Variants generator
+ProductCombinationGenerator=Generatore di varianti
 Features=Caratteristiche
-PriceImpact=Price impact
-WeightImpact=Weight impact
+PriceImpact=Impatto sui prezzi
+WeightImpact=Impatto del peso
 NewProductAttribute=Nuovo attributo
-NewProductAttributeValue=New attribute value
-ErrorCreatingProductAttributeValue=There was an error while creating the attribute value. It could be because there is already an existing value with that reference
-ProductCombinationGeneratorWarning=If you continue, before generating new variants, all previous ones will be DELETED. Already existing ones will be updated with the new values
-TooMuchCombinationsWarning=Generating lots of variants may result in high CPU, memory usage and Dolibarr not able to create them. Enabling the option "%s" may help reduce memory usage.
+NewProductAttributeValue=Nuovo valore dell'attributo
+ErrorCreatingProductAttributeValue=Si è verificato un errore durante la creazione del valore dell'attributo. Potrebbe essere perché c'è già un valore esistente con quel riferimento
+ProductCombinationGeneratorWarning=Se continui, prima di generare nuove varianti, tutte le precedenti saranno CANCELLATE. Quelli già esistenti verranno aggiornati con i nuovi valori
+TooMuchCombinationsWarning=Generare molte varianti può comportare un elevato utilizzo della CPU e della memoria, e Dolibarr non è in grado di crearle. Abilitare l'opzione "%s" può aiutare a ridurre l'utilizzo della memoria.
 DoNotRemovePreviousCombinations=Non rimuovere le precedenti varianti di prodotto
-UsePercentageVariations=Use percentage variations
-PercentageVariation=Percentage variation
+UsePercentageVariations=Usa le variazioni percentuali
+PercentageVariation=Variazione percentuale
 ErrorDeletingGeneratedProducts=Si è verificato un errore durante la cancellazione della variante di prodotto
-NbOfDifferentValues=Nb of different values
-NbProducts=Nb. of products
-ParentProduct=Parent product
+NbOfDifferentValues=N. di valori diversi
+NbProducts=N. di prodotti
+ParentProduct=Prodotto genitore
 HideChildProducts=Nascondi le varianti di prodotto
-ConfirmCloneProductCombinations=Would you like to copy all the product variants to the other parent product with the given reference?
-CloneDestinationReference=Destination product reference
+ConfirmCloneProductCombinations=Vuoi copiare tutte le varianti del prodotto sull'altro prodotto principale con il riferimento dato?
+CloneDestinationReference=Riferimento del prodotto di destinazione
 ErrorCopyProductCombinations=Si è verificato un errore durante la copia della variante di prodotto
-ErrorDestinationProductNotFound=Destination product not found
+ErrorDestinationProductNotFound=Prodotto di destinazione non trovato
 ErrorProductCombinationNotFound=Variante di prodotto non trovata
diff --git a/htdocs/langs/it_IT/projects.lang b/htdocs/langs/it_IT/projects.lang
index b43c5c69313..4493a76c07e 100644
--- a/htdocs/langs/it_IT/projects.lang
+++ b/htdocs/langs/it_IT/projects.lang
@@ -16,12 +16,12 @@ TasksOnProjectsPublicDesc=Questa vista presenta tutte le attività nei progetti
 ProjectsPublicTaskDesc=Questa prospettiva presenta tutti i progetti e le attività a cui è permesso accedere.
 ProjectsDesc=Questa visualizzazione mostra tutti i progetti (hai i privilegi per vedere tutto).
 TasksOnProjectsDesc=Questa visualizzazione mostra tutti i compiti di ogni progetto (hai i privilegi per vedere tutto).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for
+MyTasksDesc=Questa visualizzazione è limitata ai progetti o alle attività di cui tu sei un contatto
 OnlyOpenedProject=Sono visibili solamente i progetti aperti (i progetti con stato di bozza o chiusi non sono visibili).
 ClosedProjectsAreHidden=I progetti chiusi non sono visibili.
 TasksPublicDesc=Questa visualizzazione mostra tutti i progetti e i compiti che hai il permesso di vedere.
 TasksDesc=Questa visualizzazione mostra tutti i progetti e i compiti (hai i privilegi per vedere tutto).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
+AllTaskVisibleButEditIfYouAreAssigned=Tutte le attività dei progetti validati sono visibili, ma puoi inserire le ore solo nelle attività assegnate all'utente selezionato. Assegna delle attività se hai bisogno di inserirci all'interno delle ore.
 OnlyYourTaskAreVisible=Solo i compiti assegnati a te sono visibili. Assegna a te stesso il compito se vuoi allocarvi tempo lavorato.
 ImportDatasetTasks=Compiti dei progetti
 ProjectCategories=Tag/Categorie Progetti
@@ -33,14 +33,14 @@ ConfirmDeleteAProject=Vuoi davvero eliminare il progetto?
 ConfirmDeleteATask=Vuoi davvero eliminare questo compito?
 OpenedProjects=Progetti aperti
 OpenedTasks=Attività aperte
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpportunitiesStatusForOpenedProjects=Numero di opportunità di progetti aperti per stato
 OpportunitiesStatusForProjects=Importo delle vendite potenziali per stato nei progetti
 ShowProject=Visualizza progetto
 ShowTask=Visualizza compito
 SetProject=Imposta progetto
 NoProject=Nessun progetto definito o assegnato
 NbOfProjects=Num. di progetti
-NbOfTasks=Nb of tasks
+NbOfTasks=Nr di attività
 TimeSpent=Tempo lavorato
 TimeSpentByYou=Tempo impiegato da te
 TimeSpentByUser=Tempo impiegato dall'utente
@@ -55,7 +55,7 @@ TasksOnOpenedProject=Compiti relativi a progetti aperti
 WorkloadNotDefined=Carico di lavoro non definito
 NewTimeSpent=Tempo lavorato
 MyTimeSpent=Il mio tempo lavorato
-BillTime=Bill the time spent
+BillTime=Fattura il tempo lavorato
 Tasks=Compiti
 Task=Compito
 TaskDateStart=Data inizio attività
@@ -77,7 +77,8 @@ Time=Tempo
 ListOfTasks=Elenco dei compiti
 GoToListOfTimeConsumed=Vai all'elenco del tempo impiegato
 GoToListOfTasks=Vai all'elenco dei compiti
-GanttView=Gantt View
+GoToGanttView=Go to Gantt view
+GanttView=Vista Gantt
 ListProposalsAssociatedProject=Elenco delle proposte commerciali associate al progetto
 ListOrdersAssociatedProject=Elenco degli ordini clienti associati al progetto
 ListInvoicesAssociatedProject=Elenco delle fatture attive associate al progetto
@@ -92,15 +93,15 @@ ListDonationsAssociatedProject=Elenco delle donazioni associate al progetto
 ListVariousPaymentsAssociatedProject=Pagamenti vari associati al progetto
 ListActionsAssociatedProject=Elenco delle azioni associate al progetto
 ListTaskTimeUserProject=Tempo impiegato in compiti del progetto
-ListTaskTimeForTask=List of time consumed on task
+ListTaskTimeForTask=Tempo impiegato per l'attività
 ActivityOnProjectToday=Operatività sul progetto oggi
 ActivityOnProjectYesterday=Attività sul progetto ieri
 ActivityOnProjectThisWeek=Operatività sul progetto questa settimana
 ActivityOnProjectThisMonth=Operatività sul progetto questo mese
 ActivityOnProjectThisYear=Operatività sul progetto nell'anno in corso
 ChildOfProjectTask=Figlio del progetto/compito
-ChildOfTask=Child of task
-TaskHasChild=Task has child
+ChildOfTask=Figlio dell'attività
+TaskHasChild=L'attività ha un figlio
 NotOwnerOfProject=Non sei proprietario di questo progetto privato
 AffectedTo=Assegnato a
 CantRemoveProject=Questo progetto non può essere rimosso: altri oggetti (fatture, ordini, ecc...) vi fanno riferimento. Guarda la scheda riferimenti.
@@ -112,7 +113,7 @@ AlsoCloseAProject=Chiudu anche il progetto (mantienilo aperto se hai ancora biso
 ReOpenAProject=Apri progetto
 ConfirmReOpenAProject=Vuoi davvero riaprire il progetto?
 ProjectContact=Contatti del progetto
-TaskContact=Task contacts
+TaskContact=Contatti di attività
 ActionsOnProject=Azioni sul progetto
 YouAreNotContactOfProject=Non sei tra i contatti di questo progetto privato
 UserIsNotContactOfProject=L'utente non è un contatto di questo progetto privato
@@ -120,7 +121,7 @@ DeleteATimeSpent=Cancella il tempo lavorato
 ConfirmDeleteATimeSpent=Vuoi davvero cancellare il tempo lavorato?
 DoNotShowMyTasksOnly=Mostra anche le attività non assegnate a me
 ShowMyTasksOnly=Mostra soltanto le attività assegnate a me
-TaskRessourceLinks=Contacts task
+TaskRessourceLinks=Attività contatti
 ProjectsDedicatedToThisThirdParty=Progetti dedicati a questo soggetto terzo
 NoTasks=Nessun compito per questo progetto
 LinkedToAnotherCompany=Collegato ad un altro soggetto terzo
@@ -140,7 +141,7 @@ ProjectReportDate=Cambia la data del compito a seconda della data di inizio prog
 ErrorShiftTaskDate=Impossibile cambiare la data del compito a seconda della data di inizio del progetto
 ProjectsAndTasksLines=Progetti e compiti
 ProjectCreatedInDolibarr=Progetto %s creato
-ProjectValidatedInDolibarr=Project %s validated
+ProjectValidatedInDolibarr=Progetto %s convalidato
 ProjectModifiedInDolibarr=Progetto %s modificato
 TaskCreatedInDolibarr=Attività %s creata
 TaskModifiedInDolibarr=Attività %s modificata
@@ -175,13 +176,13 @@ ProjectMustBeValidatedFirst=I progetti devono prima essere validati
 FirstAddRessourceToAllocateTime=Assegna una risorsa per allocare tempo
 InputPerDay=Input per giorno
 InputPerWeek=Input per settimana
-InputDetail=Input detail
+InputDetail=Dettagli di input
 TimeAlreadyRecorded=Questo lasso di tempo è già stato registrato per questa attività/giorno e l'utente%s
 ProjectsWithThisUserAsContact=Progetti con questo utente come contatto
 TasksWithThisUserAsContact=Compiti assegnati a questo utente
 ResourceNotAssignedToProject=Non assegnato al progetto
 ResourceNotAssignedToTheTask=Risorsa non assegnata all'attività
-TimeSpentBy=Time spent by
+TimeSpentBy=Tempo impiegato da
 TasksAssignedTo=Attività assegnata a
 AssignTaskToMe=Assegnare un compito a me
 AssignTaskToUser=Assegnata attività a %s
@@ -191,18 +192,18 @@ ProjectOverview=Panoramica
 ManageTasks=Utilizzare i progetti per seguire compiti e tempo
 ManageOpportunitiesStatus=Utilizzare i progetti per seguire clienti interessati/opportunità
 ProjectNbProjectByMonth=Num. di progetti creati per mese
-ProjectNbTaskByMonth=Nb of created tasks by month
+ProjectNbTaskByMonth=Nr di attività create per mese
 ProjectOppAmountOfProjectsByMonth=Quantità di opportunità per mese
 ProjectWeightedOppAmountOfProjectsByMonth=Quantità ponderata di opportunità per mese
-ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
+ProjectOpenedProjectByOppStatus=Apri progetto /clienti interessati per stato opportunità
 ProjectsStatistics=Le statistiche relative a progetti/clienti interessati
-TasksStatistics=Statistics on project/lead tasks
+TasksStatistics=Statistiche su attività di progetto/clienti interessati
 TaskAssignedToEnterTime=Compito assegnato. Inserire i tempi per questo compito dovrebbe esserre possibile.
 IdTaskTime=Tempo compito id
 YouCanCompleteRef=Se vuoi aggiungere informazioni al riferimento (per agevolare la ricerca tramite filtri), è opportuno separarle con un carattere "-" in modo che la numerazione automatica continui a funzionare correttamente per i progetti successivi (es: %s-ABC). Puoi aggiungere all'etichetta anche altre chiavi di ricerca.
 OpenedProjectsByThirdparties=Progetti aperti di soggetti terzi
 OnlyOpportunitiesShort=Solo vendite potenziali
-OpenedOpportunitiesShort=Open opportunities
+OpenedOpportunitiesShort=Opportunità aperte
 NotAnOpportunityShort=Nessuna vendita potenziale
 OpportunityTotalAmount=Opportunità importo totale
 OpportunityPonderatedAmount=Opportunità importo ponderato
@@ -215,15 +216,15 @@ OppStatusPENDING=In attesa
 OppStatusWON=Vinto
 OppStatusLOST=Perso
 Budget=Budget
-AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>Supported values :</u><br>- Keep empty: Can link any project of the company (default)<br>- "all" : Can link any projects, even project of other companies<br>- A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)<br>
+AllowToLinkFromOtherCompany=Permetti di collegare il progetto di un'altra azienda<br><br><u>Valori supportati:</u><br>- Mantieni vuoto: può collegare qualsiasi progetto della società (impostazione predefinita)<br>- "tutto": può collegare qualsiasi progetto, anche se di altre aziende<br>- Un elenco di ID di terze parti separati da virgole: può collegare tutti i progetti di queste terze parti definite (Esempio: 123,4795,53)<br>
 LatestProjects=Ultimi %s progetti
-LatestModifiedProjects=Latest %s modified projects
-OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
+LatestModifiedProjects=Ultimi %s progetti modificati 
+OtherFilteredTasks=Altre attività filtrate
+NoAssignedTasks=Nessuna attività assegnata (assegnare progetto/attività all'utente corrente dalla casella di selezione in alto per inserire il tempo su di essa)
 # Comments trans
 AllowCommentOnTask=Permetti agli utenti di commentare queste attività
 AllowCommentOnProject=Permetti agli utenti di commentare questi progetti
-DontHavePermissionForCloseProject=You do not have permissions to close the project %s
-DontHaveTheValidateStatus=The project %s must be open to be closed
-RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+DontHavePermissionForCloseProject=Non hai i permessi per chiudere il progetto %s
+DontHaveTheValidateStatus=Il progetto %s deve essere aperto per essere chiuso
+RecordsClosed=%s progetti chiusi
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/it_IT/salaries.lang b/htdocs/langs/it_IT/salaries.lang
index 482d9161666..42a5be0d3c0 100644
--- a/htdocs/langs/it_IT/salaries.lang
+++ b/htdocs/langs/it_IT/salaries.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Piano dei conti usato per utenti di soggetti terzi
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accouting account on user is not defined.
-SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Il codice contabile dedicato definito sulla scheda utente verrà utilizzato solo per il registro contabile secondario. Questo verrà utilizzato per il libro mastro e come valore predefinito del registro contabile secondario se il codice contabile utente dedicato non è stato definito per l'utente.
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Codice contabile predefinito per i pagamenti degli stipendi
 Salary=Stipendio
 Salaries=Stipendi
 NewSalaryPayment=Nuovo pagamento stipendio
@@ -15,4 +15,4 @@ THMDescription=Questo valore viene usato per calcolare il costo delle ore spese
 TJMDescription=Attualmente il valore è solo un dato informativo e non viene usato per alcun calcolo automatico
 LastSalaries=Ultimo %s pagamento dello stipendio
 AllSalaries=Tutti i pagamenti degli stipendi
-SalariesStatistics=Statistiques salaires
+SalariesStatistics=Statistiche stipendi
diff --git a/htdocs/langs/it_IT/sendings.lang b/htdocs/langs/it_IT/sendings.lang
index ea88c61c7a3..1effb6cc29b 100644
--- a/htdocs/langs/it_IT/sendings.lang
+++ b/htdocs/langs/it_IT/sendings.lang
@@ -18,13 +18,13 @@ SendingCard=Scheda spedizione
 NewSending=Nuova spedizione
 CreateShipment=Crea una spedizione
 QtyShipped=Quantità spedita
-QtyShippedShort=Qty ship.
+QtyShippedShort=Qtà spedizione.
 QtyPreparedOrShipped=Q.ta preparata o spedita
 QtyToShip=Quantità da spedire
 QtyReceived=Quantità ricevuta
 QtyInOtherShipments=Q.ta in altre spedizioni
 KeepToShip=Ancora da spedire
-KeepToShipShort=Remain
+KeepToShipShort=Rimanente
 OtherSendingsForSameOrder=Altre Spedizioni per questo ordine
 SendingsAndReceivingForSameOrder=Spedizioni e ricezioni per questo ordini
 SendingsToValidate=Spedizione da convalidare
@@ -52,10 +52,10 @@ ActionsOnShipping=Acions sulla spedizione
 LinkToTrackYourPackage=Link a monitorare il tuo pacchetto
 ShipmentCreationIsDoneFromOrder=Per il momento, la creazione di una nuova spedizione viene effettuata dalla scheda dell'ordine.
 ShipmentLine=Filiera di spedizione
-ProductQtyInCustomersOrdersRunning=Product quantity into open customers orders
-ProductQtyInSuppliersOrdersRunning=Product quantity into open suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from open customer order already sent
-ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open supplier order already received
+ProductQtyInCustomersOrdersRunning=Quantità prodotto in ordini di clienti aperti
+ProductQtyInSuppliersOrdersRunning=Quantità prodotto in ordini di fornitori aperti
+ProductQtyInShipmentAlreadySent=Quantità prodotto dall'ordine cliente aperto già inviato
+ProductQtyInSuppliersShipmentAlreadyRecevied=Quantità prodotto dall'ordine fornitore aperto già ricevuto
 NoProductToShipFoundIntoStock=Nessun prodotto da spedire presente all'interno del magazzino <b>%s</b>
 WeightVolShort=Peso/Vol.
 ValidateOrderFirstBeforeShipment=È necessario convalidare l'ordine prima di poterlo spedire 
diff --git a/htdocs/langs/it_IT/stocks.lang b/htdocs/langs/it_IT/stocks.lang
index 4952a4d6e05..01f185958ff 100644
--- a/htdocs/langs/it_IT/stocks.lang
+++ b/htdocs/langs/it_IT/stocks.lang
@@ -203,3 +203,4 @@ RegulateStock=Regulate Stock
 ListInventory=Elenco
 StockSupportServices=Stock management support services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/it_IT/stripe.lang b/htdocs/langs/it_IT/stripe.lang
index 40ec0115666..ea63d3c28eb 100644
--- a/htdocs/langs/it_IT/stripe.lang
+++ b/htdocs/langs/it_IT/stripe.lang
@@ -58,8 +58,8 @@ NameOnCard=Name on card
 CardNumber=Card Number
 ExpiryDate=Expiry Date
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/it_IT/supplier_proposal.lang b/htdocs/langs/it_IT/supplier_proposal.lang
index f08365d9f34..94f37afb1ac 100644
--- a/htdocs/langs/it_IT/supplier_proposal.lang
+++ b/htdocs/langs/it_IT/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Proposte commerciali fornitori
-supplier_proposalDESC=Gestione delle richieste di quotazione ai fornitori
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
 SupplierProposalNew=Nuova richiesta quotazione
 CommRequest=Richiesta quotazione
 CommRequests=Richieste quotazioni
 SearchRequest=Cerca quotazione
 DraftRequests=Quotazioni in bozza
-SupplierProposalsDraft=Bozza di proposta fornitore
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=Ultime %s richieste di quotazione modificate
 RequestsOpened=Apri richieste di quotazione
-SupplierProposalArea=Area proposte commerciali fornitori
-SupplierProposalShort=Proposta fornitore
-SupplierProposals=Proposte Fornitore
-SupplierProposalsShort=Proposte Fornitore
+SupplierProposalArea=Vendor proposals area
+SupplierProposalShort=Vendor proposal
+SupplierProposals=Vendor proposals
+SupplierProposalsShort=Vendor proposals
 NewAskPrice=Nuova richiesta quotazione
 ShowSupplierProposal=Mostra le richieste di quotazione
 AddSupplierProposal=Inserisci richiesta di quotazione
-SupplierProposalRefFourn=Rif. fornitore
+SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=Data di spedizione
 SupplierProposalRefFournNotice=Prima di chiudere come "Accettata", inserisci un riferimento al fornitore
 ConfirmValidateAsk=Vuoi davvero convalidare la richiesta di quotazione con il nome <b>%s</b>?
@@ -47,9 +47,9 @@ CommercialAsk=Richiesta quotazione
 DefaultModelSupplierProposalCreate=Creazione del modello predefinito
 DefaultModelSupplierProposalToBill=Template predefinito quando si chiude una richiesta di quotazione (accettata)
 DefaultModelSupplierProposalClosed=Template predefinito quando si chiude una richiesta di quotazione (rifiutata)
-ListOfSupplierProposals=Elenco delle richieste di quotazione ai fornitori
-ListSupplierProposalsAssociatedProject=Elenco delle richieste di quotazione fornitori associate al progetto
-SupplierProposalsToClose=Proposta fornitore da elaborare
-SupplierProposalsToProcess=Proposta fornitori da elaborare
+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=Ultime %s richieste di quotazione
 AllPriceRequests=Tutte le richieste
diff --git a/htdocs/langs/it_IT/suppliers.lang b/htdocs/langs/it_IT/suppliers.lang
index 686d3a770cd..c32761f0257 100644
--- a/htdocs/langs/it_IT/suppliers.lang
+++ b/htdocs/langs/it_IT/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Fornitori
-SuppliersInvoice=Fattura Fornitore
-ShowSupplierInvoice=Mostra fatture fornitore
-NewSupplier=Nuovo fornitore
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=Storico
-ListOfSuppliers=Elenco fornitori
-ShowSupplier=Visualizza fornitore
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=Data ordine
 BuyingPriceMin=Miglior prezzo di acquisto
 BuyingPriceMinShort=Miglior prezzo di acquisto
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Totale dei prezzi di vendita dei sotto-prodotti
 SomeSubProductHaveNoPrices=Per alcuni sottoprodotti non è stato definito un prezzo
 AddSupplierPrice=Aggiungi prezzo di acquisto
 ChangeSupplierPrice=Cambia prezzo di acquisto
-SupplierPrices=Prezzi di acquisto
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Il fornitore di riferimento è già associato a un prodotto: %s
-NoRecordedSuppliers=Non ci sono fornitori registrati
-SupplierPayment=Pagamento fornitore
-SuppliersArea=Area fornitori
-RefSupplierShort=Rif. fornitore
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=Disponibilità
-ExportDataset_fournisseur_1=Fatture fornitore e linee di fattura
-ExportDataset_fournisseur_2=Fatture fornitore e pagamenti
-ExportDataset_fournisseur_3=Ordini fornitore e righe degli ordini
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=Approva l'ordine
 ConfirmApproveThisOrder=Sei sicuro di voler approvare l'ordine <b>%s</b>?
 DenyingThisOrder=Nega questo ordine
 ConfirmDenyingThisOrder=Sei sicuro di voler negare l'ordine <b>%s</b>?
 ConfirmCancelThisOrder=Sei sicuro di voler eliminare l'ordine <b>%s</b>?
-AddSupplierOrder=Crea ordine fornitore
-AddSupplierInvoice=Crea fattura fornitore
-ListOfSupplierProductForSupplier=Elenco prodotti e prezzi per il fornitore <b>%s</b>
-SentToSuppliers=Inviato ai fornitori
-ListOfSupplierOrders=Elenco ordini fornitori
-MenuOrdersSupplierToBill=Ordini fornitori in fatture
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Tempi di consegna in giorni
 DescNbDaysToDelivery=Il maggior ritardo nella consegna dei prodotti da questo ordine
-SupplierReputation=Reputazione fornitore
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Non ordinare
 NotTheGoodQualitySupplier=Cattiva qualità
 ReputationForThisProduct=Reputazione
 BuyerName=Nome acquirente
-AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=Prezzi di acquisto
+AllProductServicePrices=Tutti i prezzi del prodotto / servizio
+AllProductReferencesOfSupplier=Tutti i riferimenti del prodotto / servizio del fornitore
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/it_IT/website.lang b/htdocs/langs/it_IT/website.lang
index e9dbb51b770..0bbb5e11b07 100644
--- a/htdocs/langs/it_IT/website.lang
+++ b/htdocs/langs/it_IT/website.lang
@@ -64,7 +64,7 @@ IDOfPage=ID della pagina
 Banner=Banner
 BlogPost=Articoli sul blog
 WebsiteAccount=Web site account
-WebsiteAccounts=Web site accounts
+WebsiteAccounts=Account del sito web
 AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
@@ -73,7 +73,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
diff --git a/htdocs/langs/it_IT/workflow.lang b/htdocs/langs/it_IT/workflow.lang
index 9a6501ca6cc..0454f555c3e 100644
--- a/htdocs/langs/it_IT/workflow.lang
+++ b/htdocs/langs/it_IT/workflow.lang
@@ -4,17 +4,17 @@ WorkflowDesc=Questo modulo è progettato per modificare il comportamento di azio
 ThereIsNoWorkflowToModify=Non ci sono modifiche del flusso di lavoro disponibili con i moduli attivati.
 # Autocreate
 descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Crea automaticamente un ordine cliente dopo che una proposta commerciale viene segnata come firmata (il nuovo ordine avrà lo stesso ammontare della proposta commerciale)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (new invoice will have same amount than proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Crea automaticamente una fattura cliente dopo aver firmato una proposta commerciale (la nuova fattura avrà lo stesso importo della proposta)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Creare automaticamente una fattura attiva alla convalida del contratto
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed (new invoice will have same amount than order)
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Crea automaticamente una fattura cliente dopo che un ordine cliente è stato chiuso (la nuova fattura avrà lo stesso importo dell'ordine)
 # Autoclassify customer proposal or order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classifica come "da fatturare" la/e proposta/e commerciale/i quando l'ordine cliente collegato è impostato come da fatturare (e se l'ammontare dell'ordine è lo stesso ammontare della proposta commerciale firmata e collegata)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classifica "da fatturare" le proposte collegate quando la fattura cliente è validata (e se l'importo della fattura è uguale all'importo totale delle proposte collegate)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classifica "da fatturare" gli ordini cliente collegati quando la fattura cliente è validata (e se l'importo della fattura è uguale all'importo totale di ordini collegati)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classifica "da fatturare" gli ordini cliente collegati quando la fattura cliente è impostata su pagamento (e se l'importo della fattura è uguale all'importo totale di ordini collegati)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classifica "da spedire" l'ordine cliente collegato quando una spedizione viene convalidata (e se la quantità spedita da tutte le spedizioni è la stessa dell'ordine da aggiornare)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=Creazione automatica
 AutomaticClassification=Classificazione automatica
diff --git a/htdocs/langs/ja_JP/accountancy.lang b/htdocs/langs/ja_JP/accountancy.lang
index 7e8b490983a..0ee47623f50 100644
--- a/htdocs/langs/ja_JP/accountancy.lang
+++ b/htdocs/langs/ja_JP/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Accounting
 ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
 ACCOUNTING_EXPORT_DATE=Date format for export file
 ACCOUNTING_EXPORT_PIECE=Export the number of piece
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Accounts with non zero values
 ListOfAccounts=List of accounts
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers 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
 
-AccountancyArea=Accountancy area
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
 AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
@@ -89,7 +90,7 @@ MenuProductsAccounts=Product accounts
 ProductsBinding=Products accounts
 Ventilation=Binding to accounts
 CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Supplier invoice binding
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
 ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
@@ -185,11 +187,12 @@ ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
-DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Group of account
 Pcgsubtype=Subgroup of account
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
 ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
 DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report 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 fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -293,4 +296,9 @@ Binded=Lines bound
 ToBind=Lines to bind
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
index 0323daf2866..2ec06cd6fe5 100644
--- a/htdocs/langs/ja_JP/admin.lang
+++ b/htdocs/langs/ja_JP/admin.lang
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=SMTP / SMTPSホスト（php.iniのデフォルト<b>：%s
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP / SMTPSポート（システムのようにUnix上でPHPに定義されていません）
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPSホスト（システムのようにUnix上でPHPに定義されていません）
 MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= 体系的にすべての送信メールの隠されたカーボンコピーを送信
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=電子メールを送信するために使用する方法
 MAIN_MAIL_SMTPS_ID=認証が必要な場合は、SMTPには、ID
 MAIN_MAIL_SMTPS_PW=認証が必要な場合は、SMTPパスワード
@@ -291,7 +292,7 @@ ModuleSetup=モジュールのセットアップ
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=システム
 ModuleFamilyCrm=顧客関係管理（CRM）
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=プロジェクト/共同作業
@@ -373,7 +374,8 @@ NoSmsEngine=いいえ、SMS送信者のマネージャーはご利用いただ
 PDF=PDF
 PDFDesc=あなたは、PDFの生成に関連する各グローバルオプションを設定することができます
 PDFAddressForging=アドレスボックスを築くためのルール
-HideAnyVATInformationOnPDF=生成されたPDF上の付加価値税に関連するすべての情報を隠す
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=Hide products description on generated PDF
@@ -445,7 +447,8 @@ DisplayCompanyInfo=Display company address
 DisplayCompanyManagers=Display manager names
 DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party 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.
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Set this to 1 if you want to attach main document to emai
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=ユーザーとグループ
 Module0Desc=Users / Employees and Groups management
@@ -479,7 +485,7 @@ Module1Desc=会社と連絡先の管理
 Module2Name=コマーシャル
 Module2Desc=商業管理
 Module10Name=会計
-Module10Desc=単純な会計管理（請求書と支払いがディスパッチ）
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=提案
 Module20Desc=商業的な提案の管理
 Module22Name=大量の電子郵便
@@ -546,8 +552,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=のwebcalendar
 Module410Desc=のwebcalendar統合
-Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Payment of employee wages
 Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
@@ -561,14 +567,14 @@ Module700Name=寄付
 Module700Desc=寄付金の管理
 Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=カマキリ
 Module1200Desc=カマキリの統合
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
 Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=WYSIWYGエディタ
 Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
 Module2200Name=Dynamic Prices
@@ -576,7 +582,7 @@ Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Scheduled jobs
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API/Web services (SOAP server)
@@ -613,7 +619,7 @@ Module50100Desc=Point of sales module (POS).
 Module50200Name=ペイパル
 Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Poll, Survey or Vote
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=遅延会費のアラートの前に許容遅延時間
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=行うためのチェック預金のアラートの前に許容遅延時間（日数）
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=他のメニューエントリは、オプションのパラメータを管理することができます。
 LogEvents=セキュリティ監査イベント
 Audit=監査
@@ -1054,8 +1060,9 @@ LogEventDesc=ここDolibarrセキュリティイベントのロギングを有
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=システム情報では、読み取り専用モードでのみ管理者の目に見える得るその他の技術情報です。
 SystemAreaForAdminOnly=この領域は、管理者ユーザーのために利用可能です。 Dolibarr権限のいずれも、この制限を減らすことはできません。
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=あなたがDolibarrの外観に関連する各パラメータを選択し、ここで感じることができる
 AvailableModules=Available app/modules
 ToActivateModule=モジュールを有効にするには、設定エリア（ホーム - &gt;セットアップ - &gt;モジュール）に行く。
@@ -1188,11 +1195,11 @@ UserMailRequired=新しいユーザーを作成するために必要な電子メ
 HRMSetup=HRM module setup
 ##### Company setup #####
 CompanySetup=企業のモジュールのセットアップ
-CompanyCodeChecker=サードパーティのコード生成とチェック（顧客またはサプライヤー）のモジュール
-AccountCodeManager=Module for accounting code generation (customer or supplier)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
 NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
 ModelModules=ドキュメントテンプレート
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
@@ -1203,6 +1210,9 @@ MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
 TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=<b>%s</b>形式にエクスポートするリンクは以下のリンクで入手可能です：%s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=商業的な提案でフリーテキスト
 WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
 ##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=注文の管理セットアップ
 OrdersNumberingModules=モジュールの番号受注
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=ユーザー '%s'成功したデータベース &quot;%s&quot;
 OSCommerceTestKo1=サーバー '%s'への接続が成功しますが、データベース '%s'は到達できませんでした。
 OSCommerceTestKo2=ユーザー '%s'でサーバー '%s'への接続に失敗しました。
 ##### Stock #####
-StockSetup=Warehouse module setup
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
 ##### Menu #####
 MenuDeleted=メニューを削除
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
 MultiCompanySetup=マルチ会社のモジュールのセットアップ
 ##### Suppliers #####
 SuppliersSetup=サプライヤーモジュールのセットアップ
-SuppliersCommandModel=サプライヤーのための完全なテンプレート（logo. ..）
-SuppliersInvoiceModel=サプライヤーの請求書の完全なテンプレート（logo. ..）
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","
 SalariesSetup=Setup of module salaries
 SortOrder=Sort order
 Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Install of external module from applic
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
-TextTitleColor=Color of page title
+TextTitleColor=Text color of Page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=Background color for Top menu
 TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
 ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-MailToMember=To send email from member page
-MailToUser=To send email from user page
-MailToProject= To send email from project page
+MailToSendProposal=Customer proposals
+MailToSendOrder=Customer orders
+MailToSendInvoice=Customer invoices
+MailToSendShipment=出荷
+MailToSendIntervention=介入
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=契約
+MailToThirdparty=サードパーティ
+MailToMember=メンバー
+MailToUser=ユーザー
+MailToProject=Projects page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1780,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/ja_JP/bills.lang b/htdocs/langs/ja_JP/bills.lang
index 8abdb414ba7..186c4643399 100644
--- a/htdocs/langs/ja_JP/bills.lang
+++ b/htdocs/langs/ja_JP/bills.lang
@@ -109,7 +109,7 @@ CancelBill=請求書を取り消す
 SendRemindByMail=電子メールでリマインダを送信
 DoPayment=Enter payment
 DoPaymentBack=Enter refund
-ConvertToReduc=将来の割引に変換
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=顧客から受け取った支払を入力します。
@@ -120,7 +120,7 @@ BillStatus=請求書の状況
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=ドラフト（検証する必要があります）
 BillStatusPaid=有料
-BillStatusPaidBackOrConverted=Credit note refund or converted into discount
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=放棄された
 BillStatusValidated=（お支払いする必要があります）を検証
@@ -296,10 +296,10 @@ DiscountType=Discount type
 NoteReason=（注）/理由
 ReasonDiscount=理由
 DiscountOfferedBy=によって付与された
-DiscountStillRemaining=Discounts available
-DiscountAlreadyCounted=Discounts already consumed
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+SupplierDiscounts=Vendors discounts
 BillAddress=ビル·アドレス
 HelpEscompte=この割引は、その支払いが長期前に行われたため、顧客に付与された割引です。
 HelpAbandonBadCustomer=この金額は、放棄されている（顧客が悪い顧客であると）と卓越した緩いとみなされます。
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Every %s days
 FrequencyPer_m=Every %s months
 FrequencyPer_y=Every %s years
@@ -505,9 +511,14 @@ SituationAmount=Situation invoice amount(net)
 SituationDeduction=Situation subtraction
 ModifyAllLines=Modify all lines
 CreateNextSituationInvoice=Create next situation
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=S
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
 NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
@@ -532,3 +543,4 @@ AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/ja_JP/categories.lang b/htdocs/langs/ja_JP/categories.lang
index a5a2a1e6e5a..08caf22926a 100644
--- a/htdocs/langs/ja_JP/categories.lang
+++ b/htdocs/langs/ja_JP/categories.lang
@@ -16,7 +16,7 @@ MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
-SubCats=サブカテゴリ
+SubCats=Sub-categories
 CatList=List of tags/categories
 NewCategory=New tag/category
 ModifCat=Modify tag/category
@@ -85,3 +85,4 @@ CategorieRecursivHelp=If activated, product will also linked to parent category
 AddProductServiceIntoCategory=Add the following product/service
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
+ChooseCategory=Choose category
diff --git a/htdocs/langs/ja_JP/commercial.lang b/htdocs/langs/ja_JP/commercial.lang
index aed297eaddd..9c77d23a0d1 100644
--- a/htdocs/langs/ja_JP/commercial.lang
+++ b/htdocs/langs/ja_JP/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=閉じる
 ActionAC_EMAILING=大量メールを送信
 ActionAC_COM=メールで顧客の注文を送る
 ActionAC_SHIP=メールでの発送を送る
-ActionAC_SUP_ORD=メールでのサプライヤーの順序を送る
-ActionAC_SUP_INV=メールでのサプライヤの請求書を送る
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=その他
 ActionAC_OTH_AUTO=Automatically inserted events
 ActionAC_MANUAL=Manually inserted events
diff --git a/htdocs/langs/ja_JP/companies.lang b/htdocs/langs/ja_JP/companies.lang
index 257e55b2302..6b94eba25d0 100644
--- a/htdocs/langs/ja_JP/companies.lang
+++ b/htdocs/langs/ja_JP/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=この連絡先と継承されたすべての情報を削
 MenuNewThirdParty=新しいサードパーティ
 MenuNewCustomer=新しい顧客
 MenuNewProspect=新しい見通し
-MenuNewSupplier=新しいサプライヤー
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=新しい民間の個々の
-NewCompany=新会社（見通し、顧客、サプラ​​イヤー）
-NewThirdParty=新しいサードパーティ（見込み客、顧客、サプラ​​イヤー）
-CreateDolibarrThirdPartySupplier=Create a third party (supplier)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=Create third party
 CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Prospectionエリア
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=見込み
 ThirdPartyCustomers=お客さま
 ThirdPartyCustomersStats=お客さま
 ThirdPartyCustomersWithIdProf12=%s %sまたはお持ちのお客様
-ThirdPartySuppliers=サプライヤー
+ThirdPartySuppliers=Vendors
 ThirdPartyType=サードパーティ製のタイプ
 Individual=私人
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
@@ -77,11 +77,11 @@ Web=ウェブ
 Poste= 位置
 DefaultLang=デフォルトでは、言語
 VATIsUsed=Sales tax is used
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
-ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=提案
 OverAllOrders=受注
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=RE Type
 TypeLocaltax2ES=IRPF Type
 WrongCustomerCode=無効な顧客コード
-WrongSupplierCode=無効なサプライヤコード
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=顧客コードモデル
-SupplierCodeModel=サプライヤーコードモデル
+SupplierCodeModel=Vendor code model
 Gencod=バーコード
 ##### Professional ID #####
 ProfId1Short=教授はidが1
@@ -267,7 +267,7 @@ Prospect=見通し
 CustomerCard=顧客カード
 Customer=顧客
 CustomerRelativeDiscount=相対的な顧客割引
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=相対的な割引
 CustomerAbsoluteDiscountShort=絶対的な割引
 CompanyHasRelativeDiscount=この顧客は<b>%sの%%</b>デフォルトの割引を持っている
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this suppl
 CompanyHasNoAbsoluteDiscount=この顧客は、使用可能な割引クレジットを持っていません
 CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
 CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=なし
 Supplier=サプライヤー
 AddContact=Create contact
@@ -304,13 +304,13 @@ DeleteACompany=会社を削除します。
 PersonalInformations=個人データ
 AccountancyCode=Accounting account
 CustomerCode=顧客コード
-SupplierCode=サプライヤーコード
+SupplierCode=Vendor code
 CustomerCodeShort=顧客コード
-SupplierCodeShort=サプライヤーコード
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=すべての顧客固有の顧客コード、
-SupplierCodeDesc=すべてのサプライヤーに対して一意のサプライヤーコード、
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=第三者が顧客または見込み客である場合は必須
-RequiredIfSupplier=第三者がサプライヤである場合は必須
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=モジュールによって制御の妥当性
 ThisIsModuleRules=これは、このモジュールのためのルールです。
 ProspectToContact=連絡する見通し
@@ -338,7 +338,7 @@ MyContacts=私の連絡先
 Capital=資本
 CapitalOf=%sの首都
 EditCompany=会社を編集します。
-ThisUserIsNot=このユーザーは、見通し、顧客やサプライヤーではありません
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=チェック
 VATIntraCheckDesc=リンク<b>%sは、</b>欧州のVATチェッカーサービスを要求することができます。サーバーから外部インターネットへのアクセスが動作するように、このサービスが必要となります。
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -396,7 +396,7 @@ ImportDataset_company_4=Third parties/Sales representatives (Assign sales repres
 PriceLevel=価格水準
 DeliveryAddress=配信アドレス
 AddAddress=アドレスを追加します。
-SupplierCategory=サプライヤーのカテゴリ
+SupplierCategory=Vendor category
 JuridicalStatus200=Independent
 DeleteFile=ファイルを削除します。
 ConfirmDeleteFile=あなたがこのファイルを削除してもよろしいですか？
@@ -406,7 +406,7 @@ FiscalYearInformation=会計年度に関する情報
 FiscalMonthStart=会計年度の開始月
 YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
 YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
-ListSuppliersShort=サプライヤーのリスト
+ListSuppliersShort=List of vendors
 ListProspectsShort=見込み客リスト
 ListCustomersShort=顧客リスト
 ThirdPartiesArea=Third parties and contact area
@@ -420,7 +420,7 @@ CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=yyは年である顧客コードと仕入先コードの%syymm-nnnnの形式%syymm-NNNNとニュメロを返し、mmは月とnnnnはありません休憩0〜ノーリターンでシーケンスです。
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=顧客/サプライヤーコードは無料です。このコードは、いつでも変更することができます。
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/ja_JP/compta.lang b/htdocs/langs/ja_JP/compta.lang
index 5fa9461dc31..02ad28446cb 100644
--- a/htdocs/langs/ja_JP/compta.lang
+++ b/htdocs/langs/ja_JP/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=ネットが支払われ
 VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
-VATSummary=Tax Balance
+VATSummary=Tax monthly
+VATBalance=Tax Balance
 VATPaid=Tax paid
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=会計/財務エリア
 NewPayment=新しいお支払い
 Payments=支払い
 PaymentCustomerInvoice=顧客の請求書の支払い
-PaymentSupplierInvoice=サプライヤの請求書の支払い
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=付加価値税の支払い
 ListPayment=支払いのリスト
 ListOfCustomerPayments=顧客の支払のリスト
-ListOfSupplierPayments=サプライヤーの支払のリスト
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -110,7 +111,7 @@ ShowVatPayment=付加価値税の支払いを表示する
 TotalToPay=支払いに合計
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
 CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
 SupplierAccountancyCodeShort=Sup. account. code
 AccountNumber=口座番号
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=第三者IRPFによる報告
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
 Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
-ByProductsAndServices=By products and services
+ByProductsAndServices=By product and service
 RefExt=External ref
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
 LinkedOrder=Link to order
@@ -215,7 +218,8 @@ Mode1=Method 1
 Mode2=Method 2
 CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
 CalculationRuleDescSupplier=According to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
@@ -242,3 +246,10 @@ FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/ja_JP/dict.lang b/htdocs/langs/ja_JP/dict.lang
index 74da203f280..ef49eaba6a3 100644
--- a/htdocs/langs/ja_JP/dict.lang
+++ b/htdocs/langs/ja_JP/dict.lang
@@ -5,6 +5,7 @@ CountryIT=イタリア
 CountryES=スペイン
 CountryDE=ドイツ
 CountryCH=スイス
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
 CountryGB=イギリス
 CountryUK=イギリス
 CountryIE=アイルランド
diff --git a/htdocs/langs/ja_JP/ecm.lang b/htdocs/langs/ja_JP/ecm.lang
index e95df29b558..4aee74f2353 100644
--- a/htdocs/langs/ja_JP/ecm.lang
+++ b/htdocs/langs/ja_JP/ecm.lang
@@ -39,9 +39,10 @@ ShowECMSection=ディレクトリを表示する
 DeleteSection=ディレクトリを削除します。
 ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
 ECMDirectoryForFiles=ファイルの相対ディレクトリ
-CannotRemoveDirectoryContainsFiles=それはいくつかのファイルが含まれているため不可能削除
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=ファイルマネージャ
-ECMSelectASection=左側のツリー上のディレクトリを選択...
+ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
diff --git a/htdocs/langs/ja_JP/errors.lang b/htdocs/langs/ja_JP/errors.lang
index 984ad21cc64..d80faa8f618 100644
--- a/htdocs/langs/ja_JP/errors.lang
+++ b/htdocs/langs/ja_JP/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Bar code required
 ErrorCustomerCodeAlreadyUsed=顧客コードは既に使用され
 ErrorBarCodeAlreadyUsed=Bar code already used
 ErrorPrefixRequired=接頭辞が必要
-ErrorBadSupplierCodeSyntax=サプライヤーコードの不正な構文
-ErrorSupplierCodeRequired=サプライヤーコードが必要です
-ErrorSupplierCodeAlreadyUsed=サプライヤーコードが既に使用され
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=パラメータが不正で
 ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
 ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
@@ -87,7 +87,7 @@ ErrorsOnXLines=<b>%s</b>ソース行のエラー
 ErrorFileIsInfectedWithAVirus=ウイルス対策プログラムがファイルを検証することができませんでした（ファイルがウイルスに感染されるかもしれません）
 ErrorSpecialCharNotAllowedForField=特殊文字は、フィールド &quot;%s&quot;に許可されていません
 ErrorNumRefModel=参照は、データベース（%s）に存在し、この番号規則と互換性がありません。レコードを削除するか、このモジュールを有効にするために参照を変更しました。
-ErrorQtyTooLowForThisSupplier=このサプライヤーのために低すぎる量やサプライヤーのために本製品に定義されていない価格
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=マスク上でのエラー
 ErrorBadMaskFailedToLocatePosOfSequence=シーケンス番号のないエラー、マスク
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
-ErrorSupplierCountryIsNotDefined=このサプライヤーのために国が定義されていません。最初にこれを修正します。
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
diff --git a/htdocs/langs/ja_JP/install.lang b/htdocs/langs/ja_JP/install.lang
index f3cb83a4c95..32c7b7bbecb 100644
--- a/htdocs/langs/ja_JP/install.lang
+++ b/htdocs/langs/ja_JP/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=コンフィギュレーションフ
 ConfFileCouldBeCreated=設定ファイルの<b>%sを</b>作成することができます。
 ConfFileIsNotWritable=設定ファイルの<b>%sが</b>書き込み可能<b>では</b>ありません。権限を確認してください。最初のインストールについては、Webサーバーは、（OSのようなUnix上の例のために&quot;chmod 666&quot;）のコンフィギュレーションプロセス中にこのファイルに書き込むことができるように付与する必要があります。
 ConfFileIsWritable=コンフィギュレーションファイルの<b>%sは</b>書き込み可能です。
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=コンフィギュレーションファイルからすべての情報をリロードします。
 PHPSupportSessions=このPHPは、セッションをサポートしています。
 PHPSupportPOSTGETOk=このPHPは、変数はPOSTとGETをサポートしています。
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Dolibarr管理者アカウントの作成に失敗し
 WarningRemoveInstallDir=警告、セキュリティ上の理由から、一度インストールまたはアップグレードが完了すると、あなた<b>は</b>それ<b>の悪意のある使用を避けるために、インストールディレクトリを</b>削除<b>するか、Dolibarrのドキュメントディレクトリにinstall.lockと呼ばれるファイルを追加</b>する必要があります<b>。</b>
 FunctionNotAvailableInThisPHP=このPHPは利用できません
 ChoosedMigrateScript=移行スクリプトを選択します。
-DataMigration=データの移行
-DatabaseMigration=構造データベースの移行
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=スクリプト処理
 ChooseYourSetupMode=セットアップモードを選択し、&quot;スタート&quot;をクリック...
 FreshInstall=新規インストール
@@ -146,7 +147,7 @@ NothingToDo=Nothing to do
 # upgrade
 MigrationFixData=非正規化データを修正
 MigrationOrder=顧客の注文のためのデータ移行
-MigrationSupplierOrder=サプライヤーの受注のためのデータ移行
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=商用の提案のためのデータ移行
 MigrationInvoice=顧客の請求書のデータ移行
 MigrationContract=契約のためのデータ移行
@@ -196,6 +197,8 @@ MigrationEvents=イベントを移行して、イベントの所有者を割当
 MigrationEventsContact=Migration of events to add event contact into assignement table
 MigrationRemiseEntity=llx_societe_remise のエンティティフィールド値を更新
 MigrationRemiseExceptEntity=llx_societe_remise_except のエンティティフィールド値を更新
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
 MigrationReloadModule=モジュール %s を再読み込み
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 ShowNotAvailableOptions=利用できないオプションを表示しない
diff --git a/htdocs/langs/ja_JP/ldap.lang b/htdocs/langs/ja_JP/ldap.lang
index 82af7b094df..c5bde09b6e6 100644
--- a/htdocs/langs/ja_JP/ldap.lang
+++ b/htdocs/langs/ja_JP/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=ドメインのパスワード
 YouMustChangePassNextLogon=ドメイン<b>%s</b>のユーザー<b>%s</b>のパスワードを変更する必要があります。
 UserMustChangePassNextLogon=ユーザーは、ドメイン%sにパスワードを変更する必要があります。
 LDAPInformationsForThisContact=この連絡先のLDAPデータベース内の情報
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Member type synchronized
 ContactSynchronized=連絡先を同期しました
 ForceSynchronize=強制的に同期 Dolibarr -> LDAP
 ErrorFailedToReadLDAP=LDAPデータベースの読み込みに失敗しました。 LDAPモジュールの設定とデータベースのアクセシビリティをチェックします。
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/ja_JP/loan.lang b/htdocs/langs/ja_JP/loan.lang
index a62e22dca79..981e6bbea1d 100644
--- a/htdocs/langs/ja_JP/loan.lang
+++ b/htdocs/langs/ja_JP/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=資本
 Insurance=Insurance
 Interest=Interest
 Nbterms=Number of terms
+Term=Term
 LoanAccountancyCapitalCode=Accounting account capital
 LoanAccountancyInsuranceCode=Accounting account insurance
 LoanAccountancyInterestCode=Accounting account interest
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=Confirm deleting this loan
 LoanDeleted=Loan Deleted Successfully
 ConfirmPayLoan=Confirm classify paid this loan
 LoanPaid=Loan Paid
-# Calc
-LoanCalc=Bank Loans Calculator
-PurchaseFinanceInfo=Purchase & Financing Information
-SalePriceOfAsset=Sale Price of Asset
-PercentageDown=Percentage Down
-LengthOfMortgage=Duration of loan
-AnnualInterestRate=Annual Interest Rate
-ExplainCalculations=Explain Calculations
-ShowMeCalculationsAndAmortization=Show me the calculations and amortization
-MortgagePaymentInformation=Mortgage Payment Information
-DownPayment=Down Payment
-DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
-InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
-MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
-MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
-MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
-MonthlyPaymentDesc=The montly payment is figured out using the following formula
-AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
-AmountFinanced=Amount Financed
-AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
-Totalsforyear=Totals for year
-MonthlyPayment=Monthly Payment
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
-GoToInterest=%s will go towards INTEREST
-GoToPrincipal=%s will go towards PRINCIPAL
-YouWillSpend=You will spend %s in year %s
 ListLoanAssociatedProject=List of loan associated with the project
 AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Interest
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-FinancialCommitment=Financial commitment
 CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/langs/ja_JP/mails.lang b/htdocs/langs/ja_JP/mails.lang
index a582d7c800a..844e50908f7 100644
--- a/htdocs/langs/ja_JP/mails.lang
+++ b/htdocs/langs/ja_JP/mails.lang
@@ -11,7 +11,9 @@ MailFrom=送信者
 MailErrorsTo=エラーへ
 MailReply=に返信
 MailTo=受信者（単数または複数）
+MailToUsers=To user(s)
 MailCC=にコピー
+MailToCCUsers=Copy to users(s)
 MailCCC=にキャッシュされたコピー
 MailTopic=メールしてくださいトピック
 MailText=メッセージ
@@ -164,4 +166,4 @@ InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang
index 5101965d6c2..7ae791d2862 100644
--- a/htdocs/langs/ja_JP/main.lang
+++ b/htdocs/langs/ja_JP/main.lang
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is se
 Administrator=管理者
 Undefined=未定義
 PasswordForgotten=Password forgotten?
+NoAccount=No account?
 SeeAbove=上記参照
 HomeArea=ホームエリア
 LastConnexion=Latest connection
@@ -231,7 +232,7 @@ Limit=制限
 Limits=制限
 Logout=ログアウト
 NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=接続
+Connection=ログイン
 Setup=セットアップ
 Alert=警告
 MenuWarnings=アラート
@@ -402,6 +403,7 @@ DefaultTaxRate=Default tax rate
 Average=平均
 Sum=合計
 Delta=デルタ
+RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=オプション
@@ -414,7 +416,7 @@ Favorite=Favorite
 ShortInfo=Info.
 Ref=REF。
 ExternalRef=Ref. extern
-RefSupplier=REF。サプライヤー
+RefSupplier=Ref. vendor
 RefPayment=REF。支払い
 CommercialProposalsShort=商用の提案
 Comment=コメント
@@ -493,7 +495,7 @@ Received=受信された
 Paid=有料
 Topic=Subject
 ByCompanies=第三者による
-ByUsers=ユーザによる
+ByUsers=By user
 Links=リンク
 Link=リンク
 Rejects=拒否する
@@ -619,9 +621,9 @@ BuildDoc=Docを構築する
 Entity=環境
 Entities=エンティティ
 CustomerPreview=顧客のプレビュー
-SupplierPreview=サプライヤーのプレビュー
+SupplierPreview=Vendor preview
 ShowCustomerPreview=顧客のプレビューを表示する
-ShowSupplierPreview=サプライヤーのプレビューを表示する
+ShowSupplierPreview=Show vendor preview
 RefCustomer=REF。顧客
 Currency=通貨
 InfoAdmin=管理者向け情報
@@ -679,7 +681,7 @@ Color=カラー
 Documents=リンクされたファイル
 Documents2=ドキュメント
 UploadDisabled=アップロードを無効に
-MenuAccountancy=会計学
+MenuAccountancy=Accounting
 MenuECM=ドキュメント
 MenuAWStats=AWStatsは
 MenuMembers=メンバー
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=Products or services
 SearchIntoProjects=プロジェクト
 SearchIntoTasks=タスク
 SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=介入
 SearchIntoContracts=契約
 SearchIntoCustomerShipments=Customer shipments
@@ -941,3 +943,5 @@ Remote=Remote
 LocalAndRemote=Local and Remote
 KeyboardShortcut=Keyboard shortcut
 AssignedTo=影響を受ける
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/ja_JP/margins.lang b/htdocs/langs/ja_JP/margins.lang
index a112a5f5374..f379cdf4d87 100644
--- a/htdocs/langs/ja_JP/margins.lang
+++ b/htdocs/langs/ja_JP/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=As a service
 UseDiscountOnTotal=On subtotal
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
 MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best supplier price
+MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Cost price
 UnitCharges=Unit charges
 Charges=Charges
diff --git a/htdocs/langs/ja_JP/members.lang b/htdocs/langs/ja_JP/members.lang
index 298f13a46e9..ff259fe0fd0 100644
--- a/htdocs/langs/ja_JP/members.lang
+++ b/htdocs/langs/ja_JP/members.lang
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
diff --git a/htdocs/langs/ja_JP/opensurvey.lang b/htdocs/langs/ja_JP/opensurvey.lang
index 69fda4d9123..78c1de334e6 100644
--- a/htdocs/langs/ja_JP/opensurvey.lang
+++ b/htdocs/langs/ja_JP/opensurvey.lang
@@ -58,3 +58,4 @@ MoreChoices=Enter more choices for the voters
 SurveyExpiredInfo=The poll has been closed or voting delay has expired.
 EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
 ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/ja_JP/orders.lang b/htdocs/langs/ja_JP/orders.lang
index bf112a1f5ef..1aa5679e79e 100644
--- a/htdocs/langs/ja_JP/orders.lang
+++ b/htdocs/langs/ja_JP/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=お客様の注文エリア
-SuppliersOrdersArea=仕入先の受注エリア
+SuppliersOrdersArea=Purchase orders area
 OrderCard=注文カード
 OrderId=Order Id
 Order=オーダー
@@ -13,18 +13,18 @@ OrderToProcess=プロセスの順序
 NewOrder=新規注文
 ToOrder=順序を作る
 MakeOrder=順序を作る
-SupplierOrder=サプライヤーのため
-SuppliersOrders=サプライヤーの注文
-SuppliersOrdersRunning=現在のサプライヤーの注文
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=顧客注文
-CustomersOrders=Customer orders
+CustomersOrders=顧客からの注文
 CustomersOrdersRunning=Current customer orders
 CustomersOrdersAndOrdersLines=Customer orders and order lines
 OrdersDeliveredToBill=Customer orders delivered to bill
 OrdersToBill=Customer orders delivered
 OrdersInProcess=Customer orders in process
 OrdersToProcess=Customer orders to process
-SuppliersOrdersToProcess=Supplier orders to process
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=キャンセル
 StatusOrderDraftShort=ドラフト
 StatusOrderValidatedShort=検証
@@ -75,15 +75,15 @@ ShowOrder=順序を示す
 OrdersOpened=Orders to process
 NoDraftOrders=No draft orders
 NoOrder=No order
-NoSupplierOrder=No supplier order
+NoSupplierOrder=No purchase order
 LastOrders=Latest %s customer orders
 LastCustomerOrders=Latest %s customer orders
-LastSupplierOrders=Latest %s supplier orders
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=Latest %s modified orders
 AllOrders=すべての注文
 NbOfOrders=注文数
 OrdersStatistics=注文の統計
-OrdersStatisticsSuppliers=サプライヤーのための統計情報
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=月別受注数
 AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
 ListOfOrders=注文の一覧
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</
 GenerateBill=請求書を生成します。
 ClassifyShipped=Classify delivered
 DraftOrders=ドラフト注文
-DraftSuppliersOrders=Draft suppliers orders
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=プロセス受注
 RefOrder=REF。オーダー
 RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for supplier
-RefOrderSupplierShort=Ref. order supplier
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=メールで注文を送る
 ActionsOnOrder=ためのイベント
 NoArticleOfTypeProduct=この注文のため、型 '製品'なし発送の記事のない記事ません
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
 DispatchSupplierOrder=サプライヤの注文%sを受信
 FirstApprovalAlreadyDone=First approval already done
 SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=Supplier order %s received %s
-SupplierOrderSubmitedInDolibarr=Supplier order %s submited
-SupplierOrderClassifiedBilled=Supplier order %s set billed
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=他の注文
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=代表的なフォローアップ、顧客の注文
@@ -125,11 +125,11 @@ 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_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=代表的なフォローアップ出荷
-TypeContact_order_supplier_external_BILLING=サプライヤの請求書の連絡先
-TypeContact_order_supplier_external_SHIPPING=サプライヤの出荷の連絡先
-TypeContact_order_supplier_external_CUSTOMER=サプライヤーの連絡先のフォローアップの順序
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=定数COMMANDE_SUPPLIER_ADDONが定義されていません
 Error_COMMANDE_ADDON_NotDefined=定数COMMANDE_ADDONが定義されていません
 Error_OrderNotChecked=No orders to invoice selected
diff --git a/htdocs/langs/ja_JP/other.lang b/htdocs/langs/ja_JP/other.lang
index 4924ebdc3dd..c654c25e0fa 100644
--- a/htdocs/langs/ja_JP/other.lang
+++ b/htdocs/langs/ja_JP/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=ファイルが大きすぎる
 PleaseBePatient=しばらくお待ちください...
 NewPassword=New password
 ResetPassword=Reset password
-RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
@@ -233,6 +233,8 @@ PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=輸出地域
 AvailableFormats=利用可能なフォーマット
diff --git a/htdocs/langs/ja_JP/productbatch.lang b/htdocs/langs/ja_JP/productbatch.lang
index e9aef33f7f6..7c05340b95e 100644
--- a/htdocs/langs/ja_JP/productbatch.lang
+++ b/htdocs/langs/ja_JP/productbatch.lang
@@ -16,7 +16,7 @@ printEatby=Eat-by: %s
 printSellby=Sell-by: %s
 printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic increase/decrease stock mode is forced to shipping validate and manual dispatching for reception and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
 ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
diff --git a/htdocs/langs/ja_JP/products.lang b/htdocs/langs/ja_JP/products.lang
index b63602f59e1..af56d1621d2 100644
--- a/htdocs/langs/ja_JP/products.lang
+++ b/htdocs/langs/ja_JP/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=新価格
 MinPrice=Min. selling price
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=販売価格は、本製品（税抜き%s）に許可される最小値より小さくなることはありません。あなたはあまりにも重要な割引を入力した場合にも、このメッセージが表示されますことができます。
 ContractStatusClosed=閉じた
 ErrorProductAlreadyExists=参照%sした製品はすでに存在しています。
@@ -155,7 +156,7 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Supplier prices
 SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
-CustomCode=Customs/Commodity/HS code
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=原産国
 Nature=自然
 ShortLabel=Short label
diff --git a/htdocs/langs/ja_JP/projects.lang b/htdocs/langs/ja_JP/projects.lang
index ef46e4c54d9..309e9b25e6a 100644
--- a/htdocs/langs/ja_JP/projects.lang
+++ b/htdocs/langs/ja_JP/projects.lang
@@ -77,6 +77,7 @@ Time=時間
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=プロジェクトに関連付けられている商用の提案のリスト
 ListOrdersAssociatedProject=List of customer orders associated with the project
@@ -226,4 +227,4 @@ AllowCommentOnProject=Allow user comments on projects
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/ja_JP/stocks.lang b/htdocs/langs/ja_JP/stocks.lang
index d29518a63d3..8a99f5771a2 100644
--- a/htdocs/langs/ja_JP/stocks.lang
+++ b/htdocs/langs/ja_JP/stocks.lang
@@ -203,3 +203,4 @@ RegulateStock=Regulate Stock
 ListInventory=リスト
 StockSupportServices=Stock management support services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/ja_JP/stripe.lang b/htdocs/langs/ja_JP/stripe.lang
index 1bd51430d31..77dfb20cfb4 100644
--- a/htdocs/langs/ja_JP/stripe.lang
+++ b/htdocs/langs/ja_JP/stripe.lang
@@ -58,8 +58,8 @@ NameOnCard=Name on card
 CardNumber=Card Number
 ExpiryDate=Expiry Date
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/ja_JP/supplier_proposal.lang b/htdocs/langs/ja_JP/supplier_proposal.lang
index 8459ff66ee4..7dca5163fd8 100644
--- a/htdocs/langs/ja_JP/supplier_proposal.lang
+++ b/htdocs/langs/ja_JP/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Supplier commercial proposals
-supplier_proposalDESC=Manage price requests to suppliers
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
 SupplierProposalNew=New price request
 CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
-SupplierProposalsDraft=Draft supplier proposals
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=Latest %s modified price requests
 RequestsOpened=Open price requests
-SupplierProposalArea=Supplier proposals area
-SupplierProposalShort=Supplier proposal
-SupplierProposals=Supplier proposals
-SupplierProposalsShort=Supplier proposals
+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=Supplier ref
+SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=配達日
 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>?
@@ -47,9 +47,9 @@ CommercialAsk=Price request
 DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposals=List of supplier proposal requests
-ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
-SupplierProposalsToClose=Supplier proposals to close
-SupplierProposalsToProcess=Supplier proposals to process
+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
diff --git a/htdocs/langs/ja_JP/suppliers.lang b/htdocs/langs/ja_JP/suppliers.lang
index b5063153794..8b9d1e6289b 100644
--- a/htdocs/langs/ja_JP/suppliers.lang
+++ b/htdocs/langs/ja_JP/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=サプライヤー
-SuppliersInvoice=仕入先の請求書
-ShowSupplierInvoice=Show Supplier Invoice
-NewSupplier=新しいサプライヤー
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=歴史
-ListOfSuppliers=サプライヤーのリスト
-ShowSupplier=サプライヤーを表示
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=注文日
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
-SupplierPrices=Supplier prices
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=このリファレンス·サプライヤーは、すでに参照に関連付けられています。%s
-NoRecordedSuppliers=記録されていないサプライヤーません
-SupplierPayment=サプライヤーの支払い
-SuppliersArea=サプライヤーエリア
-RefSupplierShort=REF。サプライヤー
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=可用性
-ExportDataset_fournisseur_1=サプライヤの請求書のリストと請求書の行
-ExportDataset_fournisseur_2=サプライヤーの請求書と支払い
-ExportDataset_fournisseur_3=Supplier orders and order lines
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=この注文を承認
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
 ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
 ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
-AddSupplierOrder=サプライヤーの順序を作成します。
-AddSupplierInvoice=サプライヤの請求書を作成します。
-ListOfSupplierProductForSupplier=サプライヤー<b>%s</b>の製品と価格の一覧
-SentToSuppliers=Sent to suppliers
-ListOfSupplierOrders=List of supplier orders
-MenuOrdersSupplierToBill=Supplier orders to invoice
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-SupplierReputation=Supplier reputation
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
 AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=Supplier prices
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/ja_JP/website.lang b/htdocs/langs/ja_JP/website.lang
index 2579fee26d5..356babdafff 100644
--- a/htdocs/langs/ja_JP/website.lang
+++ b/htdocs/langs/ja_JP/website.lang
@@ -73,7 +73,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
diff --git a/htdocs/langs/ja_JP/workflow.lang b/htdocs/langs/ja_JP/workflow.lang
index dd0cade9df2..bc879bb4c0d 100644
--- a/htdocs/langs/ja_JP/workflow.lang
+++ b/htdocs/langs/ja_JP/workflow.lang
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source custome
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/ka_GE/accountancy.lang b/htdocs/langs/ka_GE/accountancy.lang
index c37db78c215..daa15928096 100644
--- a/htdocs/langs/ka_GE/accountancy.lang
+++ b/htdocs/langs/ka_GE/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Accounting
 ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
 ACCOUNTING_EXPORT_DATE=Date format for export file
 ACCOUNTING_EXPORT_PIECE=Export the number of piece
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Accounts with non zero values
 ListOfAccounts=List of accounts
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers 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
 
-AccountancyArea=Accountancy area
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
 AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
@@ -89,7 +90,7 @@ MenuProductsAccounts=Product accounts
 ProductsBinding=Products accounts
 Ventilation=Binding to accounts
 CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Supplier invoice binding
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
 ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
@@ -185,11 +187,12 @@ ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
-DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Group of account
 Pcgsubtype=Subgroup of account
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
 ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
 DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report 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 fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -293,4 +296,9 @@ Binded=Lines bound
 ToBind=Lines to bind
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/ka_GE/admin.lang b/htdocs/langs/ka_GE/admin.lang
index fed6af9a6fa..28eb076c540 100644
--- a/htdocs/langs/ka_GE/admin.lang
+++ b/htdocs/langs/ka_GE/admin.lang
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems)
 MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=Method to use to send EMails
 MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
 MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
@@ -291,7 +292,7 @@ ModuleSetup=Module setup
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projects/Collaborative work
@@ -373,7 +374,8 @@ NoSmsEngine=No SMS sender manager available. SMS sender manager are not installe
 PDF=PDF
 PDFDesc=You can set each global options related to the PDF generation
 PDFAddressForging=Rules to forge address boxes
-HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=Hide products description on generated PDF
@@ -445,7 +447,8 @@ DisplayCompanyInfo=Display company address
 DisplayCompanyManagers=Display manager names
 DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party 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.
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Set this to 1 if you want to attach main document to emai
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -479,7 +485,7 @@ Module1Desc=Companies and contact management (customers, prospects...)
 Module2Name=Commercial
 Module2Desc=Commercial management
 Module10Name=Accounting
-Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching.
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=Proposals
 Module20Desc=Commercial proposal management
 Module22Name=Mass E-mailings
@@ -546,8 +552,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
-Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Payment of employee wages
 Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
@@ -561,14 +567,14 @@ Module700Name=Donations
 Module700Desc=Donation management
 Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Mantis integration
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
 Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
 Module2200Name=Dynamic Prices
@@ -576,7 +582,7 @@ Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Scheduled jobs
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API/Web services (SOAP server)
@@ -613,7 +619,7 @@ Module50100Desc=Point of sales module (POS).
 Module50200Name=Paypal
 Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Poll, Survey or Vote
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed memb
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=Other menu entries manage optional parameters.
 LogEvents=Security audit events
 Audit=Audit
@@ -1054,8 +1060,9 @@ LogEventDesc=You can enable here the logging for Dolibarr security events. Admin
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1188,11 +1195,11 @@ UserMailRequired=EMail required to create a new user
 HRMSetup=HRM module setup
 ##### Company setup #####
 CompanySetup=Companies module setup
-CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier)
-AccountCodeManager=Module for accounting code generation (customer or supplier)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
 NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
 ModelModules=Documents templates
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
@@ -1203,6 +1210,9 @@ MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
 TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=Free text on commercial proposals
 WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
 ##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=Order management setup
 OrdersNumberingModules=Orders numbering models
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe
 OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
 OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
 ##### Stock #####
-StockSetup=Warehouse module setup
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
 ##### Menu #####
 MenuDeleted=Menu deleted
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
 MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
 SuppliersSetup=Supplier module setup
-SuppliersCommandModel=Complete template of supplier order (logo...)
-SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","
 SalariesSetup=Setup of module salaries
 SortOrder=Sort order
 Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Install of external module from applic
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
-TextTitleColor=Color of page title
+TextTitleColor=Text color of Page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=Background color for Top menu
 TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
 ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-MailToMember=To send email from member page
-MailToUser=To send email from user page
-MailToProject= To send email from project page
+MailToSendProposal=Customer proposals
+MailToSendOrder=Customer orders
+MailToSendInvoice=Customer invoices
+MailToSendShipment=Shipments
+MailToSendIntervention=Interventions
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Contracts
+MailToThirdparty=Third parties
+MailToMember=Members
+MailToUser=Users
+MailToProject=Projects page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1780,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/ka_GE/bills.lang b/htdocs/langs/ka_GE/bills.lang
index 5898daa72b0..2f029928beb 100644
--- a/htdocs/langs/ka_GE/bills.lang
+++ b/htdocs/langs/ka_GE/bills.lang
@@ -109,7 +109,7 @@ CancelBill=Cancel an invoice
 SendRemindByMail=Send reminder by EMail
 DoPayment=Enter payment
 DoPaymentBack=Enter refund
-ConvertToReduc=Convert into future discount
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
@@ -120,7 +120,7 @@ BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
 BillStatusPaid=Paid
-BillStatusPaidBackOrConverted=Credit note refund or converted into discount
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Abandoned
 BillStatusValidated=Validated (needs to be paid)
@@ -296,10 +296,10 @@ DiscountType=Discount type
 NoteReason=Note/Reason
 ReasonDiscount=Reason
 DiscountOfferedBy=Granted by
-DiscountStillRemaining=Discounts available
-DiscountAlreadyCounted=Discounts already consumed
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+SupplierDiscounts=Vendors discounts
 BillAddress=Bill address
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Every %s days
 FrequencyPer_m=Every %s months
 FrequencyPer_y=Every %s years
@@ -505,9 +511,14 @@ SituationAmount=Situation invoice amount(net)
 SituationDeduction=Situation subtraction
 ModifyAllLines=Modify all lines
 CreateNextSituationInvoice=Create next situation
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=S
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
 NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
@@ -532,3 +543,4 @@ AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/ka_GE/categories.lang b/htdocs/langs/ka_GE/categories.lang
index 41e5f4e4c13..c0c8d4c0cef 100644
--- a/htdocs/langs/ka_GE/categories.lang
+++ b/htdocs/langs/ka_GE/categories.lang
@@ -16,7 +16,7 @@ MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
-SubCats=Subcategories
+SubCats=Sub-categories
 CatList=List of tags/categories
 NewCategory=New tag/category
 ModifCat=Modify tag/category
@@ -85,3 +85,4 @@ CategorieRecursivHelp=If activated, product will also linked to parent category
 AddProductServiceIntoCategory=Add the following product/service
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
+ChooseCategory=Choose category
diff --git a/htdocs/langs/ka_GE/commercial.lang b/htdocs/langs/ka_GE/commercial.lang
index f6bfea9c0d3..efadc44d700 100644
--- a/htdocs/langs/ka_GE/commercial.lang
+++ b/htdocs/langs/ka_GE/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=Close
 ActionAC_EMAILING=Send mass email
 ActionAC_COM=Send customer order by mail
 ActionAC_SHIP=Send shipping by mail
-ActionAC_SUP_ORD=Send supplier order by mail
-ActionAC_SUP_INV=Send supplier invoice by mail
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=Other
 ActionAC_OTH_AUTO=Automatically inserted events
 ActionAC_MANUAL=Manually inserted events
diff --git a/htdocs/langs/ka_GE/companies.lang b/htdocs/langs/ka_GE/companies.lang
index 3473667fe55..b3e1e7b6c86 100644
--- a/htdocs/langs/ka_GE/companies.lang
+++ b/htdocs/langs/ka_GE/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Are you sure you want to delete this contact and all inheri
 MenuNewThirdParty=New third party
 MenuNewCustomer=New customer
 MenuNewProspect=New prospect
-MenuNewSupplier=New supplier
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=New private individual
-NewCompany=New company (prospect, customer, supplier)
-NewThirdParty=New third party (prospect, customer, supplier)
-CreateDolibarrThirdPartySupplier=Create a third party (supplier)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=Create third party
 CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Prospection area
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=Prospects
 ThirdPartyCustomers=Customers
 ThirdPartyCustomersStats=Customers
 ThirdPartyCustomersWithIdProf12=Customers with %s or %s
-ThirdPartySuppliers=Suppliers
+ThirdPartySuppliers=Vendors
 ThirdPartyType=Third party type
 Individual=Private individual
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
@@ -77,11 +77,11 @@ Web=Web
 Poste= Position
 DefaultLang=Language by default
 VATIsUsed=Sales tax is used
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
-ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Proposals
 OverAllOrders=Orders
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=RE Type
 TypeLocaltax2ES=IRPF Type
 WrongCustomerCode=Customer code invalid
-WrongSupplierCode=Supplier code invalid
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Customer code model
-SupplierCodeModel=Supplier code model
+SupplierCodeModel=Vendor code model
 Gencod=Bar code
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
@@ -267,7 +267,7 @@ Prospect=Prospect
 CustomerCard=Customer Card
 Customer=Customer
 CustomerRelativeDiscount=Relative customer discount
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=Relative discount
 CustomerAbsoluteDiscountShort=Absolute discount
 CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this suppl
 CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
 CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
 CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=None
 Supplier=Supplier
 AddContact=Create contact
@@ -304,13 +304,13 @@ DeleteACompany=Delete a company
 PersonalInformations=Personal data
 AccountancyCode=Accounting account
 CustomerCode=Customer code
-SupplierCode=Supplier code
+SupplierCode=Vendor code
 CustomerCodeShort=Customer code
-SupplierCodeShort=Supplier code
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=Customer code, unique for all customers
-SupplierCodeDesc=Supplier code, unique for all suppliers
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=Required if third party is a customer or prospect
-RequiredIfSupplier=Required if third party is a supplier
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=Validity controled by module
 ThisIsModuleRules=This is rules for this module
 ProspectToContact=Prospect to contact
@@ -338,7 +338,7 @@ MyContacts=My contacts
 Capital=Capital
 CapitalOf=Capital of %s
 EditCompany=Edit company
-ThisUserIsNot=This user is not a prospect, customer nor supplier
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=Check
 VATIntraCheckDesc=The link <b>%s</b> allows to ask the european VAT checker service. An external internet access from server is required for this service to work.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -396,7 +396,7 @@ ImportDataset_company_4=Third parties/Sales representatives (Assign sales repres
 PriceLevel=Price level
 DeliveryAddress=Delivery address
 AddAddress=Add address
-SupplierCategory=Supplier category
+SupplierCategory=Vendor category
 JuridicalStatus200=Independent
 DeleteFile=Delete file
 ConfirmDeleteFile=Are you sure you want to delete this file?
@@ -406,7 +406,7 @@ FiscalYearInformation=Information on the fiscal year
 FiscalMonthStart=Starting month of the fiscal year
 YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
 YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
-ListSuppliersShort=List of suppliers
+ListSuppliersShort=List of vendors
 ListProspectsShort=List of prospects
 ListCustomersShort=List of customers
 ThirdPartiesArea=Third parties and contact area
@@ -420,7 +420,7 @@ CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/ka_GE/compta.lang b/htdocs/langs/ka_GE/compta.lang
index cda96a546b8..d2cfb714900 100644
--- a/htdocs/langs/ka_GE/compta.lang
+++ b/htdocs/langs/ka_GE/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=Net paid
 VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
-VATSummary=Tax Balance
+VATSummary=Tax monthly
+VATBalance=Tax Balance
 VATPaid=Tax paid
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=Accountancy/Treasury area
 NewPayment=New payment
 Payments=Payments
 PaymentCustomerInvoice=Customer invoice payment
-PaymentSupplierInvoice=Supplier invoice payment
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
-ListOfSupplierPayments=List of supplier payments
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -110,7 +111,7 @@ ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
 CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
 SupplierAccountancyCodeShort=Sup. account. code
 AccountNumber=Account number
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
 Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
-ByProductsAndServices=By products and services
+ByProductsAndServices=By product and service
 RefExt=External ref
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
 LinkedOrder=Link to order
@@ -215,7 +218,8 @@ Mode1=Method 1
 Mode2=Method 2
 CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
 CalculationRuleDescSupplier=According to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
@@ -242,3 +246,10 @@ FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/ka_GE/dict.lang b/htdocs/langs/ka_GE/dict.lang
index ca0c61a9cbc..61a7237f472 100644
--- a/htdocs/langs/ka_GE/dict.lang
+++ b/htdocs/langs/ka_GE/dict.lang
@@ -5,7 +5,8 @@ CountryIT=Italy
 CountryES=Spain
 CountryDE=Germany
 CountryCH=Switzerland
-CountryGB=Great Britain
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=United Kingdom
 CountryUK=United Kingdom
 CountryIE=Ireland
 CountryCN=China
diff --git a/htdocs/langs/ka_GE/ecm.lang b/htdocs/langs/ka_GE/ecm.lang
index 65e9b17bdb2..5200fa30b1d 100644
--- a/htdocs/langs/ka_GE/ecm.lang
+++ b/htdocs/langs/ka_GE/ecm.lang
@@ -39,9 +39,10 @@ ShowECMSection=Show directory
 DeleteSection=Remove directory
 ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
 ECMDirectoryForFiles=Relative directory for files
-CannotRemoveDirectoryContainsFiles=Removed not possible because it contains some files
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=File manager
-ECMSelectASection=Select a directory on left tree...
+ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
diff --git a/htdocs/langs/ka_GE/errors.lang b/htdocs/langs/ka_GE/errors.lang
index ec036b28bc5..0ca7488b8cb 100644
--- a/htdocs/langs/ka_GE/errors.lang
+++ b/htdocs/langs/ka_GE/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Bar code required
 ErrorCustomerCodeAlreadyUsed=Customer code already used
 ErrorBarCodeAlreadyUsed=Bar code already used
 ErrorPrefixRequired=Prefix required
-ErrorBadSupplierCodeSyntax=Bad syntax for supplier code
-ErrorSupplierCodeRequired=Supplier code required
-ErrorSupplierCodeAlreadyUsed=Supplier code already used
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Bad parameters
 ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
 ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
@@ -87,7 +87,7 @@ ErrorsOnXLines=Errors on <b>%s</b> source record(s)
 ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
 ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s"
 ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
-ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Error on mask
 ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
-ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
diff --git a/htdocs/langs/ka_GE/install.lang b/htdocs/langs/ka_GE/install.lang
index e602c54640c..587d4f83da6 100644
--- a/htdocs/langs/ka_GE/install.lang
+++ b/htdocs/langs/ka_GE/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not
 ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
 ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be granted to be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reload all information from configuration file.
 PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
 WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called <b>install.lock</b> into Dolibarr document directory, in order to avoid malicious use of it.
 FunctionNotAvailableInThisPHP=Not available on this PHP
 ChoosedMigrateScript=Choose migration script
-DataMigration=Data migration
-DatabaseMigration=Structure database migration
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script processing
 ChooseYourSetupMode=Choose your setup mode and click "Start"...
 FreshInstall=Fresh install
@@ -146,7 +147,7 @@ NothingToDo=Nothing to do
 # upgrade
 MigrationFixData=Fix for denormalized data
 MigrationOrder=Data migration for customer's orders
-MigrationSupplierOrder=Data migration for supplier's orders
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Data migration for commercial proposals
 MigrationInvoice=Data migration for customer's invoices
 MigrationContract=Data migration for contracts
@@ -196,6 +197,8 @@ MigrationEvents=Migration of events to add event owner into assignement table
 MigrationEventsContact=Migration of events to add event contact into assignement table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 ShowNotAvailableOptions=Show not available options
diff --git a/htdocs/langs/ka_GE/ldap.lang b/htdocs/langs/ka_GE/ldap.lang
index d6360f3e540..abe11602147 100644
--- a/htdocs/langs/ka_GE/ldap.lang
+++ b/htdocs/langs/ka_GE/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Password for domain
 YouMustChangePassNextLogon=Password for user <b>%s</b> on the domain <b>%s</b> must be changed.
 UserMustChangePassNextLogon=User must change password on the domain %s
 LDAPInformationsForThisContact=Information in LDAP database for this contact
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Member type synchronized
 ContactSynchronized=Contact synchronized
 ForceSynchronize=Force synchronizing Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Failed to read LDAP database. Check LDAP module setup and database accessibility.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/ka_GE/loan.lang b/htdocs/langs/ka_GE/loan.lang
index 9aae3869cc3..534dee08867 100644
--- a/htdocs/langs/ka_GE/loan.lang
+++ b/htdocs/langs/ka_GE/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=Capital
 Insurance=Insurance
 Interest=Interest
 Nbterms=Number of terms
+Term=Term
 LoanAccountancyCapitalCode=Accounting account capital
 LoanAccountancyInsuranceCode=Accounting account insurance
 LoanAccountancyInterestCode=Accounting account interest
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=Confirm deleting this loan
 LoanDeleted=Loan Deleted Successfully
 ConfirmPayLoan=Confirm classify paid this loan
 LoanPaid=Loan Paid
-# Calc
-LoanCalc=Bank Loans Calculator
-PurchaseFinanceInfo=Purchase & Financing Information
-SalePriceOfAsset=Sale Price of Asset
-PercentageDown=Percentage Down
-LengthOfMortgage=Duration of loan
-AnnualInterestRate=Annual Interest Rate
-ExplainCalculations=Explain Calculations
-ShowMeCalculationsAndAmortization=Show me the calculations and amortization
-MortgagePaymentInformation=Mortgage Payment Information
-DownPayment=Down Payment
-DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
-InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
-MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
-MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
-MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
-MonthlyPaymentDesc=The montly payment is figured out using the following formula
-AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
-AmountFinanced=Amount Financed
-AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
-Totalsforyear=Totals for year
-MonthlyPayment=Monthly Payment
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
-GoToInterest=%s will go towards INTEREST
-GoToPrincipal=%s will go towards PRINCIPAL
-YouWillSpend=You will spend %s in year %s
 ListLoanAssociatedProject=List of loan associated with the project
 AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Interest
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-FinancialCommitment=Financial commitment
 CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/langs/ka_GE/mails.lang b/htdocs/langs/ka_GE/mails.lang
index cedcd01066b..2313910de93 100644
--- a/htdocs/langs/ka_GE/mails.lang
+++ b/htdocs/langs/ka_GE/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Sender
 MailErrorsTo=Errors to
 MailReply=Reply to
 MailTo=Receiver(s)
+MailToUsers=To user(s)
 MailCC=Copy to
+MailToCCUsers=Copy to users(s)
 MailCCC=Cached copy to
 MailTopic=EMail topic
 MailText=Message
@@ -164,4 +166,4 @@ InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/ka_GE/main.lang b/htdocs/langs/ka_GE/main.lang
index 35d3774700f..afd0a77a87f 100644
--- a/htdocs/langs/ka_GE/main.lang
+++ b/htdocs/langs/ka_GE/main.lang
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is se
 Administrator=Administrator
 Undefined=Undefined
 PasswordForgotten=Password forgotten?
+NoAccount=No account?
 SeeAbove=See above
 HomeArea=Home area
 LastConnexion=Latest connection
@@ -231,7 +232,7 @@ Limit=Limit
 Limits=Limits
 Logout=Logout
 NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Connection
+Connection=Login
 Setup=Setup
 Alert=Alert
 MenuWarnings=Alerts
@@ -402,6 +403,7 @@ DefaultTaxRate=Default tax rate
 Average=Average
 Sum=Sum
 Delta=Delta
+RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
@@ -414,7 +416,7 @@ Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
 ExternalRef=Ref. extern
-RefSupplier=Ref. supplier
+RefSupplier=Ref. vendor
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
 Comment=Comment
@@ -493,7 +495,7 @@ Received=Received
 Paid=Paid
 Topic=Subject
 ByCompanies=By third parties
-ByUsers=By users
+ByUsers=By user
 Links=Links
 Link=Link
 Rejects=Rejects
@@ -619,9 +621,9 @@ BuildDoc=Build Doc
 Entity=Environment
 Entities=Entities
 CustomerPreview=Customer preview
-SupplierPreview=Supplier preview
+SupplierPreview=Vendor preview
 ShowCustomerPreview=Show customer preview
-ShowSupplierPreview=Show supplier preview
+ShowSupplierPreview=Show vendor preview
 RefCustomer=Ref. customer
 Currency=Currency
 InfoAdmin=Information for administrators
@@ -679,7 +681,7 @@ Color=Color
 Documents=Linked files
 Documents2=Documents
 UploadDisabled=Upload disabled
-MenuAccountancy=Accountancy
+MenuAccountancy=Accounting
 MenuECM=Documents
 MenuAWStats=AWStats
 MenuMembers=Members
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=Products or services
 SearchIntoProjects=Projects
 SearchIntoTasks=Tasks
 SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Interventions
 SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
@@ -941,3 +943,5 @@ Remote=Remote
 LocalAndRemote=Local and Remote
 KeyboardShortcut=Keyboard shortcut
 AssignedTo=Assigned to
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/ka_GE/margins.lang b/htdocs/langs/ka_GE/margins.lang
index 9f590ef3718..b9d52dcfdc6 100644
--- a/htdocs/langs/ka_GE/margins.lang
+++ b/htdocs/langs/ka_GE/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=As a service
 UseDiscountOnTotal=On subtotal
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
 MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best supplier price
+MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Cost price
 UnitCharges=Unit charges
 Charges=Charges
diff --git a/htdocs/langs/ka_GE/members.lang b/htdocs/langs/ka_GE/members.lang
index 7326f3b9950..b29477e346d 100644
--- a/htdocs/langs/ka_GE/members.lang
+++ b/htdocs/langs/ka_GE/members.lang
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
diff --git a/htdocs/langs/ka_GE/opensurvey.lang b/htdocs/langs/ka_GE/opensurvey.lang
index 87e6a74913a..76684955e56 100644
--- a/htdocs/langs/ka_GE/opensurvey.lang
+++ b/htdocs/langs/ka_GE/opensurvey.lang
@@ -58,3 +58,4 @@ MoreChoices=Enter more choices for the voters
 SurveyExpiredInfo=The poll has been closed or voting delay has expired.
 EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
 ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/ka_GE/orders.lang b/htdocs/langs/ka_GE/orders.lang
index 8de0279be44..1b36a25df66 100644
--- a/htdocs/langs/ka_GE/orders.lang
+++ b/htdocs/langs/ka_GE/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Customers orders area
-SuppliersOrdersArea=Suppliers orders area
+SuppliersOrdersArea=Purchase orders area
 OrderCard=Order card
 OrderId=Order Id
 Order=Order
@@ -13,18 +13,18 @@ OrderToProcess=Order to process
 NewOrder=New order
 ToOrder=Make order
 MakeOrder=Make order
-SupplierOrder=Supplier order
-SuppliersOrders=Suppliers orders
-SuppliersOrdersRunning=Current suppliers orders
-CustomerOrder=Customer order
-CustomersOrders=Customer orders
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=Customer Order
+CustomersOrders=Customer Orders
 CustomersOrdersRunning=Current customer orders
 CustomersOrdersAndOrdersLines=Customer orders and order lines
 OrdersDeliveredToBill=Customer orders delivered to bill
 OrdersToBill=Customer orders delivered
 OrdersInProcess=Customer orders in process
 OrdersToProcess=Customer orders to process
-SuppliersOrdersToProcess=Supplier orders to process
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=Canceled
 StatusOrderDraftShort=Draft
 StatusOrderValidatedShort=Validated
@@ -75,15 +75,15 @@ ShowOrder=Show order
 OrdersOpened=Orders to process
 NoDraftOrders=No draft orders
 NoOrder=No order
-NoSupplierOrder=No supplier order
+NoSupplierOrder=No purchase order
 LastOrders=Latest %s customer orders
 LastCustomerOrders=Latest %s customer orders
-LastSupplierOrders=Latest %s supplier orders
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=Latest %s modified orders
 AllOrders=All orders
 NbOfOrders=Number of orders
 OrdersStatistics=Order's statistics
-OrdersStatisticsSuppliers=Supplier order's statistics
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Number of orders by month
 AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
 ListOfOrders=List of orders
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</
 GenerateBill=Generate invoice
 ClassifyShipped=Classify delivered
 DraftOrders=Draft orders
-DraftSuppliersOrders=Draft suppliers orders
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=In process orders
 RefOrder=Ref. order
 RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for supplier
-RefOrderSupplierShort=Ref. order supplier
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=Send order by mail
 ActionsOnOrder=Events on order
 NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
 DispatchSupplierOrder=Receiving supplier order %s
 FirstApprovalAlreadyDone=First approval already done
 SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=Supplier order %s received %s
-SupplierOrderSubmitedInDolibarr=Supplier order %s submited
-SupplierOrderClassifiedBilled=Supplier order %s set billed
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Other orders
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
@@ -125,11 +125,11 @@ TypeContact_commande_internal_SHIPPING=Representative following-up shipping
 TypeContact_commande_external_BILLING=Customer invoice contact
 TypeContact_commande_external_SHIPPING=Customer shipping contact
 TypeContact_commande_external_CUSTOMER=Customer contact following-up order
-TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
-TypeContact_order_supplier_external_BILLING=Supplier invoice contact
-TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact
-TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
 Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
 Error_OrderNotChecked=No orders to invoice selected
diff --git a/htdocs/langs/ka_GE/other.lang b/htdocs/langs/ka_GE/other.lang
index 2afabe43b06..13907ca380e 100644
--- a/htdocs/langs/ka_GE/other.lang
+++ b/htdocs/langs/ka_GE/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=Files is too big
 PleaseBePatient=Please be patient...
 NewPassword=New password
 ResetPassword=Reset password
-RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
@@ -233,6 +233,8 @@ PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=Exports area
 AvailableFormats=Available formats
diff --git a/htdocs/langs/ka_GE/productbatch.lang b/htdocs/langs/ka_GE/productbatch.lang
index 1c2d22395ce..54270c4a23b 100644
--- a/htdocs/langs/ka_GE/productbatch.lang
+++ b/htdocs/langs/ka_GE/productbatch.lang
@@ -16,7 +16,7 @@ printEatby=Eat-by: %s
 printSellby=Sell-by: %s
 printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic increase/decrease stock mode is forced to shipping validate and manual dispatching for reception and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
 ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
diff --git a/htdocs/langs/ka_GE/products.lang b/htdocs/langs/ka_GE/products.lang
index b9ebefc91c9..72e717367fc 100644
--- a/htdocs/langs/ka_GE/products.lang
+++ b/htdocs/langs/ka_GE/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
 MinPrice=Min. selling price
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
 ContractStatusClosed=Closed
 ErrorProductAlreadyExists=A product with reference %s already exists.
@@ -155,7 +156,7 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Supplier prices
 SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
-CustomCode=Customs/Commodity/HS code
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
 Nature=Nature
 ShortLabel=Short label
diff --git a/htdocs/langs/ka_GE/projects.lang b/htdocs/langs/ka_GE/projects.lang
index 319a6e7e0e2..e04f28689a1 100644
--- a/htdocs/langs/ka_GE/projects.lang
+++ b/htdocs/langs/ka_GE/projects.lang
@@ -77,6 +77,7 @@ Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer orders associated with the project
@@ -226,4 +227,4 @@ AllowCommentOnProject=Allow user comments on projects
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/ka_GE/stocks.lang b/htdocs/langs/ka_GE/stocks.lang
index 7fbe2f6b82a..aaa7e21fc0d 100644
--- a/htdocs/langs/ka_GE/stocks.lang
+++ b/htdocs/langs/ka_GE/stocks.lang
@@ -203,3 +203,4 @@ RegulateStock=Regulate Stock
 ListInventory=List
 StockSupportServices=Stock management support services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/ka_GE/stripe.lang b/htdocs/langs/ka_GE/stripe.lang
index 9fb2fa45113..6fa072b4c9a 100644
--- a/htdocs/langs/ka_GE/stripe.lang
+++ b/htdocs/langs/ka_GE/stripe.lang
@@ -58,8 +58,8 @@ NameOnCard=Name on card
 CardNumber=Card Number
 ExpiryDate=Expiry Date
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/ka_GE/supplier_proposal.lang b/htdocs/langs/ka_GE/supplier_proposal.lang
index d5b51978920..ef2e7242e31 100644
--- a/htdocs/langs/ka_GE/supplier_proposal.lang
+++ b/htdocs/langs/ka_GE/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Supplier commercial proposals
-supplier_proposalDESC=Manage price requests to suppliers
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
 SupplierProposalNew=New price request
 CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
-SupplierProposalsDraft=Draft supplier proposals
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=Latest %s modified price requests
 RequestsOpened=Open price requests
-SupplierProposalArea=Supplier proposals area
-SupplierProposalShort=Supplier proposal
-SupplierProposals=Supplier proposals
-SupplierProposalsShort=Supplier proposals
+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=Supplier ref
+SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=Delivery date
 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>?
@@ -47,9 +47,9 @@ CommercialAsk=Price request
 DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposals=List of supplier proposal requests
-ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
-SupplierProposalsToClose=Supplier proposals to close
-SupplierProposalsToProcess=Supplier proposals to process
+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
diff --git a/htdocs/langs/ka_GE/suppliers.lang b/htdocs/langs/ka_GE/suppliers.lang
index f9e383e09af..d0cf540d3eb 100644
--- a/htdocs/langs/ka_GE/suppliers.lang
+++ b/htdocs/langs/ka_GE/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Suppliers
-SuppliersInvoice=Suppliers invoice
-ShowSupplierInvoice=Show Supplier Invoice
-NewSupplier=New supplier
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=History
-ListOfSuppliers=List of suppliers
-ShowSupplier=Show supplier
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=Order date
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
-SupplierPrices=Supplier prices
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
-NoRecordedSuppliers=No suppliers recorded
-SupplierPayment=Supplier payment
-SuppliersArea=Suppliers area
-RefSupplierShort=Ref. supplier
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=Availability
-ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
-ExportDataset_fournisseur_2=Supplier invoices and payments
-ExportDataset_fournisseur_3=Supplier orders and order lines
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=Approve this order
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
 ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
 ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
-AddSupplierOrder=Create supplier order
-AddSupplierInvoice=Create supplier invoice
-ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
-SentToSuppliers=Sent to suppliers
-ListOfSupplierOrders=List of supplier orders
-MenuOrdersSupplierToBill=Supplier orders to invoice
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-SupplierReputation=Supplier reputation
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
 AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=Supplier prices
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/ka_GE/website.lang b/htdocs/langs/ka_GE/website.lang
index 0350da13f8f..0f0673e3716 100644
--- a/htdocs/langs/ka_GE/website.lang
+++ b/htdocs/langs/ka_GE/website.lang
@@ -73,7 +73,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
diff --git a/htdocs/langs/ka_GE/workflow.lang b/htdocs/langs/ka_GE/workflow.lang
index a50bd91595b..783373ad66d 100644
--- a/htdocs/langs/ka_GE/workflow.lang
+++ b/htdocs/langs/ka_GE/workflow.lang
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source custome
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/km_KH/main.lang b/htdocs/langs/km_KH/main.lang
index 720da4a320f..655deaf652b 100644
--- a/htdocs/langs/km_KH/main.lang
+++ b/htdocs/langs/km_KH/main.lang
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is se
 Administrator=Administrator
 Undefined=Undefined
 PasswordForgotten=Password forgotten?
+NoAccount=No account?
 SeeAbove=See above
 HomeArea=Home area
 LastConnexion=Latest connection
@@ -231,7 +232,7 @@ Limit=Limit
 Limits=Limits
 Logout=Logout
 NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Connection
+Connection=Login
 Setup=Setup
 Alert=Alert
 MenuWarnings=Alerts
@@ -402,6 +403,7 @@ DefaultTaxRate=Default tax rate
 Average=Average
 Sum=Sum
 Delta=Delta
+RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
@@ -414,7 +416,7 @@ Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
 ExternalRef=Ref. extern
-RefSupplier=Ref. supplier
+RefSupplier=Ref. vendor
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
 Comment=Comment
@@ -493,7 +495,7 @@ Received=Received
 Paid=Paid
 Topic=Subject
 ByCompanies=By third parties
-ByUsers=By users
+ByUsers=By user
 Links=Links
 Link=Link
 Rejects=Rejects
@@ -619,9 +621,9 @@ BuildDoc=Build Doc
 Entity=Environment
 Entities=Entities
 CustomerPreview=Customer preview
-SupplierPreview=Supplier preview
+SupplierPreview=Vendor preview
 ShowCustomerPreview=Show customer preview
-ShowSupplierPreview=Show supplier preview
+ShowSupplierPreview=Show vendor preview
 RefCustomer=Ref. customer
 Currency=Currency
 InfoAdmin=Information for administrators
@@ -679,7 +681,7 @@ Color=Color
 Documents=Linked files
 Documents2=Documents
 UploadDisabled=Upload disabled
-MenuAccountancy=Accountancy
+MenuAccountancy=Accounting
 MenuECM=Documents
 MenuAWStats=AWStats
 MenuMembers=Members
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=Products or services
 SearchIntoProjects=Projects
 SearchIntoTasks=Tasks
 SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Interventions
 SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
@@ -941,3 +943,5 @@ Remote=Remote
 LocalAndRemote=Local and Remote
 KeyboardShortcut=Keyboard shortcut
 AssignedTo=Assigned to
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/kn_IN/accountancy.lang b/htdocs/langs/kn_IN/accountancy.lang
index c37db78c215..daa15928096 100644
--- a/htdocs/langs/kn_IN/accountancy.lang
+++ b/htdocs/langs/kn_IN/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Accounting
 ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
 ACCOUNTING_EXPORT_DATE=Date format for export file
 ACCOUNTING_EXPORT_PIECE=Export the number of piece
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Accounts with non zero values
 ListOfAccounts=List of accounts
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers 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
 
-AccountancyArea=Accountancy area
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
 AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
@@ -89,7 +90,7 @@ MenuProductsAccounts=Product accounts
 ProductsBinding=Products accounts
 Ventilation=Binding to accounts
 CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Supplier invoice binding
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
 ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
@@ -185,11 +187,12 @@ ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
-DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Group of account
 Pcgsubtype=Subgroup of account
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
 ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
 DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report 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 fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -293,4 +296,9 @@ Binded=Lines bound
 ToBind=Lines to bind
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/kn_IN/admin.lang b/htdocs/langs/kn_IN/admin.lang
index ca7248f27b0..728e23c9cf0 100644
--- a/htdocs/langs/kn_IN/admin.lang
+++ b/htdocs/langs/kn_IN/admin.lang
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems)
 MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=Method to use to send EMails
 MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
 MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
@@ -291,7 +292,7 @@ ModuleSetup=Module setup
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projects/Collaborative work
@@ -373,7 +374,8 @@ NoSmsEngine=No SMS sender manager available. SMS sender manager are not installe
 PDF=PDF
 PDFDesc=You can set each global options related to the PDF generation
 PDFAddressForging=Rules to forge address boxes
-HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=Hide products description on generated PDF
@@ -445,7 +447,8 @@ DisplayCompanyInfo=Display company address
 DisplayCompanyManagers=Display manager names
 DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party 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.
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Set this to 1 if you want to attach main document to emai
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -479,7 +485,7 @@ Module1Desc=Companies and contact management (customers, prospects...)
 Module2Name=Commercial
 Module2Desc=Commercial management
 Module10Name=Accounting
-Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching.
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=Proposals
 Module20Desc=Commercial proposal management
 Module22Name=Mass E-mailings
@@ -546,8 +552,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
-Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Payment of employee wages
 Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
@@ -561,14 +567,14 @@ Module700Name=Donations
 Module700Desc=Donation management
 Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Mantis integration
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
 Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
 Module2200Name=Dynamic Prices
@@ -576,7 +582,7 @@ Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Scheduled jobs
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API/Web services (SOAP server)
@@ -613,7 +619,7 @@ Module50100Desc=Point of sales module (POS).
 Module50200Name=Paypal
 Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Poll, Survey or Vote
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed memb
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=Other menu entries manage optional parameters.
 LogEvents=Security audit events
 Audit=Audit
@@ -1054,8 +1060,9 @@ LogEventDesc=You can enable here the logging for Dolibarr security events. Admin
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1188,11 +1195,11 @@ UserMailRequired=EMail required to create a new user
 HRMSetup=HRM module setup
 ##### Company setup #####
 CompanySetup=Companies module setup
-CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier)
-AccountCodeManager=Module for accounting code generation (customer or supplier)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
 NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
 ModelModules=Documents templates
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
@@ -1203,6 +1210,9 @@ MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
 TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=Free text on commercial proposals
 WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
 ##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=Order management setup
 OrdersNumberingModules=Orders numbering models
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe
 OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
 OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
 ##### Stock #####
-StockSetup=Warehouse module setup
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
 ##### Menu #####
 MenuDeleted=Menu deleted
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
 MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
 SuppliersSetup=Supplier module setup
-SuppliersCommandModel=Complete template of supplier order (logo...)
-SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","
 SalariesSetup=Setup of module salaries
 SortOrder=Sort order
 Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Install of external module from applic
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
-TextTitleColor=Color of page title
+TextTitleColor=Text color of Page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=Background color for Top menu
 TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
 ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-MailToMember=To send email from member page
-MailToUser=To send email from user page
-MailToProject= To send email from project page
+MailToSendProposal=Customer proposals
+MailToSendOrder=Customer orders
+MailToSendInvoice=Customer invoices
+MailToSendShipment=Shipments
+MailToSendIntervention=Interventions
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Contracts
+MailToThirdparty=ಮೂರನೇ ಪಕ್ಷಗಳು
+MailToMember=Members
+MailToUser=Users
+MailToProject=Projects page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1780,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/kn_IN/bills.lang b/htdocs/langs/kn_IN/bills.lang
index 9460c7ea43c..fa8bfd6c53b 100644
--- a/htdocs/langs/kn_IN/bills.lang
+++ b/htdocs/langs/kn_IN/bills.lang
@@ -109,7 +109,7 @@ CancelBill=Cancel an invoice
 SendRemindByMail=Send reminder by EMail
 DoPayment=Enter payment
 DoPaymentBack=Enter refund
-ConvertToReduc=Convert into future discount
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
@@ -120,7 +120,7 @@ BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
 BillStatusPaid=Paid
-BillStatusPaidBackOrConverted=Credit note refund or converted into discount
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Abandoned
 BillStatusValidated=Validated (needs to be paid)
@@ -296,10 +296,10 @@ DiscountType=Discount type
 NoteReason=Note/Reason
 ReasonDiscount=Reason
 DiscountOfferedBy=Granted by
-DiscountStillRemaining=Discounts available
-DiscountAlreadyCounted=Discounts already consumed
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+SupplierDiscounts=Vendors discounts
 BillAddress=Bill address
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Every %s days
 FrequencyPer_m=Every %s months
 FrequencyPer_y=Every %s years
@@ -505,9 +511,14 @@ SituationAmount=Situation invoice amount(net)
 SituationDeduction=Situation subtraction
 ModifyAllLines=Modify all lines
 CreateNextSituationInvoice=Create next situation
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=S
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
 NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
@@ -532,3 +543,4 @@ AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/kn_IN/categories.lang b/htdocs/langs/kn_IN/categories.lang
index 41e5f4e4c13..c0c8d4c0cef 100644
--- a/htdocs/langs/kn_IN/categories.lang
+++ b/htdocs/langs/kn_IN/categories.lang
@@ -16,7 +16,7 @@ MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
-SubCats=Subcategories
+SubCats=Sub-categories
 CatList=List of tags/categories
 NewCategory=New tag/category
 ModifCat=Modify tag/category
@@ -85,3 +85,4 @@ CategorieRecursivHelp=If activated, product will also linked to parent category
 AddProductServiceIntoCategory=Add the following product/service
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
+ChooseCategory=Choose category
diff --git a/htdocs/langs/kn_IN/commercial.lang b/htdocs/langs/kn_IN/commercial.lang
index bb229d39948..f60ece73caa 100644
--- a/htdocs/langs/kn_IN/commercial.lang
+++ b/htdocs/langs/kn_IN/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=Close
 ActionAC_EMAILING=Send mass email
 ActionAC_COM=Send customer order by mail
 ActionAC_SHIP=Send shipping by mail
-ActionAC_SUP_ORD=Send supplier order by mail
-ActionAC_SUP_INV=Send supplier invoice by mail
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=ಇತರ
 ActionAC_OTH_AUTO=Automatically inserted events
 ActionAC_MANUAL=Manually inserted events
diff --git a/htdocs/langs/kn_IN/companies.lang b/htdocs/langs/kn_IN/companies.lang
index 8e27a3bad29..1f9681254aa 100644
--- a/htdocs/langs/kn_IN/companies.lang
+++ b/htdocs/langs/kn_IN/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Are you sure you want to delete this contact and all inheri
 MenuNewThirdParty=ಹೊಸ ತೃತೀಯ ಪಕ್ಷ
 MenuNewCustomer=ಹೊಸ ಗ್ರಾಹಕ
 MenuNewProspect=ಹೊಸ ನಿರೀಕ್ಷಿತರು
-MenuNewSupplier=ಹೊಸ ಪೂರೈಕೆದಾರ
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=ಹೊಸ ಖಾಸಗಿ ವ್ಯಕ್ತಿ
-NewCompany=ಹೊಸ ಕಂಪನಿ (ನಿರೀಕ್ಷಿತ, ಗ್ರಾಹಕ, ಪೂರೈಕೆದಾರ)
-NewThirdParty=ಹೊಸ ತೃತೀಯ (ನಿರೀಕ್ಷಿತ, ಗ್ರಾಹಕ, ಪೂರೈಕೆದಾರ)
-CreateDolibarrThirdPartySupplier=Create a third party (supplier)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=Create third party
 CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Prospection ಪ್ರದೇಶ
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=ನಿರೀಕ್ಷಿತರು
 ThirdPartyCustomers=ಗ್ರಾಹಕರು
 ThirdPartyCustomersStats=ಗ್ರಾಹಕರು
 ThirdPartyCustomersWithIdProf12=%s ಅಥವಾ %s ಇರುವ ಗ್ರಾಹಕರು
-ThirdPartySuppliers=ಪೂರೈಕೆದಾರರು
+ThirdPartySuppliers=Vendors
 ThirdPartyType=ತೃತೀಯ ಮಾದರಿ
 Individual=ಖಾಸಗಿ ವ್ಯಕ್ತಿ
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
@@ -77,11 +77,11 @@ Web=ವೆಬ್
 Poste= ಸ್ಥಾನ
 DefaultLang=ಪೂರ್ವನಿಯೋಜಿತವಾದ ಭಾಷೆ
 VATIsUsed=Sales tax is used
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
-ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Proposals
 OverAllOrders=Orders
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=RE Type
 TypeLocaltax2ES=IRPF Type
 WrongCustomerCode=ಗ್ರಾಹಕ ಕೋಡ್ ಸರಿಯಾಗಿದ್ದಂತಿಲ್ಲ
-WrongSupplierCode=ಸರಬರಾಜುದಾರ ಕೋಡ್ ಸರಿಯಾಗಿದ್ದಂತಿಲ್ಲ
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=ಗ್ರಾಹಕ ಕೋಡ್ ಮಾದರಿ
-SupplierCodeModel=ಸರಬರಾಜುದಾರ ಕೋಡ್ ಮಾದರಿ
+SupplierCodeModel=Vendor code model
 Gencod=ಬಾರ್ ಕೋಡ್
 ##### Professional ID #####
 ProfId1Short=ವೃತ್ತಿಪರ ಐಡಿ 1
@@ -267,7 +267,7 @@ Prospect=ನಿರೀಕ್ಷಿತ
 CustomerCard=ಗ್ರಾಹಕ ಕಾರ್ಡ್
 Customer=ಗ್ರಾಹಕ
 CustomerRelativeDiscount=ಸಾಪೇಕ್ಷ ಗ್ರಾಹಕ ರಿಯಾಯಿತಿ
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=ಸಾಪೇಕ್ಷ ರಿಯಾಯಿತಿ
 CustomerAbsoluteDiscountShort=ಪರಮ ರಿಯಾಯಿತಿ
 CompanyHasRelativeDiscount=ಈ ಗ್ರಾಹಕರಿಗೆ <b>%s%%</b> ರಿಯಾಯಿತಿ ಪೂರ್ವನಿಗದಿಯಾಗಿದೆ.
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this suppl
 CompanyHasNoAbsoluteDiscount=ಈ ಗ್ರಾಹಕ ಯಾವುದೇ ರಿಯಾಯಿತಿ ಕ್ರೆಡಿಟ್ ಹೊಂದಿಲ್ಲ
 CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
 CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=ಯಾವುದೂ ಇಲ್ಲ
 Supplier=ಪೂರೈಕೆದಾರ
 AddContact=Create contact
@@ -304,13 +304,13 @@ DeleteACompany=ಸಂಸ್ಥೆಯೊಂದನ್ನು ತೆಗೆದುಹ
 PersonalInformations=ವೈಯಕ್ತಿಕ ದತ್ತಾಂಶ
 AccountancyCode=Accounting account
 CustomerCode=ಗ್ರಾಹಕ ಕೋಡ್
-SupplierCode=ಪೂರೈಕೆದಾರರ ಕೋಡ್
+SupplierCode=Vendor code
 CustomerCodeShort=ಗ್ರಾಹಕ ಕೋಡ್
-SupplierCodeShort=ಪೂರೈಕೆದಾರರ ಕೋಡ್
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=ಗ್ರಾಹಕ ಕೋಡ್, ಎಲ್ಲಾ ಗ್ರಾಹಕರಿಗೂ ಅನನ್ಯ
-SupplierCodeDesc=ಸರಬರಾಜುದಾರ ಕೋಡ್, ಎಲ್ಲಾ ಪೂರೈಕೆದಾರರಿಗೂ ಅನನ್ಯ
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=ತೃತೀಯ ಪಾರ್ಟಿಯು ಗ್ರಾಹಕ ಅಥವಾ ನಿರೀಕ್ಷಿತರಾಗಿದ್ದ ವೇಳೆ ಅಗತ್ಯ
-RequiredIfSupplier=ತೃತೀಯ ಪಾರ್ಟಿಯು ಸರಬರಾಜುದಾರರಾದಲ್ಲಿ ಅಗತ್ಯ
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=ವಾಯಿದೆ ನಿಯಂತ್ರಿತ ಘಟಕ
 ThisIsModuleRules=ಈ ಘಟಕಕ್ಕೆ ಅನ್ವಯವಾಗುವ ನೇಮಗಳು
 ProspectToContact='ನಿರೀಕ್ಷಿತ'ದಿಂದ 'ಸಂಪರ್ಕ'ಕ್ಕೆ
@@ -338,7 +338,7 @@ MyContacts=ನನ್ನ ಸಂಪರ್ಕಗಳು
 Capital=ರಾಜಧಾನಿ
 CapitalOf=%s ಕ್ಯಾಪಿಟಲ್
 EditCompany=ಸಂಸ್ಥೆಯನ್ನು ತಿದ್ದಿ
-ThisUserIsNot=ಈ ಬಳಕೆದಾರ ಒಬ್ಬ ನಿರೀಕ್ಷಿತ, ಗ್ರಾಹಕ ಅಥವಾ ಪೂರೈಕೆದಾರ ಅಲ್ಲ
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=ಪರಿಶೀಲಿಸಿ
 VATIntraCheckDesc=The link <b>%s</b> allows to ask the european VAT checker service. An external internet access from server is required for this service to work.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -396,7 +396,7 @@ ImportDataset_company_4=Third parties/Sales representatives (Assign sales repres
 PriceLevel=ಬೆಲೆ ಮಟ್ಟ
 DeliveryAddress=ತಲುಪಿಸುವ ವಿಳಾಸ
 AddAddress=ವಿಳಾಸ ಸೇರಿಸಿ
-SupplierCategory=ಸರಬರಾಜುದಾರ ವರ್ಗ
+SupplierCategory=Vendor category
 JuridicalStatus200=Independent
 DeleteFile=ಫೈಲ್ ತೆಗೆಯಿರಿ
 ConfirmDeleteFile=ನೀವು ಈ ಫೈಲ್ಅನ್ನು ಖಂಡಿತವಾಗಿಯೂ ಶಾಶ್ವವವಾಗಿ ತೆಗೆದುಹಾಕಲು ಬಯಸುತ್ತೀರಾ?
@@ -406,7 +406,7 @@ FiscalYearInformation=ಹಣಕಾಸಿನ ವರ್ಷದ ಮಾಹಿತಿ
 FiscalMonthStart=ಆರ್ಥಿಕ ವರ್ಷಾರಂಭದ ತಿಂಗಳು
 YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
 YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
-ListSuppliersShort=ಪೂರೈಕೆದಾರರ ಪಟ್ಟಿ
+ListSuppliersShort=List of vendors
 ListProspectsShort=ನಿರೀಕ್ಷಿತರ ಪಟ್ಟಿ
 ListCustomersShort=ಗ್ರಾಹಕರ ಪಟ್ಟಿ
 ThirdPartiesArea=Third parties and contact area
@@ -420,7 +420,7 @@ CurrentOutstandingBill=ಪ್ರಸ್ತುತ ಬಾಕಿ ಉಳಿದಿರ
 OutstandingBill=ಗರಿಷ್ಟ ಬಾಕಿ ಉಳಿದಿರುವ ಬಿಲ್ ಮೊತ್ತ
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=ಫಾರ್ಮ್ಯಾಟ್% syymm-NNNN ಗ್ರಾಹಕ ಕೋಡ್ ಮತ್ತು% syymm-NNNN ವವ ವರ್ಷ ಅಲ್ಲಿ ಪೂರೈಕೆದಾರ ಕೋಡ್ ಫಾರ್ ಜೊತೆ ನ್ಯೂಮರೋ ಹಿಂತಿರುಗಿ, ಮಿಮೀ ತಿಂಗಳು ಮತ್ತು NNNN ಯಾವುದೇ ಬ್ರೇಕ್ ಮತ್ತು 0 ಯಾವುದೇ ಲಾಭ ಒಂದು ಅನುಕ್ರಮದ.
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=ಕೋಡ್ ಉಚಿತ. ಈ ಕೋಡ್ ಯಾವುದೇ ಸಮಯದಲ್ಲಿ ಮಾರ್ಪಡಿಸಬಹುದಾಗಿದೆ.
 ManagingDirectors=ಮ್ಯಾನೇಜರ್ (ಗಳು) ಹೆಸರು (ಸಿಇಒ, ನಿರ್ದೇಶಕ, ಅಧ್ಯಕ್ಷ ...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/kn_IN/compta.lang b/htdocs/langs/kn_IN/compta.lang
index cda96a546b8..d2cfb714900 100644
--- a/htdocs/langs/kn_IN/compta.lang
+++ b/htdocs/langs/kn_IN/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=Net paid
 VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
-VATSummary=Tax Balance
+VATSummary=Tax monthly
+VATBalance=Tax Balance
 VATPaid=Tax paid
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=Accountancy/Treasury area
 NewPayment=New payment
 Payments=Payments
 PaymentCustomerInvoice=Customer invoice payment
-PaymentSupplierInvoice=Supplier invoice payment
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
-ListOfSupplierPayments=List of supplier payments
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -110,7 +111,7 @@ ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
 CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
 SupplierAccountancyCodeShort=Sup. account. code
 AccountNumber=Account number
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
 Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
-ByProductsAndServices=By products and services
+ByProductsAndServices=By product and service
 RefExt=External ref
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
 LinkedOrder=Link to order
@@ -215,7 +218,8 @@ Mode1=Method 1
 Mode2=Method 2
 CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
 CalculationRuleDescSupplier=According to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
@@ -242,3 +246,10 @@ FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/kn_IN/dict.lang b/htdocs/langs/kn_IN/dict.lang
index ca0c61a9cbc..61a7237f472 100644
--- a/htdocs/langs/kn_IN/dict.lang
+++ b/htdocs/langs/kn_IN/dict.lang
@@ -5,7 +5,8 @@ CountryIT=Italy
 CountryES=Spain
 CountryDE=Germany
 CountryCH=Switzerland
-CountryGB=Great Britain
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=United Kingdom
 CountryUK=United Kingdom
 CountryIE=Ireland
 CountryCN=China
diff --git a/htdocs/langs/kn_IN/ecm.lang b/htdocs/langs/kn_IN/ecm.lang
index 65e9b17bdb2..5200fa30b1d 100644
--- a/htdocs/langs/kn_IN/ecm.lang
+++ b/htdocs/langs/kn_IN/ecm.lang
@@ -39,9 +39,10 @@ ShowECMSection=Show directory
 DeleteSection=Remove directory
 ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
 ECMDirectoryForFiles=Relative directory for files
-CannotRemoveDirectoryContainsFiles=Removed not possible because it contains some files
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=File manager
-ECMSelectASection=Select a directory on left tree...
+ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
diff --git a/htdocs/langs/kn_IN/errors.lang b/htdocs/langs/kn_IN/errors.lang
index ec036b28bc5..0ca7488b8cb 100644
--- a/htdocs/langs/kn_IN/errors.lang
+++ b/htdocs/langs/kn_IN/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Bar code required
 ErrorCustomerCodeAlreadyUsed=Customer code already used
 ErrorBarCodeAlreadyUsed=Bar code already used
 ErrorPrefixRequired=Prefix required
-ErrorBadSupplierCodeSyntax=Bad syntax for supplier code
-ErrorSupplierCodeRequired=Supplier code required
-ErrorSupplierCodeAlreadyUsed=Supplier code already used
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Bad parameters
 ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
 ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
@@ -87,7 +87,7 @@ ErrorsOnXLines=Errors on <b>%s</b> source record(s)
 ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
 ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s"
 ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
-ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Error on mask
 ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
-ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
diff --git a/htdocs/langs/kn_IN/install.lang b/htdocs/langs/kn_IN/install.lang
index e602c54640c..587d4f83da6 100644
--- a/htdocs/langs/kn_IN/install.lang
+++ b/htdocs/langs/kn_IN/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not
 ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
 ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be granted to be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reload all information from configuration file.
 PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
 WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called <b>install.lock</b> into Dolibarr document directory, in order to avoid malicious use of it.
 FunctionNotAvailableInThisPHP=Not available on this PHP
 ChoosedMigrateScript=Choose migration script
-DataMigration=Data migration
-DatabaseMigration=Structure database migration
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script processing
 ChooseYourSetupMode=Choose your setup mode and click "Start"...
 FreshInstall=Fresh install
@@ -146,7 +147,7 @@ NothingToDo=Nothing to do
 # upgrade
 MigrationFixData=Fix for denormalized data
 MigrationOrder=Data migration for customer's orders
-MigrationSupplierOrder=Data migration for supplier's orders
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Data migration for commercial proposals
 MigrationInvoice=Data migration for customer's invoices
 MigrationContract=Data migration for contracts
@@ -196,6 +197,8 @@ MigrationEvents=Migration of events to add event owner into assignement table
 MigrationEventsContact=Migration of events to add event contact into assignement table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 ShowNotAvailableOptions=Show not available options
diff --git a/htdocs/langs/kn_IN/ldap.lang b/htdocs/langs/kn_IN/ldap.lang
index d6360f3e540..abe11602147 100644
--- a/htdocs/langs/kn_IN/ldap.lang
+++ b/htdocs/langs/kn_IN/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Password for domain
 YouMustChangePassNextLogon=Password for user <b>%s</b> on the domain <b>%s</b> must be changed.
 UserMustChangePassNextLogon=User must change password on the domain %s
 LDAPInformationsForThisContact=Information in LDAP database for this contact
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Member type synchronized
 ContactSynchronized=Contact synchronized
 ForceSynchronize=Force synchronizing Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Failed to read LDAP database. Check LDAP module setup and database accessibility.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/kn_IN/loan.lang b/htdocs/langs/kn_IN/loan.lang
index d79f8bc5a34..c273e2d0126 100644
--- a/htdocs/langs/kn_IN/loan.lang
+++ b/htdocs/langs/kn_IN/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=ರಾಜಧಾನಿ
 Insurance=Insurance
 Interest=Interest
 Nbterms=Number of terms
+Term=Term
 LoanAccountancyCapitalCode=Accounting account capital
 LoanAccountancyInsuranceCode=Accounting account insurance
 LoanAccountancyInterestCode=Accounting account interest
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=Confirm deleting this loan
 LoanDeleted=Loan Deleted Successfully
 ConfirmPayLoan=Confirm classify paid this loan
 LoanPaid=Loan Paid
-# Calc
-LoanCalc=Bank Loans Calculator
-PurchaseFinanceInfo=Purchase & Financing Information
-SalePriceOfAsset=Sale Price of Asset
-PercentageDown=Percentage Down
-LengthOfMortgage=Duration of loan
-AnnualInterestRate=Annual Interest Rate
-ExplainCalculations=Explain Calculations
-ShowMeCalculationsAndAmortization=Show me the calculations and amortization
-MortgagePaymentInformation=Mortgage Payment Information
-DownPayment=Down Payment
-DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
-InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
-MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
-MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
-MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
-MonthlyPaymentDesc=The montly payment is figured out using the following formula
-AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
-AmountFinanced=Amount Financed
-AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
-Totalsforyear=Totals for year
-MonthlyPayment=Monthly Payment
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
-GoToInterest=%s will go towards INTEREST
-GoToPrincipal=%s will go towards PRINCIPAL
-YouWillSpend=You will spend %s in year %s
 ListLoanAssociatedProject=List of loan associated with the project
 AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Interest
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-FinancialCommitment=Financial commitment
 CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/langs/kn_IN/mails.lang b/htdocs/langs/kn_IN/mails.lang
index cedcd01066b..2313910de93 100644
--- a/htdocs/langs/kn_IN/mails.lang
+++ b/htdocs/langs/kn_IN/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Sender
 MailErrorsTo=Errors to
 MailReply=Reply to
 MailTo=Receiver(s)
+MailToUsers=To user(s)
 MailCC=Copy to
+MailToCCUsers=Copy to users(s)
 MailCCC=Cached copy to
 MailTopic=EMail topic
 MailText=Message
@@ -164,4 +166,4 @@ InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/kn_IN/main.lang b/htdocs/langs/kn_IN/main.lang
index 574c4b066b5..596fa31623a 100644
--- a/htdocs/langs/kn_IN/main.lang
+++ b/htdocs/langs/kn_IN/main.lang
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is se
 Administrator=Administrator
 Undefined=Undefined
 PasswordForgotten=Password forgotten?
+NoAccount=No account?
 SeeAbove=See above
 HomeArea=Home area
 LastConnexion=Latest connection
@@ -231,7 +232,7 @@ Limit=Limit
 Limits=Limits
 Logout=Logout
 NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Connection
+Connection=Login
 Setup=Setup
 Alert=Alert
 MenuWarnings=Alerts
@@ -402,6 +403,7 @@ DefaultTaxRate=Default tax rate
 Average=Average
 Sum=Sum
 Delta=Delta
+RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
@@ -414,7 +416,7 @@ Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
 ExternalRef=Ref. extern
-RefSupplier=Ref. supplier
+RefSupplier=Ref. vendor
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
 Comment=Comment
@@ -493,7 +495,7 @@ Received=Received
 Paid=Paid
 Topic=Subject
 ByCompanies=By third parties
-ByUsers=By users
+ByUsers=By user
 Links=Links
 Link=Link
 Rejects=Rejects
@@ -619,9 +621,9 @@ BuildDoc=Build Doc
 Entity=Environment
 Entities=Entities
 CustomerPreview=Customer preview
-SupplierPreview=Supplier preview
+SupplierPreview=Vendor preview
 ShowCustomerPreview=Show customer preview
-ShowSupplierPreview=Show supplier preview
+ShowSupplierPreview=Show vendor preview
 RefCustomer=Ref. customer
 Currency=Currency
 InfoAdmin=Information for administrators
@@ -679,7 +681,7 @@ Color=Color
 Documents=Linked files
 Documents2=Documents
 UploadDisabled=Upload disabled
-MenuAccountancy=Accountancy
+MenuAccountancy=Accounting
 MenuECM=Documents
 MenuAWStats=AWStats
 MenuMembers=Members
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=Products or services
 SearchIntoProjects=Projects
 SearchIntoTasks=Tasks
 SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Interventions
 SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
@@ -941,3 +943,5 @@ Remote=Remote
 LocalAndRemote=Local and Remote
 KeyboardShortcut=Keyboard shortcut
 AssignedTo=Assigned to
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/kn_IN/margins.lang b/htdocs/langs/kn_IN/margins.lang
index 9f590ef3718..b9d52dcfdc6 100644
--- a/htdocs/langs/kn_IN/margins.lang
+++ b/htdocs/langs/kn_IN/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=As a service
 UseDiscountOnTotal=On subtotal
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
 MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best supplier price
+MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Cost price
 UnitCharges=Unit charges
 Charges=Charges
diff --git a/htdocs/langs/kn_IN/members.lang b/htdocs/langs/kn_IN/members.lang
index 7326f3b9950..b29477e346d 100644
--- a/htdocs/langs/kn_IN/members.lang
+++ b/htdocs/langs/kn_IN/members.lang
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
diff --git a/htdocs/langs/kn_IN/opensurvey.lang b/htdocs/langs/kn_IN/opensurvey.lang
index 87e6a74913a..76684955e56 100644
--- a/htdocs/langs/kn_IN/opensurvey.lang
+++ b/htdocs/langs/kn_IN/opensurvey.lang
@@ -58,3 +58,4 @@ MoreChoices=Enter more choices for the voters
 SurveyExpiredInfo=The poll has been closed or voting delay has expired.
 EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
 ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/kn_IN/orders.lang b/htdocs/langs/kn_IN/orders.lang
index ee7a979bea4..fd7fd99ce64 100644
--- a/htdocs/langs/kn_IN/orders.lang
+++ b/htdocs/langs/kn_IN/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Customers orders area
-SuppliersOrdersArea=Suppliers orders area
+SuppliersOrdersArea=Purchase orders area
 OrderCard=Order card
 OrderId=Order Id
 Order=Order
@@ -13,18 +13,18 @@ OrderToProcess=Order to process
 NewOrder=New order
 ToOrder=Make order
 MakeOrder=Make order
-SupplierOrder=Supplier order
-SuppliersOrders=Suppliers orders
-SuppliersOrdersRunning=Current suppliers orders
-CustomerOrder=Customer order
-CustomersOrders=Customer orders
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=Customer Order
+CustomersOrders=Customer Orders
 CustomersOrdersRunning=Current customer orders
 CustomersOrdersAndOrdersLines=Customer orders and order lines
 OrdersDeliveredToBill=Customer orders delivered to bill
 OrdersToBill=Customer orders delivered
 OrdersInProcess=Customer orders in process
 OrdersToProcess=Customer orders to process
-SuppliersOrdersToProcess=Supplier orders to process
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=Canceled
 StatusOrderDraftShort=Draft
 StatusOrderValidatedShort=Validated
@@ -75,15 +75,15 @@ ShowOrder=Show order
 OrdersOpened=Orders to process
 NoDraftOrders=No draft orders
 NoOrder=No order
-NoSupplierOrder=No supplier order
+NoSupplierOrder=No purchase order
 LastOrders=Latest %s customer orders
 LastCustomerOrders=Latest %s customer orders
-LastSupplierOrders=Latest %s supplier orders
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=Latest %s modified orders
 AllOrders=All orders
 NbOfOrders=Number of orders
 OrdersStatistics=Order's statistics
-OrdersStatisticsSuppliers=Supplier order's statistics
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Number of orders by month
 AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
 ListOfOrders=List of orders
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</
 GenerateBill=Generate invoice
 ClassifyShipped=Classify delivered
 DraftOrders=Draft orders
-DraftSuppliersOrders=Draft suppliers orders
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=In process orders
 RefOrder=Ref. order
 RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for supplier
-RefOrderSupplierShort=Ref. order supplier
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=Send order by mail
 ActionsOnOrder=Events on order
 NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
 DispatchSupplierOrder=Receiving supplier order %s
 FirstApprovalAlreadyDone=First approval already done
 SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=Supplier order %s received %s
-SupplierOrderSubmitedInDolibarr=Supplier order %s submited
-SupplierOrderClassifiedBilled=Supplier order %s set billed
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Other orders
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
@@ -125,11 +125,11 @@ TypeContact_commande_internal_SHIPPING=Representative following-up shipping
 TypeContact_commande_external_BILLING=Customer invoice contact
 TypeContact_commande_external_SHIPPING=Customer shipping contact
 TypeContact_commande_external_CUSTOMER=Customer contact following-up order
-TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
-TypeContact_order_supplier_external_BILLING=Supplier invoice contact
-TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact
-TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
 Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
 Error_OrderNotChecked=No orders to invoice selected
diff --git a/htdocs/langs/kn_IN/other.lang b/htdocs/langs/kn_IN/other.lang
index 01538780d0b..dd2c8763460 100644
--- a/htdocs/langs/kn_IN/other.lang
+++ b/htdocs/langs/kn_IN/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=Files is too big
 PleaseBePatient=Please be patient...
 NewPassword=New password
 ResetPassword=Reset password
-RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
@@ -233,6 +233,8 @@ PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=Exports area
 AvailableFormats=Available formats
diff --git a/htdocs/langs/kn_IN/productbatch.lang b/htdocs/langs/kn_IN/productbatch.lang
index 1c2d22395ce..54270c4a23b 100644
--- a/htdocs/langs/kn_IN/productbatch.lang
+++ b/htdocs/langs/kn_IN/productbatch.lang
@@ -16,7 +16,7 @@ printEatby=Eat-by: %s
 printSellby=Sell-by: %s
 printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic increase/decrease stock mode is forced to shipping validate and manual dispatching for reception and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
 ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
diff --git a/htdocs/langs/kn_IN/products.lang b/htdocs/langs/kn_IN/products.lang
index 1aeabb326e1..45fa06ba48e 100644
--- a/htdocs/langs/kn_IN/products.lang
+++ b/htdocs/langs/kn_IN/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
 MinPrice=Min. selling price
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
 ContractStatusClosed=ಮುಚ್ಚಲಾಗಿದೆ
 ErrorProductAlreadyExists=A product with reference %s already exists.
@@ -155,7 +156,7 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Supplier prices
 SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
-CustomCode=Customs/Commodity/HS code
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
 Nature=Nature
 ShortLabel=Short label
diff --git a/htdocs/langs/kn_IN/projects.lang b/htdocs/langs/kn_IN/projects.lang
index 319a6e7e0e2..e04f28689a1 100644
--- a/htdocs/langs/kn_IN/projects.lang
+++ b/htdocs/langs/kn_IN/projects.lang
@@ -77,6 +77,7 @@ Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer orders associated with the project
@@ -226,4 +227,4 @@ AllowCommentOnProject=Allow user comments on projects
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/kn_IN/stocks.lang b/htdocs/langs/kn_IN/stocks.lang
index 7fbe2f6b82a..aaa7e21fc0d 100644
--- a/htdocs/langs/kn_IN/stocks.lang
+++ b/htdocs/langs/kn_IN/stocks.lang
@@ -203,3 +203,4 @@ RegulateStock=Regulate Stock
 ListInventory=List
 StockSupportServices=Stock management support services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/kn_IN/stripe.lang b/htdocs/langs/kn_IN/stripe.lang
index 9fb2fa45113..6fa072b4c9a 100644
--- a/htdocs/langs/kn_IN/stripe.lang
+++ b/htdocs/langs/kn_IN/stripe.lang
@@ -58,8 +58,8 @@ NameOnCard=Name on card
 CardNumber=Card Number
 ExpiryDate=Expiry Date
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/kn_IN/supplier_proposal.lang b/htdocs/langs/kn_IN/supplier_proposal.lang
index b79ccd5f74a..9336de54970 100644
--- a/htdocs/langs/kn_IN/supplier_proposal.lang
+++ b/htdocs/langs/kn_IN/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Supplier commercial proposals
-supplier_proposalDESC=Manage price requests to suppliers
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
 SupplierProposalNew=New price request
 CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
-SupplierProposalsDraft=Draft supplier proposals
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=Latest %s modified price requests
 RequestsOpened=Open price requests
-SupplierProposalArea=Supplier proposals area
-SupplierProposalShort=Supplier proposal
-SupplierProposals=Supplier proposals
-SupplierProposalsShort=Supplier proposals
+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=Supplier ref
+SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=Delivery date
 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>?
@@ -47,9 +47,9 @@ CommercialAsk=Price request
 DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposals=List of supplier proposal requests
-ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
-SupplierProposalsToClose=Supplier proposals to close
-SupplierProposalsToProcess=Supplier proposals to process
+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
diff --git a/htdocs/langs/kn_IN/suppliers.lang b/htdocs/langs/kn_IN/suppliers.lang
index 533ede6a104..d0cf540d3eb 100644
--- a/htdocs/langs/kn_IN/suppliers.lang
+++ b/htdocs/langs/kn_IN/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=ಪೂರೈಕೆದಾರರು
-SuppliersInvoice=Suppliers invoice
-ShowSupplierInvoice=Show Supplier Invoice
-NewSupplier=ಹೊಸ ಪೂರೈಕೆದಾರ
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=History
-ListOfSuppliers=ಪೂರೈಕೆದಾರರ ಪಟ್ಟಿ
-ShowSupplier=Show supplier
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=Order date
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
-SupplierPrices=Supplier prices
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
-NoRecordedSuppliers=No suppliers recorded
-SupplierPayment=Supplier payment
-SuppliersArea=Suppliers area
-RefSupplierShort=Ref. supplier
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=Availability
-ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
-ExportDataset_fournisseur_2=Supplier invoices and payments
-ExportDataset_fournisseur_3=Supplier orders and order lines
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=Approve this order
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
 ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
 ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
-AddSupplierOrder=Create supplier order
-AddSupplierInvoice=Create supplier invoice
-ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
-SentToSuppliers=Sent to suppliers
-ListOfSupplierOrders=List of supplier orders
-MenuOrdersSupplierToBill=Supplier orders to invoice
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-SupplierReputation=Supplier reputation
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
 AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=Supplier prices
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/kn_IN/website.lang b/htdocs/langs/kn_IN/website.lang
index 0350da13f8f..0f0673e3716 100644
--- a/htdocs/langs/kn_IN/website.lang
+++ b/htdocs/langs/kn_IN/website.lang
@@ -73,7 +73,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
diff --git a/htdocs/langs/kn_IN/workflow.lang b/htdocs/langs/kn_IN/workflow.lang
index a50bd91595b..783373ad66d 100644
--- a/htdocs/langs/kn_IN/workflow.lang
+++ b/htdocs/langs/kn_IN/workflow.lang
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source custome
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/ko_KR/accountancy.lang b/htdocs/langs/ko_KR/accountancy.lang
index c79f17992f1..47fb9098063 100644
--- a/htdocs/langs/ko_KR/accountancy.lang
+++ b/htdocs/langs/ko_KR/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Accounting
 ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
 ACCOUNTING_EXPORT_DATE=Date format for export file
 ACCOUNTING_EXPORT_PIECE=Export the number of piece
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Accounts with non zero values
 ListOfAccounts=List of accounts
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers 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
 
-AccountancyArea=Accountancy area
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
 AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
@@ -89,7 +90,7 @@ MenuProductsAccounts=Product accounts
 ProductsBinding=Products accounts
 Ventilation=Binding to accounts
 CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Supplier invoice binding
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=구매분개장
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
 ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
@@ -185,11 +187,12 @@ ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
-DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Group of account
 Pcgsubtype=Subgroup of account
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
 ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
 DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report 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 fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -293,4 +296,9 @@ Binded=Lines bound
 ToBind=Lines to bind
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang
index c47c10c1202..b8b9acb7e69 100644
--- a/htdocs/langs/ko_KR/admin.lang
+++ b/htdocs/langs/ko_KR/admin.lang
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems)
 MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=Method to use to send EMails
 MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
 MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
@@ -291,7 +292,7 @@ ModuleSetup=Module setup
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projects/Collaborative work
@@ -373,7 +374,8 @@ NoSmsEngine=No SMS sender manager available. SMS sender manager are not installe
 PDF=PDF
 PDFDesc=You can set each global options related to the PDF generation
 PDFAddressForging=Rules to forge address boxes
-HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=Hide products description on generated PDF
@@ -445,7 +447,8 @@ DisplayCompanyInfo=Display company address
 DisplayCompanyManagers=Display manager names
 DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party 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.
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Set this to 1 if you want to attach main document to emai
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -479,7 +485,7 @@ Module1Desc=Companies and contact management (customers, prospects...)
 Module2Name=상업용
 Module2Desc=Commercial management
 Module10Name=Accounting
-Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching.
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=제안
 Module20Desc=Commercial proposal management
 Module22Name=Mass E-mailings
@@ -546,8 +552,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
-Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Payment of employee wages
 Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
@@ -561,14 +567,14 @@ Module700Name=Donations
 Module700Desc=Donation management
 Module770Name=경비 보고서
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Mantis integration
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
 Module1780Name=분류/범주
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
 Module2200Name=Dynamic Prices
@@ -576,7 +582,7 @@ Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Scheduled jobs
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API/Web services (SOAP server)
@@ -613,7 +619,7 @@ Module50100Desc=Point of sales module (POS).
 Module50200Name=Paypal
 Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Poll, Survey or Vote
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed memb
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=Other menu entries manage optional parameters.
 LogEvents=Security audit events
 Audit=Audit
@@ -1054,8 +1060,9 @@ LogEventDesc=You can enable here the logging for Dolibarr security events. Admin
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1188,11 +1195,11 @@ UserMailRequired=EMail required to create a new user
 HRMSetup=HRM module setup
 ##### Company setup #####
 CompanySetup=Companies module setup
-CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier)
-AccountCodeManager=Module for accounting code generation (customer or supplier)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
 NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
 ModelModules=Documents templates
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
@@ -1203,6 +1210,9 @@ MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
 TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=Free text on commercial proposals
 WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
 ##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=Order management setup
 OrdersNumberingModules=Orders numbering models
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe
 OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
 OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
 ##### Stock #####
-StockSetup=Warehouse module setup
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
 ##### Menu #####
 MenuDeleted=Menu deleted
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
 MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
 SuppliersSetup=Supplier module setup
-SuppliersCommandModel=Complete template of supplier order (logo...)
-SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","
 SalariesSetup=Setup of module salaries
 SortOrder=Sort order
 Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Install of external module from applic
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
-TextTitleColor=Color of page title
+TextTitleColor=Text color of Page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=Background color for Top menu
 TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
 ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-MailToMember=To send email from member page
-MailToUser=To send email from user page
-MailToProject= To send email from project page
+MailToSendProposal=Customer proposals
+MailToSendOrder=고객 주문
+MailToSendInvoice=고객 송장
+MailToSendShipment=Shipments
+MailToSendIntervention=중재
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=계약서
+MailToThirdparty=협력업체
+MailToMember=구성원
+MailToUser=사용자
+MailToProject=Projects page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1780,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/ko_KR/bills.lang b/htdocs/langs/ko_KR/bills.lang
index e8c7ab8e7d3..23181b64865 100644
--- a/htdocs/langs/ko_KR/bills.lang
+++ b/htdocs/langs/ko_KR/bills.lang
@@ -109,7 +109,7 @@ CancelBill=Cancel an invoice
 SendRemindByMail=Send reminder by EMail
 DoPayment=Enter payment
 DoPaymentBack=Enter refund
-ConvertToReduc=Convert into future discount
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
@@ -120,7 +120,7 @@ BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
 BillStatusPaid=유료
-BillStatusPaidBackOrConverted=Credit note refund or converted into discount
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Abandoned
 BillStatusValidated=Validated (needs to be paid)
@@ -296,10 +296,10 @@ DiscountType=Discount type
 NoteReason=Note/Reason
 ReasonDiscount=이유
 DiscountOfferedBy=Granted by
-DiscountStillRemaining=Discounts available
-DiscountAlreadyCounted=Discounts already consumed
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+SupplierDiscounts=Vendors discounts
 BillAddress=Bill address
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Every %s days
 FrequencyPer_m=Every %s months
 FrequencyPer_y=Every %s years
@@ -505,9 +511,14 @@ SituationAmount=Situation invoice amount(net)
 SituationDeduction=Situation subtraction
 ModifyAllLines=Modify all lines
 CreateNextSituationInvoice=Create next situation
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=일
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
 NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
@@ -532,3 +543,4 @@ AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/ko_KR/categories.lang b/htdocs/langs/ko_KR/categories.lang
index 84a576c0f7f..632571ed951 100644
--- a/htdocs/langs/ko_KR/categories.lang
+++ b/htdocs/langs/ko_KR/categories.lang
@@ -16,7 +16,7 @@ MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
-SubCats=Subcategories
+SubCats=Sub-categories
 CatList=List of tags/categories
 NewCategory=New tag/category
 ModifCat=Modify tag/category
@@ -85,3 +85,4 @@ CategorieRecursivHelp=If activated, product will also linked to parent category
 AddProductServiceIntoCategory=Add the following product/service
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
+ChooseCategory=Choose category
diff --git a/htdocs/langs/ko_KR/commercial.lang b/htdocs/langs/ko_KR/commercial.lang
index 96c1679e604..f7bb7c5b202 100644
--- a/htdocs/langs/ko_KR/commercial.lang
+++ b/htdocs/langs/ko_KR/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=닫기
 ActionAC_EMAILING=대량 이메일 보내기
 ActionAC_COM=메일로 고객 주문 보내기
 ActionAC_SHIP=메일로 선적 보내기
-ActionAC_SUP_ORD=메일로 공급 업체 주문 보내기
-ActionAC_SUP_INV=메일로 공급 업체 송장 발송
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=기타
 ActionAC_OTH_AUTO=자동 삽입 이벤트
 ActionAC_MANUAL=수동 삽입 이벤트
diff --git a/htdocs/langs/ko_KR/companies.lang b/htdocs/langs/ko_KR/companies.lang
index 03e3890624a..7cfa1fda455 100644
--- a/htdocs/langs/ko_KR/companies.lang
+++ b/htdocs/langs/ko_KR/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=이 연락처와 관련된 모든 정보를 삭제 하시
 MenuNewThirdParty=신규 협력업체
 MenuNewCustomer=신규 고객
 MenuNewProspect=신규 잠재고객
-MenuNewSupplier=신규 공급업체
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=신규 개인
-NewCompany=신규 회사 (잠재고객, 고객, 공급업체)
-NewThirdParty=신규 협력업체 (잠재고객, 고객, 공급업체)
-CreateDolibarrThirdPartySupplier=협력업체 (공급업체) 생성
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=협력업체 생성
 CreateThirdPartyAndContact=협력업체 + 신생 연락처 만들기
 ProspectionArea=매장 지역
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=잠재고객
 ThirdPartyCustomers=고객
 ThirdPartyCustomersStats=고객
 ThirdPartyCustomersWithIdProf12=%s 또는 %s이 있는 고객
-ThirdPartySuppliers=공급업체
+ThirdPartySuppliers=Vendors
 ThirdPartyType=협력업체 유형
 Individual=개인
 ToCreateContactWithSameName=협력업체와 동일한 정보로 연락처 / 주소를 자동으로 생성합니다. 대부분의 경우, 협력업체가 물리적인 사람 일지라도 협력업체를 독립적으로 생성 가능합니다.
@@ -77,11 +77,11 @@ Web=웹
 Poste= 직위
 DefaultLang=기본 언어
 VATIsUsed=Sales tax is used
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=주소를 협력업체 주소로 입력하십시오.
-ThirdpartyNotCustomerNotSupplierSoNoRef=고객이나 공급 업체가 아닌 협력업체, 이용 가능한 참조 객체가 없음
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=지불 은행 계좌
 OverAllProposals=제안
 OverAllOrders=주문
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=RE 유형
 TypeLocaltax2ES=IRPF 유형
 WrongCustomerCode=고객 코드가 유효하지 않습니다.
-WrongSupplierCode=공급자 코드가 유효하지 않습니다.
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=고객 코드 모델
-SupplierCodeModel=공급 업체 코드 모델
+SupplierCodeModel=Vendor code model
 Gencod=바 코드
 ##### Professional ID #####
 ProfId1Short=프로필 id 1
@@ -267,7 +267,7 @@ Prospect=잠재업체
 CustomerCard=고객 카드
 Customer=고객
 CustomerRelativeDiscount=상대 고객 할인
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=상대적 할인
 CustomerAbsoluteDiscountShort=절대 할인
 CompanyHasRelativeDiscount=이 고객은 기본 할인인이 <b>%s%%</b> 입니다.
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this suppl
 CompanyHasNoAbsoluteDiscount=이 고객에게는 할인 크레딧이 없습니다.
 CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
 CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=없음
 Supplier=공급자
 AddContact=연락처 생성
@@ -304,13 +304,13 @@ DeleteACompany=회사 삭제
 PersonalInformations=개인 정보
 AccountancyCode=회계 계정
 CustomerCode=고객 코드
-SupplierCode=공급자 코드
+SupplierCode=Vendor code
 CustomerCodeShort=고객 코드
-SupplierCodeShort=공급자 코드
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=모든 고객 내 고유의 고객 코드
-SupplierCodeDesc=모든 공급자 내 고유의 공급자 코드
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=협력업체가 고객 또는 잠재 고객 인 경우 필요
-RequiredIfSupplier=협력업체가 공급 업체 인 경우 필요
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=모듈별로 유효성 제어
 ThisIsModuleRules=이 모듈에 대한 규칙입니다.
 ProspectToContact=잠재거래처 연락처
@@ -338,7 +338,7 @@ MyContacts=내 연락처
 Capital=자본
 CapitalOf=자본금 %s
 EditCompany=회사 편집
-ThisUserIsNot=이 사용자는 잠재 고객, 고객 또는 공급 업체가 아닙니다.
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=검사
 VATIntraCheckDesc=링크 <b>%s</b> 는 유럽 VAT 검사 서비스에 문의할 수 있습니다. 이 서비스가 작동하려면 서버에서 외부 인터넷에 접속해야 합니다.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -396,7 +396,7 @@ ImportDataset_company_4=Third parties/Sales representatives (Assign sales repres
 PriceLevel=가격 수준
 DeliveryAddress=배달 주소
 AddAddress=주소 추가
-SupplierCategory=공급 업체 분류
+SupplierCategory=Vendor category
 JuridicalStatus200=독립적인
 DeleteFile=파일 삭제
 ConfirmDeleteFile=이 파일을 정말로 삭제 하시겠습니까?
@@ -406,7 +406,7 @@ FiscalYearInformation=회계 연도에 대한 정보
 FiscalMonthStart=회계 연도의 시작 달
 YouMustAssignUserMailFirst=이 사용자에 대한 전자 메일을 먼저 만들어야 전자 메일 알림을 추가 할 수 있습니다.
 YouMustCreateContactFirst=전자 메일 알림을 추가하려면 먼저 협력업체에 유효한 전자 메일이있는 연락처를 정의해야합니다
-ListSuppliersShort=공급 업체 목록
+ListSuppliersShort=List of vendors
 ListProspectsShort=잠재 고객 목록
 ListCustomersShort=고객 명단
 ThirdPartiesArea=협력업체 및 연락처
@@ -420,7 +420,7 @@ CurrentOutstandingBill=현재 미결제 금액
 OutstandingBill=미결 한도
 OutstandingBillReached=미결 한도 금액 도달
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=고객 코드는 %syymm-nnnn 형식이고 공급 업체 코드는 %syymm-nnnn 형식으로 번호를 반환합니다. 여기서 yy는 연도, mm은 월, nnnn은 0 아닌 순환 일련번호 입니다.
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=코드는 무료입니다. 이 코드는 언제든지 수정할 수 있습니다.
 ManagingDirectors=관리자 이름 (CEO, 이사, 사장 ...)
 MergeOriginThirdparty=중복 된 협력업체 (삭제하려는 협력업체)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=영업 담당자 로그인
 SaleRepresentativeFirstname=영업 담당자의 이름
 SaleRepresentativeLastname=영업 대표자 성
 ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=신규 고객 또는 공급자 코드가 중복됩니다.
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/ko_KR/compta.lang b/htdocs/langs/ko_KR/compta.lang
index 561d43a751d..e9eb7534446 100644
--- a/htdocs/langs/ko_KR/compta.lang
+++ b/htdocs/langs/ko_KR/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=Net paid
 VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
-VATSummary=Tax Balance
+VATSummary=Tax monthly
+VATBalance=Tax Balance
 VATPaid=Tax paid
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=Accountancy/Treasury area
 NewPayment=New payment
 Payments=Payments
 PaymentCustomerInvoice=Customer invoice payment
-PaymentSupplierInvoice=Supplier invoice payment
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
-ListOfSupplierPayments=List of supplier payments
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -110,7 +111,7 @@ ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
 CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
 SupplierAccountancyCodeShort=Sup. account. code
 AccountNumber=Account number
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
 Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
-ByProductsAndServices=By products and services
+ByProductsAndServices=By product and service
 RefExt=External ref
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
 LinkedOrder=주문 링크
@@ -215,7 +218,8 @@ Mode1=Method 1
 Mode2=Method 2
 CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
 CalculationRuleDescSupplier=According to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
@@ -242,3 +246,10 @@ FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/ko_KR/dict.lang b/htdocs/langs/ko_KR/dict.lang
index 549074ff920..3b695e58dbe 100644
--- a/htdocs/langs/ko_KR/dict.lang
+++ b/htdocs/langs/ko_KR/dict.lang
@@ -5,7 +5,8 @@ CountryIT=Italy
 CountryES=Spain
 CountryDE=Germany
 CountryCH=Switzerland
-CountryGB=Great Britain
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=United Kingdom
 CountryUK=United Kingdom
 CountryIE=Ireland
 CountryCN=China
diff --git a/htdocs/langs/ko_KR/ecm.lang b/htdocs/langs/ko_KR/ecm.lang
index 3e39f50438d..c99b6129c2b 100644
--- a/htdocs/langs/ko_KR/ecm.lang
+++ b/htdocs/langs/ko_KR/ecm.lang
@@ -39,9 +39,10 @@ ShowECMSection=Show directory
 DeleteSection=Remove directory
 ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
 ECMDirectoryForFiles=Relative directory for files
-CannotRemoveDirectoryContainsFiles=Removed not possible because it contains some files
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=File manager
-ECMSelectASection=Select a directory on left tree...
+ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
diff --git a/htdocs/langs/ko_KR/errors.lang b/htdocs/langs/ko_KR/errors.lang
index ec036b28bc5..0ca7488b8cb 100644
--- a/htdocs/langs/ko_KR/errors.lang
+++ b/htdocs/langs/ko_KR/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Bar code required
 ErrorCustomerCodeAlreadyUsed=Customer code already used
 ErrorBarCodeAlreadyUsed=Bar code already used
 ErrorPrefixRequired=Prefix required
-ErrorBadSupplierCodeSyntax=Bad syntax for supplier code
-ErrorSupplierCodeRequired=Supplier code required
-ErrorSupplierCodeAlreadyUsed=Supplier code already used
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Bad parameters
 ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
 ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
@@ -87,7 +87,7 @@ ErrorsOnXLines=Errors on <b>%s</b> source record(s)
 ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
 ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s"
 ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
-ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Error on mask
 ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
-ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
diff --git a/htdocs/langs/ko_KR/install.lang b/htdocs/langs/ko_KR/install.lang
index e8c77bdd2ca..a30e01ff2ad 100644
--- a/htdocs/langs/ko_KR/install.lang
+++ b/htdocs/langs/ko_KR/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=설치 파일 <b>%s</b>이 없거나 
 ConfFileCouldBeCreated=설치 파일<b>%s</b>이 작성되지 않았습니다.
 ConfFileIsNotWritable=설치 파일 <b>%s</b>을/를 사용할 수 없습니다. 사용권한을 확인하세요. 우선 설치를 하려면, 웹 서버에서 설치 과정에 필요한  이 파일을 사용할 수 있는 권한이 있어야 합니다 (예: 리눅스 같은 OS에서 "chmod 666").
 ConfFileIsWritable=설정 파일 <b>%s</b>을/를 사용할 수 있습니다.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=설정 파일에 필요한 모든 정보를 다시 로딩합니다.
 PHPSupportSessions=이 PHP는 세션을 지원합니다.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
 WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called <b>install.lock</b> into Dolibarr document directory, in order to avoid malicious use of it.
 FunctionNotAvailableInThisPHP=Not available on this PHP
 ChoosedMigrateScript=Choose migration script
-DataMigration=Data migration
-DatabaseMigration=Structure database migration
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script processing
 ChooseYourSetupMode=Choose your setup mode and click "Start"...
 FreshInstall=Fresh install
@@ -146,7 +147,7 @@ NothingToDo=Nothing to do
 # upgrade
 MigrationFixData=Fix for denormalized data
 MigrationOrder=Data migration for customer's orders
-MigrationSupplierOrder=Data migration for supplier's orders
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Data migration for commercial proposals
 MigrationInvoice=Data migration for customer's invoices
 MigrationContract=Data migration for contracts
@@ -196,6 +197,8 @@ MigrationEvents=Migration of events to add event owner into assignement table
 MigrationEventsContact=Migration of events to add event contact into assignement table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 ShowNotAvailableOptions=Show not available options
diff --git a/htdocs/langs/ko_KR/ldap.lang b/htdocs/langs/ko_KR/ldap.lang
index fdb86a152e9..fbd0c5ddc83 100644
--- a/htdocs/langs/ko_KR/ldap.lang
+++ b/htdocs/langs/ko_KR/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Password for domain
 YouMustChangePassNextLogon=Password for user <b>%s</b> on the domain <b>%s</b> must be changed.
 UserMustChangePassNextLogon=User must change password on the domain %s
 LDAPInformationsForThisContact=Information in LDAP database for this contact
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Member type synchronized
 ContactSynchronized=Contact synchronized
 ForceSynchronize=Force synchronizing Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Failed to read LDAP database. Check LDAP module setup and database accessibility.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/ko_KR/loan.lang b/htdocs/langs/ko_KR/loan.lang
index 2b455fe8ac9..bc13e38755f 100644
--- a/htdocs/langs/ko_KR/loan.lang
+++ b/htdocs/langs/ko_KR/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=자본
 Insurance=Insurance
 Interest=Interest
 Nbterms=Number of terms
+Term=Term
 LoanAccountancyCapitalCode=Accounting account capital
 LoanAccountancyInsuranceCode=Accounting account insurance
 LoanAccountancyInterestCode=Accounting account interest
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=Confirm deleting this loan
 LoanDeleted=Loan Deleted Successfully
 ConfirmPayLoan=Confirm classify paid this loan
 LoanPaid=Loan Paid
-# Calc
-LoanCalc=Bank Loans Calculator
-PurchaseFinanceInfo=Purchase & Financing Information
-SalePriceOfAsset=Sale Price of Asset
-PercentageDown=Percentage Down
-LengthOfMortgage=Duration of loan
-AnnualInterestRate=Annual Interest Rate
-ExplainCalculations=Explain Calculations
-ShowMeCalculationsAndAmortization=Show me the calculations and amortization
-MortgagePaymentInformation=Mortgage Payment Information
-DownPayment=Down Payment
-DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
-InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
-MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
-MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
-MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
-MonthlyPaymentDesc=The montly payment is figured out using the following formula
-AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
-AmountFinanced=Amount Financed
-AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
-Totalsforyear=Totals for year
-MonthlyPayment=Monthly Payment
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
-GoToInterest=%s will go towards INTEREST
-GoToPrincipal=%s will go towards PRINCIPAL
-YouWillSpend=You will spend %s in year %s
 ListLoanAssociatedProject=List of loan associated with the project
 AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Interest
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-FinancialCommitment=Financial commitment
 CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/langs/ko_KR/mails.lang b/htdocs/langs/ko_KR/mails.lang
index 8f84edcaa0b..3196ab154cd 100644
--- a/htdocs/langs/ko_KR/mails.lang
+++ b/htdocs/langs/ko_KR/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Sender
 MailErrorsTo=Errors to
 MailReply=Reply to
 MailTo=Receiver(s)
+MailToUsers=To user(s)
 MailCC=Copy to
+MailToCCUsers=Copy to users(s)
 MailCCC=Cached copy to
 MailTopic=EMail topic
 MailText=Message
@@ -164,4 +166,4 @@ InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/ko_KR/main.lang b/htdocs/langs/ko_KR/main.lang
index 1c52ebceb02..669d5e87b75 100644
--- a/htdocs/langs/ko_KR/main.lang
+++ b/htdocs/langs/ko_KR/main.lang
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr 인증 모드는 <b>conf.
 Administrator=관리자
 Undefined=정의되지 않음
 PasswordForgotten=암호를 잊어 버리셨습니까?
+NoAccount=No account?
 SeeAbove=상위 보기
 HomeArea=홈 영역
 LastConnexion=최근 연결
@@ -231,7 +232,7 @@ Limit=한도
 Limits=제한
 Logout=로그 아웃
 NoLogoutProcessWithAuthMode=인증 모드 <b>%s</b>로 응용 프로그램 연결 해제 기능이 없습니다.
-Connection=연결
+Connection=로그인
 Setup=설정
 Alert=경보
 MenuWarnings=알리미
@@ -402,6 +403,7 @@ DefaultTaxRate=Default tax rate
 Average=평균
 Sum=누계
 Delta=델타
+RemainToPay=Remain to pay
 Module=모듈 / 응용 프로그램
 Modules=모듈 / 응용 프로그램
 Option=옵션
@@ -414,7 +416,7 @@ Favorite=즐겨찾기
 ShortInfo=정보
 Ref=참조
 ExternalRef=외부참조
-RefSupplier=참조 공급자
+RefSupplier=Ref. vendor
 RefPayment=참조 지불
 CommercialProposalsShort=상업적 제안
 Comment=주석
@@ -493,7 +495,7 @@ Received=받음
 Paid=유료
 Topic=제목
 ByCompanies=협력업체 별
-ByUsers=사용자 별
+ByUsers=By user
 Links=링크
 Link=링크
 Rejects=거부
@@ -619,9 +621,9 @@ BuildDoc=문서 만들기
 Entity=환경
 Entities=엔티티
 CustomerPreview=고객 미리보기
-SupplierPreview=공급업체 미리보기
+SupplierPreview=Vendor preview
 ShowCustomerPreview=고객 미리보기 표시
-ShowSupplierPreview=공급업체 미리보기 표시
+ShowSupplierPreview=Show vendor preview
 RefCustomer=참조고객
 Currency=통화
 InfoAdmin=관리자를위한 정보
@@ -679,7 +681,7 @@ Color=색상
 Documents=링크 된 파일
 Documents2=문서
 UploadDisabled=업로드 사용 중지됨
-MenuAccountancy=Accountancy
+MenuAccountancy=Accounting
 MenuECM=문서
 MenuAWStats=AWStats
 MenuMembers=회원
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=제품 또는 서비스
 SearchIntoProjects=프로젝트
 SearchIntoTasks=할 일
 SearchIntoCustomerInvoices=고객 송장
-SearchIntoSupplierInvoices=공급 업체 송장
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=고객 주문
-SearchIntoSupplierOrders=공급 업체 주문
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=고객 제안
-SearchIntoSupplierProposals=공급 업체 제안
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=중재
 SearchIntoContracts=계약서
 SearchIntoCustomerShipments=고객 출하
@@ -941,3 +943,5 @@ Remote=Remote
 LocalAndRemote=Local and Remote
 KeyboardShortcut=Keyboard shortcut
 AssignedTo=Assigned to
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/ko_KR/margins.lang b/htdocs/langs/ko_KR/margins.lang
index 9f590ef3718..b9d52dcfdc6 100644
--- a/htdocs/langs/ko_KR/margins.lang
+++ b/htdocs/langs/ko_KR/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=As a service
 UseDiscountOnTotal=On subtotal
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
 MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best supplier price
+MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Cost price
 UnitCharges=Unit charges
 Charges=Charges
diff --git a/htdocs/langs/ko_KR/members.lang b/htdocs/langs/ko_KR/members.lang
index cf2b473dd87..bf84a9558b1 100644
--- a/htdocs/langs/ko_KR/members.lang
+++ b/htdocs/langs/ko_KR/members.lang
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
diff --git a/htdocs/langs/ko_KR/opensurvey.lang b/htdocs/langs/ko_KR/opensurvey.lang
index 42d9e3dc94a..1de5bf267f5 100644
--- a/htdocs/langs/ko_KR/opensurvey.lang
+++ b/htdocs/langs/ko_KR/opensurvey.lang
@@ -58,3 +58,4 @@ MoreChoices=Enter more choices for the voters
 SurveyExpiredInfo=The poll has been closed or voting delay has expired.
 EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
 ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/ko_KR/orders.lang b/htdocs/langs/ko_KR/orders.lang
index 4750ca9e599..66342171b93 100644
--- a/htdocs/langs/ko_KR/orders.lang
+++ b/htdocs/langs/ko_KR/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Customers orders area
-SuppliersOrdersArea=Suppliers orders area
+SuppliersOrdersArea=Purchase orders area
 OrderCard=Order card
 OrderId=Order Id
 Order=Order
@@ -13,18 +13,18 @@ OrderToProcess=Order to process
 NewOrder=New order
 ToOrder=Make order
 MakeOrder=Make order
-SupplierOrder=Supplier order
-SuppliersOrders=Suppliers orders
-SuppliersOrdersRunning=Current suppliers orders
-CustomerOrder=Customer order
-CustomersOrders=고객 주문
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=Customer Order
+CustomersOrders=Customer Orders
 CustomersOrdersRunning=Current customer orders
 CustomersOrdersAndOrdersLines=Customer orders and order lines
 OrdersDeliveredToBill=Customer orders delivered to bill
 OrdersToBill=Customer orders delivered
 OrdersInProcess=Customer orders in process
 OrdersToProcess=Customer orders to process
-SuppliersOrdersToProcess=Supplier orders to process
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=취소 된
 StatusOrderDraftShort=초안
 StatusOrderValidatedShort=확인 됨
@@ -75,15 +75,15 @@ ShowOrder=Show order
 OrdersOpened=Orders to process
 NoDraftOrders=No draft orders
 NoOrder=No order
-NoSupplierOrder=No supplier order
+NoSupplierOrder=No purchase order
 LastOrders=Latest %s customer orders
 LastCustomerOrders=Latest %s customer orders
-LastSupplierOrders=Latest %s supplier orders
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=Latest %s modified orders
 AllOrders=All orders
 NbOfOrders=Number of orders
 OrdersStatistics=Order's statistics
-OrdersStatisticsSuppliers=Supplier order's statistics
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Number of orders by month
 AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
 ListOfOrders=List of orders
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</
 GenerateBill=Generate invoice
 ClassifyShipped=Classify delivered
 DraftOrders=Draft orders
-DraftSuppliersOrders=Draft suppliers orders
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=In process orders
 RefOrder=Ref. order
 RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for supplier
-RefOrderSupplierShort=Ref. order supplier
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=Send order by mail
 ActionsOnOrder=Events on order
 NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
 DispatchSupplierOrder=Receiving supplier order %s
 FirstApprovalAlreadyDone=First approval already done
 SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=Supplier order %s received %s
-SupplierOrderSubmitedInDolibarr=Supplier order %s submited
-SupplierOrderClassifiedBilled=Supplier order %s set billed
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Other orders
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
@@ -125,11 +125,11 @@ TypeContact_commande_internal_SHIPPING=Representative following-up shipping
 TypeContact_commande_external_BILLING=Customer invoice contact
 TypeContact_commande_external_SHIPPING=Customer shipping contact
 TypeContact_commande_external_CUSTOMER=Customer contact following-up order
-TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
-TypeContact_order_supplier_external_BILLING=Supplier invoice contact
-TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact
-TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
 Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
 Error_OrderNotChecked=No orders to invoice selected
diff --git a/htdocs/langs/ko_KR/other.lang b/htdocs/langs/ko_KR/other.lang
index f9a12ff79d8..a5fc0d2bb89 100644
--- a/htdocs/langs/ko_KR/other.lang
+++ b/htdocs/langs/ko_KR/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=Files is too big
 PleaseBePatient=Please be patient...
 NewPassword=New password
 ResetPassword=Reset password
-RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
@@ -233,6 +233,8 @@ PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=Exports area
 AvailableFormats=Available formats
diff --git a/htdocs/langs/ko_KR/productbatch.lang b/htdocs/langs/ko_KR/productbatch.lang
index 8f86948fd42..7f2279f01bf 100644
--- a/htdocs/langs/ko_KR/productbatch.lang
+++ b/htdocs/langs/ko_KR/productbatch.lang
@@ -16,7 +16,7 @@ printEatby=소비기한: %s
 printSellby=판매기한: %s
 printQty=수량: %d
 AddDispatchBatchLine=Shelf Life 처리를 위한 줄 추가
-WhenProductBatchModuleOnOptionAreForced=일련번호모듈을 사용하면 운송허가 및 제품 수령시에 자동 재고증가감소수량모드가 강제되며, 수정이 불가합니다. 다른 옵션은 원하는대로 지정이 가능합니다. 
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=이제품은 일련번호를 사용하지 않음
 ProductLotSetup=일련번호 모듈 설정
 ShowCurrentStockOfLot=묶음제품 또는 일련번호별제품 현 재고보기
diff --git a/htdocs/langs/ko_KR/products.lang b/htdocs/langs/ko_KR/products.lang
index 5477e64890f..215653bd988 100644
--- a/htdocs/langs/ko_KR/products.lang
+++ b/htdocs/langs/ko_KR/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
 MinPrice=Min. selling price
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
 ContractStatusClosed=닫은
 ErrorProductAlreadyExists=A product with reference %s already exists.
@@ -155,7 +156,7 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=공급업체 가격
 SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
-CustomCode=Customs/Commodity/HS code
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
 Nature=Nature
 ShortLabel=Short label
diff --git a/htdocs/langs/ko_KR/projects.lang b/htdocs/langs/ko_KR/projects.lang
index 5f58710c1f6..14371222e90 100644
--- a/htdocs/langs/ko_KR/projects.lang
+++ b/htdocs/langs/ko_KR/projects.lang
@@ -77,6 +77,7 @@ Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer orders associated with the project
@@ -226,4 +227,4 @@ AllowCommentOnProject=Allow user comments on projects
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/ko_KR/stocks.lang b/htdocs/langs/ko_KR/stocks.lang
index fc743718f44..3572445be1c 100644
--- a/htdocs/langs/ko_KR/stocks.lang
+++ b/htdocs/langs/ko_KR/stocks.lang
@@ -203,3 +203,4 @@ RegulateStock=Regulate Stock
 ListInventory=목록
 StockSupportServices=Stock management support services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/ko_KR/stripe.lang b/htdocs/langs/ko_KR/stripe.lang
index 3795bcfcbd4..b5b394bf785 100644
--- a/htdocs/langs/ko_KR/stripe.lang
+++ b/htdocs/langs/ko_KR/stripe.lang
@@ -58,8 +58,8 @@ NameOnCard=Name on card
 CardNumber=Card Number
 ExpiryDate=Expiry Date
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/ko_KR/supplier_proposal.lang b/htdocs/langs/ko_KR/supplier_proposal.lang
index 40cda9d61e2..f707ca4260a 100644
--- a/htdocs/langs/ko_KR/supplier_proposal.lang
+++ b/htdocs/langs/ko_KR/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Supplier commercial proposals
-supplier_proposalDESC=Manage price requests to suppliers
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
 SupplierProposalNew=New price request
 CommRequest=Price request
 CommRequests=가격 요청
 SearchRequest=Find a request
 DraftRequests=Draft requests
-SupplierProposalsDraft=Draft supplier proposals
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=Latest %s modified price requests
 RequestsOpened=Open price requests
-SupplierProposalArea=Supplier proposals area
-SupplierProposalShort=Supplier proposal
-SupplierProposals=공급 업체 제안
-SupplierProposalsShort=공급 업체 제안
+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=Supplier ref
+SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=Delivery date
 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>?
@@ -47,9 +47,9 @@ CommercialAsk=Price request
 DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposals=List of supplier proposal requests
-ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
-SupplierProposalsToClose=Supplier proposals to close
-SupplierProposalsToProcess=Supplier proposals to process
+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
diff --git a/htdocs/langs/ko_KR/suppliers.lang b/htdocs/langs/ko_KR/suppliers.lang
index 630ee5728c8..7b81f84d024 100644
--- a/htdocs/langs/ko_KR/suppliers.lang
+++ b/htdocs/langs/ko_KR/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=납품업체
-SuppliersInvoice=대금 청구서
-ShowSupplierInvoice=공급업체청구서보기
-NewSupplier=신규납품처
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=기록보기
-ListOfSuppliers=남품처목록
-ShowSupplier=남품처보기
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=주문일
 BuyingPriceMin=최저구매가
 BuyingPriceMinShort=최저구매가
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=구성제품판매총액
 SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=구매가등록
 ChangeSupplierPrice=구매가변경
-SupplierPrices=공급업체 가격
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
-NoRecordedSuppliers=남품처 기록없음
-SupplierPayment=납품업체대금결제
-SuppliersArea=납품업체지역
-RefSupplierShort=참조 공급자
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=이용가능여부
-ExportDataset_fournisseur_1=공급업체 대금결제청구목록 및 상세내역
-ExportDataset_fournisseur_2=공급업체 청구서 및 결제내역
-ExportDataset_fournisseur_3=공급업체 주문 및 상세내역
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=주문 승인
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=주문 거절
 ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
 ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
-AddSupplierOrder=공급업체 주문생성
-AddSupplierInvoice=공급업체청구서생성
-ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
-SentToSuppliers=Sent to suppliers
-ListOfSupplierOrders=최근 공급 업체 주문 목록
-MenuOrdersSupplierToBill=청구서생성용 공급업체주문목록
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=배송지체기간
 DescNbDaysToDelivery=최대배송지체기간
-SupplierReputation=공급업체평가
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=주문불가
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=평가
 BuyerName=구매자
 AllProductServicePrices=제품목록 및 서비스목록
 AllProductReferencesOfSupplier=공급업체 제품 및 서비스 목록
-BuyingPriceNumShort=공급업체 가격
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/ko_KR/website.lang b/htdocs/langs/ko_KR/website.lang
index 6b8408ea759..adc1c2f4f10 100644
--- a/htdocs/langs/ko_KR/website.lang
+++ b/htdocs/langs/ko_KR/website.lang
@@ -73,7 +73,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
diff --git a/htdocs/langs/ko_KR/workflow.lang b/htdocs/langs/ko_KR/workflow.lang
index a50bd91595b..783373ad66d 100644
--- a/htdocs/langs/ko_KR/workflow.lang
+++ b/htdocs/langs/ko_KR/workflow.lang
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source custome
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/lo_LA/accountancy.lang b/htdocs/langs/lo_LA/accountancy.lang
index 2fa98edce1d..10363dfa230 100644
--- a/htdocs/langs/lo_LA/accountancy.lang
+++ b/htdocs/langs/lo_LA/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=ບັນ​ຊີ
 ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
 ACCOUNTING_EXPORT_DATE=Date format for export file
 ACCOUNTING_EXPORT_PIECE=Export the number of piece
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Accounts with non zero values
 ListOfAccounts=List of accounts
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers 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
 
-AccountancyArea=Accountancy area
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
 AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
@@ -89,7 +90,7 @@ MenuProductsAccounts=Product accounts
 ProductsBinding=Products accounts
 Ventilation=Binding to accounts
 CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Supplier invoice binding
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
 ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
@@ -185,11 +187,12 @@ ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
-DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Group of account
 Pcgsubtype=Subgroup of account
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
 ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
 DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report 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 fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -293,4 +296,9 @@ Binded=Lines bound
 ToBind=Lines to bind
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/lo_LA/admin.lang b/htdocs/langs/lo_LA/admin.lang
index f7a384d9fa3..5f141946547 100644
--- a/htdocs/langs/lo_LA/admin.lang
+++ b/htdocs/langs/lo_LA/admin.lang
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems)
 MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=Method to use to send EMails
 MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
 MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
@@ -291,7 +292,7 @@ ModuleSetup=Module setup
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projects/Collaborative work
@@ -373,7 +374,8 @@ NoSmsEngine=No SMS sender manager available. SMS sender manager are not installe
 PDF=PDF
 PDFDesc=You can set each global options related to the PDF generation
 PDFAddressForging=Rules to forge address boxes
-HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=Hide products description on generated PDF
@@ -445,7 +447,8 @@ DisplayCompanyInfo=Display company address
 DisplayCompanyManagers=Display manager names
 DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party 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.
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Set this to 1 if you want to attach main document to emai
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -479,7 +485,7 @@ Module1Desc=Companies and contact management (customers, prospects...)
 Module2Name=Commercial
 Module2Desc=Commercial management
 Module10Name=ບັນ​ຊີ
-Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching.
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=Proposals
 Module20Desc=Commercial proposal management
 Module22Name=Mass E-mailings
@@ -546,8 +552,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
-Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Payment of employee wages
 Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
@@ -561,14 +567,14 @@ Module700Name=Donations
 Module700Desc=Donation management
 Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Mantis integration
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
 Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
 Module2200Name=Dynamic Prices
@@ -576,7 +582,7 @@ Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Scheduled jobs
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API/Web services (SOAP server)
@@ -613,7 +619,7 @@ Module50100Desc=Point of sales module (POS).
 Module50200Name=Paypal
 Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Poll, Survey or Vote
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed memb
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=Other menu entries manage optional parameters.
 LogEvents=Security audit events
 Audit=Audit
@@ -1054,8 +1060,9 @@ LogEventDesc=You can enable here the logging for Dolibarr security events. Admin
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1188,11 +1195,11 @@ UserMailRequired=EMail required to create a new user
 HRMSetup=HRM module setup
 ##### Company setup #####
 CompanySetup=Companies module setup
-CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier)
-AccountCodeManager=Module for accounting code generation (customer or supplier)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
 NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
 ModelModules=Documents templates
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
@@ -1203,6 +1210,9 @@ MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
 TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=Free text on commercial proposals
 WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
 ##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=Order management setup
 OrdersNumberingModules=Orders numbering models
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe
 OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
 OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
 ##### Stock #####
-StockSetup=Warehouse module setup
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
 ##### Menu #####
 MenuDeleted=Menu deleted
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
 MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
 SuppliersSetup=Supplier module setup
-SuppliersCommandModel=Complete template of supplier order (logo...)
-SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","
 SalariesSetup=Setup of module salaries
 SortOrder=Sort order
 Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Install of external module from applic
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
-TextTitleColor=Color of page title
+TextTitleColor=Text color of Page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=Background color for Top menu
 TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
 ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-MailToMember=To send email from member page
-MailToUser=To send email from user page
-MailToProject= To send email from project page
+MailToSendProposal=Customer proposals
+MailToSendOrder=Customer orders
+MailToSendInvoice=Customer invoices
+MailToSendShipment=Shipments
+MailToSendIntervention=Interventions
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Contracts
+MailToThirdparty=Third parties
+MailToMember=Members
+MailToUser=Users
+MailToProject=Projects page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1780,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/lo_LA/bills.lang b/htdocs/langs/lo_LA/bills.lang
index 5898daa72b0..2f029928beb 100644
--- a/htdocs/langs/lo_LA/bills.lang
+++ b/htdocs/langs/lo_LA/bills.lang
@@ -109,7 +109,7 @@ CancelBill=Cancel an invoice
 SendRemindByMail=Send reminder by EMail
 DoPayment=Enter payment
 DoPaymentBack=Enter refund
-ConvertToReduc=Convert into future discount
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
@@ -120,7 +120,7 @@ BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
 BillStatusPaid=Paid
-BillStatusPaidBackOrConverted=Credit note refund or converted into discount
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Abandoned
 BillStatusValidated=Validated (needs to be paid)
@@ -296,10 +296,10 @@ DiscountType=Discount type
 NoteReason=Note/Reason
 ReasonDiscount=Reason
 DiscountOfferedBy=Granted by
-DiscountStillRemaining=Discounts available
-DiscountAlreadyCounted=Discounts already consumed
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+SupplierDiscounts=Vendors discounts
 BillAddress=Bill address
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Every %s days
 FrequencyPer_m=Every %s months
 FrequencyPer_y=Every %s years
@@ -505,9 +511,14 @@ SituationAmount=Situation invoice amount(net)
 SituationDeduction=Situation subtraction
 ModifyAllLines=Modify all lines
 CreateNextSituationInvoice=Create next situation
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=S
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
 NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
@@ -532,3 +543,4 @@ AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/lo_LA/categories.lang b/htdocs/langs/lo_LA/categories.lang
index 41e5f4e4c13..c0c8d4c0cef 100644
--- a/htdocs/langs/lo_LA/categories.lang
+++ b/htdocs/langs/lo_LA/categories.lang
@@ -16,7 +16,7 @@ MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
-SubCats=Subcategories
+SubCats=Sub-categories
 CatList=List of tags/categories
 NewCategory=New tag/category
 ModifCat=Modify tag/category
@@ -85,3 +85,4 @@ CategorieRecursivHelp=If activated, product will also linked to parent category
 AddProductServiceIntoCategory=Add the following product/service
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
+ChooseCategory=Choose category
diff --git a/htdocs/langs/lo_LA/commercial.lang b/htdocs/langs/lo_LA/commercial.lang
index f6bfea9c0d3..efadc44d700 100644
--- a/htdocs/langs/lo_LA/commercial.lang
+++ b/htdocs/langs/lo_LA/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=Close
 ActionAC_EMAILING=Send mass email
 ActionAC_COM=Send customer order by mail
 ActionAC_SHIP=Send shipping by mail
-ActionAC_SUP_ORD=Send supplier order by mail
-ActionAC_SUP_INV=Send supplier invoice by mail
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=Other
 ActionAC_OTH_AUTO=Automatically inserted events
 ActionAC_MANUAL=Manually inserted events
diff --git a/htdocs/langs/lo_LA/companies.lang b/htdocs/langs/lo_LA/companies.lang
index c1f6b2fd912..b22eadb4aae 100644
--- a/htdocs/langs/lo_LA/companies.lang
+++ b/htdocs/langs/lo_LA/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Are you sure you want to delete this contact and all inheri
 MenuNewThirdParty=New third party
 MenuNewCustomer=New customer
 MenuNewProspect=New prospect
-MenuNewSupplier=New supplier
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=New private individual
-NewCompany=New company (prospect, customer, supplier)
-NewThirdParty=New third party (prospect, customer, supplier)
-CreateDolibarrThirdPartySupplier=Create a third party (supplier)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=Create third party
 CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Prospection area
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=Prospects
 ThirdPartyCustomers=Customers
 ThirdPartyCustomersStats=Customers
 ThirdPartyCustomersWithIdProf12=Customers with %s or %s
-ThirdPartySuppliers=Suppliers
+ThirdPartySuppliers=Vendors
 ThirdPartyType=Third party type
 Individual=Private individual
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
@@ -77,11 +77,11 @@ Web=Web
 Poste= Position
 DefaultLang=Language by default
 VATIsUsed=Sales tax is used
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
-ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Proposals
 OverAllOrders=Orders
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=RE Type
 TypeLocaltax2ES=IRPF Type
 WrongCustomerCode=Customer code invalid
-WrongSupplierCode=Supplier code invalid
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Customer code model
-SupplierCodeModel=Supplier code model
+SupplierCodeModel=Vendor code model
 Gencod=Bar code
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
@@ -267,7 +267,7 @@ Prospect=Prospect
 CustomerCard=Customer Card
 Customer=Customer
 CustomerRelativeDiscount=Relative customer discount
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=Relative discount
 CustomerAbsoluteDiscountShort=Absolute discount
 CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this suppl
 CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
 CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
 CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=None
 Supplier=Supplier
 AddContact=Create contact
@@ -304,13 +304,13 @@ DeleteACompany=Delete a company
 PersonalInformations=Personal data
 AccountancyCode=Accounting account
 CustomerCode=Customer code
-SupplierCode=Supplier code
+SupplierCode=Vendor code
 CustomerCodeShort=Customer code
-SupplierCodeShort=Supplier code
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=Customer code, unique for all customers
-SupplierCodeDesc=Supplier code, unique for all suppliers
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=Required if third party is a customer or prospect
-RequiredIfSupplier=Required if third party is a supplier
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=Validity controled by module
 ThisIsModuleRules=This is rules for this module
 ProspectToContact=Prospect to contact
@@ -338,7 +338,7 @@ MyContacts=My contacts
 Capital=Capital
 CapitalOf=Capital of %s
 EditCompany=Edit company
-ThisUserIsNot=This user is not a prospect, customer nor supplier
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=Check
 VATIntraCheckDesc=The link <b>%s</b> allows to ask the european VAT checker service. An external internet access from server is required for this service to work.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -396,7 +396,7 @@ ImportDataset_company_4=Third parties/Sales representatives (Assign sales repres
 PriceLevel=Price level
 DeliveryAddress=Delivery address
 AddAddress=Add address
-SupplierCategory=Supplier category
+SupplierCategory=Vendor category
 JuridicalStatus200=Independent
 DeleteFile=Delete file
 ConfirmDeleteFile=Are you sure you want to delete this file?
@@ -406,7 +406,7 @@ FiscalYearInformation=Information on the fiscal year
 FiscalMonthStart=Starting month of the fiscal year
 YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
 YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
-ListSuppliersShort=List of suppliers
+ListSuppliersShort=List of vendors
 ListProspectsShort=List of prospects
 ListCustomersShort=List of customers
 ThirdPartiesArea=Third parties and contact area
@@ -420,7 +420,7 @@ CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/lo_LA/compta.lang b/htdocs/langs/lo_LA/compta.lang
index 15fd9683a62..9794a0431fe 100644
--- a/htdocs/langs/lo_LA/compta.lang
+++ b/htdocs/langs/lo_LA/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=Net paid
 VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
-VATSummary=Tax Balance
+VATSummary=Tax monthly
+VATBalance=Tax Balance
 VATPaid=Tax paid
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=Accountancy/Treasury area
 NewPayment=New payment
 Payments=Payments
 PaymentCustomerInvoice=Customer invoice payment
-PaymentSupplierInvoice=Supplier invoice payment
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
-ListOfSupplierPayments=List of supplier payments
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -110,7 +111,7 @@ ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
 CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
 SupplierAccountancyCodeShort=Sup. account. code
 AccountNumber=Account number
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
 Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
-ByProductsAndServices=By products and services
+ByProductsAndServices=By product and service
 RefExt=External ref
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
 LinkedOrder=Link to order
@@ -215,7 +218,8 @@ Mode1=Method 1
 Mode2=Method 2
 CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
 CalculationRuleDescSupplier=According to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
@@ -242,3 +246,10 @@ FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/lo_LA/dict.lang b/htdocs/langs/lo_LA/dict.lang
index ca0c61a9cbc..61a7237f472 100644
--- a/htdocs/langs/lo_LA/dict.lang
+++ b/htdocs/langs/lo_LA/dict.lang
@@ -5,7 +5,8 @@ CountryIT=Italy
 CountryES=Spain
 CountryDE=Germany
 CountryCH=Switzerland
-CountryGB=Great Britain
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=United Kingdom
 CountryUK=United Kingdom
 CountryIE=Ireland
 CountryCN=China
diff --git a/htdocs/langs/lo_LA/ecm.lang b/htdocs/langs/lo_LA/ecm.lang
index 65e9b17bdb2..5200fa30b1d 100644
--- a/htdocs/langs/lo_LA/ecm.lang
+++ b/htdocs/langs/lo_LA/ecm.lang
@@ -39,9 +39,10 @@ ShowECMSection=Show directory
 DeleteSection=Remove directory
 ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
 ECMDirectoryForFiles=Relative directory for files
-CannotRemoveDirectoryContainsFiles=Removed not possible because it contains some files
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=File manager
-ECMSelectASection=Select a directory on left tree...
+ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
diff --git a/htdocs/langs/lo_LA/errors.lang b/htdocs/langs/lo_LA/errors.lang
index ec036b28bc5..0ca7488b8cb 100644
--- a/htdocs/langs/lo_LA/errors.lang
+++ b/htdocs/langs/lo_LA/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Bar code required
 ErrorCustomerCodeAlreadyUsed=Customer code already used
 ErrorBarCodeAlreadyUsed=Bar code already used
 ErrorPrefixRequired=Prefix required
-ErrorBadSupplierCodeSyntax=Bad syntax for supplier code
-ErrorSupplierCodeRequired=Supplier code required
-ErrorSupplierCodeAlreadyUsed=Supplier code already used
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Bad parameters
 ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
 ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
@@ -87,7 +87,7 @@ ErrorsOnXLines=Errors on <b>%s</b> source record(s)
 ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
 ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s"
 ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
-ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Error on mask
 ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
-ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
diff --git a/htdocs/langs/lo_LA/install.lang b/htdocs/langs/lo_LA/install.lang
index e602c54640c..587d4f83da6 100644
--- a/htdocs/langs/lo_LA/install.lang
+++ b/htdocs/langs/lo_LA/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not
 ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
 ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be granted to be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reload all information from configuration file.
 PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
 WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called <b>install.lock</b> into Dolibarr document directory, in order to avoid malicious use of it.
 FunctionNotAvailableInThisPHP=Not available on this PHP
 ChoosedMigrateScript=Choose migration script
-DataMigration=Data migration
-DatabaseMigration=Structure database migration
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script processing
 ChooseYourSetupMode=Choose your setup mode and click "Start"...
 FreshInstall=Fresh install
@@ -146,7 +147,7 @@ NothingToDo=Nothing to do
 # upgrade
 MigrationFixData=Fix for denormalized data
 MigrationOrder=Data migration for customer's orders
-MigrationSupplierOrder=Data migration for supplier's orders
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Data migration for commercial proposals
 MigrationInvoice=Data migration for customer's invoices
 MigrationContract=Data migration for contracts
@@ -196,6 +197,8 @@ MigrationEvents=Migration of events to add event owner into assignement table
 MigrationEventsContact=Migration of events to add event contact into assignement table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 ShowNotAvailableOptions=Show not available options
diff --git a/htdocs/langs/lo_LA/ldap.lang b/htdocs/langs/lo_LA/ldap.lang
index d6360f3e540..abe11602147 100644
--- a/htdocs/langs/lo_LA/ldap.lang
+++ b/htdocs/langs/lo_LA/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Password for domain
 YouMustChangePassNextLogon=Password for user <b>%s</b> on the domain <b>%s</b> must be changed.
 UserMustChangePassNextLogon=User must change password on the domain %s
 LDAPInformationsForThisContact=Information in LDAP database for this contact
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Member type synchronized
 ContactSynchronized=Contact synchronized
 ForceSynchronize=Force synchronizing Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Failed to read LDAP database. Check LDAP module setup and database accessibility.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/lo_LA/loan.lang b/htdocs/langs/lo_LA/loan.lang
index 9aae3869cc3..534dee08867 100644
--- a/htdocs/langs/lo_LA/loan.lang
+++ b/htdocs/langs/lo_LA/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=Capital
 Insurance=Insurance
 Interest=Interest
 Nbterms=Number of terms
+Term=Term
 LoanAccountancyCapitalCode=Accounting account capital
 LoanAccountancyInsuranceCode=Accounting account insurance
 LoanAccountancyInterestCode=Accounting account interest
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=Confirm deleting this loan
 LoanDeleted=Loan Deleted Successfully
 ConfirmPayLoan=Confirm classify paid this loan
 LoanPaid=Loan Paid
-# Calc
-LoanCalc=Bank Loans Calculator
-PurchaseFinanceInfo=Purchase & Financing Information
-SalePriceOfAsset=Sale Price of Asset
-PercentageDown=Percentage Down
-LengthOfMortgage=Duration of loan
-AnnualInterestRate=Annual Interest Rate
-ExplainCalculations=Explain Calculations
-ShowMeCalculationsAndAmortization=Show me the calculations and amortization
-MortgagePaymentInformation=Mortgage Payment Information
-DownPayment=Down Payment
-DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
-InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
-MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
-MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
-MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
-MonthlyPaymentDesc=The montly payment is figured out using the following formula
-AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
-AmountFinanced=Amount Financed
-AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
-Totalsforyear=Totals for year
-MonthlyPayment=Monthly Payment
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
-GoToInterest=%s will go towards INTEREST
-GoToPrincipal=%s will go towards PRINCIPAL
-YouWillSpend=You will spend %s in year %s
 ListLoanAssociatedProject=List of loan associated with the project
 AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Interest
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-FinancialCommitment=Financial commitment
 CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/langs/lo_LA/mails.lang b/htdocs/langs/lo_LA/mails.lang
index cedcd01066b..2313910de93 100644
--- a/htdocs/langs/lo_LA/mails.lang
+++ b/htdocs/langs/lo_LA/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Sender
 MailErrorsTo=Errors to
 MailReply=Reply to
 MailTo=Receiver(s)
+MailToUsers=To user(s)
 MailCC=Copy to
+MailToCCUsers=Copy to users(s)
 MailCCC=Cached copy to
 MailTopic=EMail topic
 MailText=Message
@@ -164,4 +166,4 @@ InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/lo_LA/main.lang b/htdocs/langs/lo_LA/main.lang
index dd580ff3688..15da1239d5a 100644
--- a/htdocs/langs/lo_LA/main.lang
+++ b/htdocs/langs/lo_LA/main.lang
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is se
 Administrator=Administrator
 Undefined=Undefined
 PasswordForgotten=Password forgotten?
+NoAccount=No account?
 SeeAbove=See above
 HomeArea=Home area
 LastConnexion=Latest connection
@@ -231,7 +232,7 @@ Limit=Limit
 Limits=Limits
 Logout=Logout
 NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Connection
+Connection=Login
 Setup=Setup
 Alert=Alert
 MenuWarnings=Alerts
@@ -402,6 +403,7 @@ DefaultTaxRate=Default tax rate
 Average=Average
 Sum=Sum
 Delta=Delta
+RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
@@ -414,7 +416,7 @@ Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
 ExternalRef=Ref. extern
-RefSupplier=Ref. supplier
+RefSupplier=Ref. vendor
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
 Comment=Comment
@@ -493,7 +495,7 @@ Received=Received
 Paid=Paid
 Topic=Subject
 ByCompanies=By third parties
-ByUsers=By users
+ByUsers=By user
 Links=Links
 Link=Link
 Rejects=Rejects
@@ -619,9 +621,9 @@ BuildDoc=Build Doc
 Entity=Environment
 Entities=Entities
 CustomerPreview=Customer preview
-SupplierPreview=Supplier preview
+SupplierPreview=Vendor preview
 ShowCustomerPreview=Show customer preview
-ShowSupplierPreview=Show supplier preview
+ShowSupplierPreview=Show vendor preview
 RefCustomer=Ref. customer
 Currency=Currency
 InfoAdmin=Information for administrators
@@ -679,7 +681,7 @@ Color=Color
 Documents=Linked files
 Documents2=Documents
 UploadDisabled=Upload disabled
-MenuAccountancy=Accountancy
+MenuAccountancy=ບັນ​ຊີ
 MenuECM=Documents
 MenuAWStats=AWStats
 MenuMembers=Members
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=Products or services
 SearchIntoProjects=Projects
 SearchIntoTasks=Tasks
 SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Interventions
 SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
@@ -941,3 +943,5 @@ Remote=Remote
 LocalAndRemote=Local and Remote
 KeyboardShortcut=Keyboard shortcut
 AssignedTo=Assigned to
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/lo_LA/margins.lang b/htdocs/langs/lo_LA/margins.lang
index 9f590ef3718..b9d52dcfdc6 100644
--- a/htdocs/langs/lo_LA/margins.lang
+++ b/htdocs/langs/lo_LA/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=As a service
 UseDiscountOnTotal=On subtotal
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
 MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best supplier price
+MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Cost price
 UnitCharges=Unit charges
 Charges=Charges
diff --git a/htdocs/langs/lo_LA/members.lang b/htdocs/langs/lo_LA/members.lang
index e48b158aea9..a735663149c 100644
--- a/htdocs/langs/lo_LA/members.lang
+++ b/htdocs/langs/lo_LA/members.lang
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
diff --git a/htdocs/langs/lo_LA/opensurvey.lang b/htdocs/langs/lo_LA/opensurvey.lang
index 87e6a74913a..76684955e56 100644
--- a/htdocs/langs/lo_LA/opensurvey.lang
+++ b/htdocs/langs/lo_LA/opensurvey.lang
@@ -58,3 +58,4 @@ MoreChoices=Enter more choices for the voters
 SurveyExpiredInfo=The poll has been closed or voting delay has expired.
 EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
 ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/lo_LA/orders.lang b/htdocs/langs/lo_LA/orders.lang
index 8de0279be44..1b36a25df66 100644
--- a/htdocs/langs/lo_LA/orders.lang
+++ b/htdocs/langs/lo_LA/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Customers orders area
-SuppliersOrdersArea=Suppliers orders area
+SuppliersOrdersArea=Purchase orders area
 OrderCard=Order card
 OrderId=Order Id
 Order=Order
@@ -13,18 +13,18 @@ OrderToProcess=Order to process
 NewOrder=New order
 ToOrder=Make order
 MakeOrder=Make order
-SupplierOrder=Supplier order
-SuppliersOrders=Suppliers orders
-SuppliersOrdersRunning=Current suppliers orders
-CustomerOrder=Customer order
-CustomersOrders=Customer orders
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=Customer Order
+CustomersOrders=Customer Orders
 CustomersOrdersRunning=Current customer orders
 CustomersOrdersAndOrdersLines=Customer orders and order lines
 OrdersDeliveredToBill=Customer orders delivered to bill
 OrdersToBill=Customer orders delivered
 OrdersInProcess=Customer orders in process
 OrdersToProcess=Customer orders to process
-SuppliersOrdersToProcess=Supplier orders to process
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=Canceled
 StatusOrderDraftShort=Draft
 StatusOrderValidatedShort=Validated
@@ -75,15 +75,15 @@ ShowOrder=Show order
 OrdersOpened=Orders to process
 NoDraftOrders=No draft orders
 NoOrder=No order
-NoSupplierOrder=No supplier order
+NoSupplierOrder=No purchase order
 LastOrders=Latest %s customer orders
 LastCustomerOrders=Latest %s customer orders
-LastSupplierOrders=Latest %s supplier orders
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=Latest %s modified orders
 AllOrders=All orders
 NbOfOrders=Number of orders
 OrdersStatistics=Order's statistics
-OrdersStatisticsSuppliers=Supplier order's statistics
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Number of orders by month
 AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
 ListOfOrders=List of orders
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</
 GenerateBill=Generate invoice
 ClassifyShipped=Classify delivered
 DraftOrders=Draft orders
-DraftSuppliersOrders=Draft suppliers orders
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=In process orders
 RefOrder=Ref. order
 RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for supplier
-RefOrderSupplierShort=Ref. order supplier
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=Send order by mail
 ActionsOnOrder=Events on order
 NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
 DispatchSupplierOrder=Receiving supplier order %s
 FirstApprovalAlreadyDone=First approval already done
 SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=Supplier order %s received %s
-SupplierOrderSubmitedInDolibarr=Supplier order %s submited
-SupplierOrderClassifiedBilled=Supplier order %s set billed
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Other orders
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
@@ -125,11 +125,11 @@ TypeContact_commande_internal_SHIPPING=Representative following-up shipping
 TypeContact_commande_external_BILLING=Customer invoice contact
 TypeContact_commande_external_SHIPPING=Customer shipping contact
 TypeContact_commande_external_CUSTOMER=Customer contact following-up order
-TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
-TypeContact_order_supplier_external_BILLING=Supplier invoice contact
-TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact
-TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
 Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
 Error_OrderNotChecked=No orders to invoice selected
diff --git a/htdocs/langs/lo_LA/other.lang b/htdocs/langs/lo_LA/other.lang
index 7b1788dd310..00858ef86e3 100644
--- a/htdocs/langs/lo_LA/other.lang
+++ b/htdocs/langs/lo_LA/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=Files is too big
 PleaseBePatient=Please be patient...
 NewPassword=New password
 ResetPassword=Reset password
-RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
@@ -233,6 +233,8 @@ PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=Exports area
 AvailableFormats=Available formats
diff --git a/htdocs/langs/lo_LA/productbatch.lang b/htdocs/langs/lo_LA/productbatch.lang
index 1c2d22395ce..54270c4a23b 100644
--- a/htdocs/langs/lo_LA/productbatch.lang
+++ b/htdocs/langs/lo_LA/productbatch.lang
@@ -16,7 +16,7 @@ printEatby=Eat-by: %s
 printSellby=Sell-by: %s
 printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic increase/decrease stock mode is forced to shipping validate and manual dispatching for reception and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
 ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
diff --git a/htdocs/langs/lo_LA/products.lang b/htdocs/langs/lo_LA/products.lang
index 6a686114e45..22ae3802c6e 100644
--- a/htdocs/langs/lo_LA/products.lang
+++ b/htdocs/langs/lo_LA/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
 MinPrice=Min. selling price
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
 ContractStatusClosed=Closed
 ErrorProductAlreadyExists=A product with reference %s already exists.
@@ -155,7 +156,7 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Supplier prices
 SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
-CustomCode=Customs/Commodity/HS code
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
 Nature=Nature
 ShortLabel=Short label
diff --git a/htdocs/langs/lo_LA/projects.lang b/htdocs/langs/lo_LA/projects.lang
index 80d580263a3..c1e25abe41f 100644
--- a/htdocs/langs/lo_LA/projects.lang
+++ b/htdocs/langs/lo_LA/projects.lang
@@ -77,6 +77,7 @@ Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer orders associated with the project
@@ -226,4 +227,4 @@ AllowCommentOnProject=Allow user comments on projects
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/lo_LA/stocks.lang b/htdocs/langs/lo_LA/stocks.lang
index e6f0325bae1..fa4a68e8fa4 100644
--- a/htdocs/langs/lo_LA/stocks.lang
+++ b/htdocs/langs/lo_LA/stocks.lang
@@ -203,3 +203,4 @@ RegulateStock=Regulate Stock
 ListInventory=ລາຍການ
 StockSupportServices=Stock management support services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/lo_LA/stripe.lang b/htdocs/langs/lo_LA/stripe.lang
index 9fb2fa45113..6fa072b4c9a 100644
--- a/htdocs/langs/lo_LA/stripe.lang
+++ b/htdocs/langs/lo_LA/stripe.lang
@@ -58,8 +58,8 @@ NameOnCard=Name on card
 CardNumber=Card Number
 ExpiryDate=Expiry Date
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/lo_LA/supplier_proposal.lang b/htdocs/langs/lo_LA/supplier_proposal.lang
index d5b51978920..ef2e7242e31 100644
--- a/htdocs/langs/lo_LA/supplier_proposal.lang
+++ b/htdocs/langs/lo_LA/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Supplier commercial proposals
-supplier_proposalDESC=Manage price requests to suppliers
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
 SupplierProposalNew=New price request
 CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
-SupplierProposalsDraft=Draft supplier proposals
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=Latest %s modified price requests
 RequestsOpened=Open price requests
-SupplierProposalArea=Supplier proposals area
-SupplierProposalShort=Supplier proposal
-SupplierProposals=Supplier proposals
-SupplierProposalsShort=Supplier proposals
+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=Supplier ref
+SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=Delivery date
 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>?
@@ -47,9 +47,9 @@ CommercialAsk=Price request
 DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposals=List of supplier proposal requests
-ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
-SupplierProposalsToClose=Supplier proposals to close
-SupplierProposalsToProcess=Supplier proposals to process
+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
diff --git a/htdocs/langs/lo_LA/suppliers.lang b/htdocs/langs/lo_LA/suppliers.lang
index f9e383e09af..d0cf540d3eb 100644
--- a/htdocs/langs/lo_LA/suppliers.lang
+++ b/htdocs/langs/lo_LA/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Suppliers
-SuppliersInvoice=Suppliers invoice
-ShowSupplierInvoice=Show Supplier Invoice
-NewSupplier=New supplier
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=History
-ListOfSuppliers=List of suppliers
-ShowSupplier=Show supplier
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=Order date
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
-SupplierPrices=Supplier prices
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
-NoRecordedSuppliers=No suppliers recorded
-SupplierPayment=Supplier payment
-SuppliersArea=Suppliers area
-RefSupplierShort=Ref. supplier
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=Availability
-ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
-ExportDataset_fournisseur_2=Supplier invoices and payments
-ExportDataset_fournisseur_3=Supplier orders and order lines
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=Approve this order
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
 ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
 ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
-AddSupplierOrder=Create supplier order
-AddSupplierInvoice=Create supplier invoice
-ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
-SentToSuppliers=Sent to suppliers
-ListOfSupplierOrders=List of supplier orders
-MenuOrdersSupplierToBill=Supplier orders to invoice
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-SupplierReputation=Supplier reputation
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
 AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=Supplier prices
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/lo_LA/website.lang b/htdocs/langs/lo_LA/website.lang
index 0350da13f8f..0f0673e3716 100644
--- a/htdocs/langs/lo_LA/website.lang
+++ b/htdocs/langs/lo_LA/website.lang
@@ -73,7 +73,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
diff --git a/htdocs/langs/lo_LA/workflow.lang b/htdocs/langs/lo_LA/workflow.lang
index a50bd91595b..783373ad66d 100644
--- a/htdocs/langs/lo_LA/workflow.lang
+++ b/htdocs/langs/lo_LA/workflow.lang
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source custome
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/lt_LT/accountancy.lang b/htdocs/langs/lt_LT/accountancy.lang
index 7c2f3efd81f..804d9907a5a 100644
--- a/htdocs/langs/lt_LT/accountancy.lang
+++ b/htdocs/langs/lt_LT/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Apskaita
 ACCOUNTING_EXPORT_SEPARATORCSV=Stulpelių atskyriklis eksportuojamam failui
 ACCOUNTING_EXPORT_DATE=Datos formatas exportuojam failui
 ACCOUNTING_EXPORT_PIECE=Exportuoti vienetų skaičių
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Accounts with non zero values
 ListOfAccounts=List of accounts
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers 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
 
-AccountancyArea=Accountancy area
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
 AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
@@ -89,7 +90,7 @@ MenuProductsAccounts=Product accounts
 ProductsBinding=Products accounts
 Ventilation=Binding to accounts
 CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Supplier invoice binding
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=Pirkimų žurnalas
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Įvairiarūšis žurnalas
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Socialinis žurnalas
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
 ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
@@ -185,11 +187,12 @@ ListeMvts=List of movements
 ErrorDebitCredit=Debetas ir Kreditas negali turėti reikšmę tuo pačiu metu,
 AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
-DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=Apskaitos sąskaitų sąrašas
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Group of account
 Pcgsubtype=Subgroup of account
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
 ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
 DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report 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 fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -293,4 +296,9 @@ Binded=Lines bound
 ToBind=Lines to bind
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang
index 8c0dd7ed004..b2159ff482e 100644
--- a/htdocs/langs/lt_LT/admin.lang
+++ b/htdocs/langs/lt_LT/admin.lang
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS host (pagal nutylėjimą php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS jungtis (port) (neapibrėžtas PHP Unix tipo sistemose)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS host (neapibrėžtas PHP Unix tipo sistemose)
 MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= Sistemingai siųsti visų išsiųstų laiškų paslėptas kopijas BCC į 
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=El. pašto siuntimui naudoti metodą
 MAIN_MAIL_SMTPS_ID=SMTP ID, jei reikalingas autentiškumo patvirtinimas
 MAIN_MAIL_SMTPS_PW=SMTP slaptažodis, jei reikalingas autentiškumo patvirtinimas
@@ -291,7 +292,7 @@ ModuleSetup=Modulio nuostatos
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=Sistema
 ModuleFamilyCrm=Ryšių su klientais valdymas (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projektai/Bendradarbiavimas
@@ -373,7 +374,8 @@ NoSmsEngine=SMS siuntėjo vadovas neprieinamas. SMS siuntėjo vadovas nėra įdi
 PDF=PDF
 PDFDesc=Galite nustatyti kiekvieną bendrą opciją, susijusią su PDF generavimu
 PDFAddressForging=Adresų dėžutės sudarymo taisyklės
-HideAnyVATInformationOnPDF=Generuojamuose PDF paslėpti visą informaciją, susijusią su PVM
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=Generuojamuose PDF paslėpti produktų aprašymus
@@ -445,7 +447,8 @@ DisplayCompanyInfo=Display company address
 DisplayCompanyManagers=Display manager names
 DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party 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.
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Set this to 1 if you want to attach main document to emai
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=Vartotojai ir grupės
 Module0Desc=Users / Employees and Groups management
@@ -479,7 +485,7 @@ Module1Desc=Įmonių ir kontaktų valdymas (klientų, perspektyvų...)
 Module2Name=Prekybos
 Module2Desc=Komercinis valdymas
 Module10Name=Apskaita
-Module10Desc=Paprastos apskaitos ataskaitos (žurnalai, apyvartos), paremtos duomenų bazės turiniu. Nėra sąryšio.
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=Pasiūlymai
 Module20Desc=Komercinių pasiūlymų valdymas
 Module22Name=Masiniai el. laiškai
@@ -546,8 +552,8 @@ Module400Name=Projektai / Galimybės / Iniciatyvos
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Web kalendorius
 Module410Desc=Web kalendoriaus integracija
-Module500Name=Specialios išlaidos
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Payment of employee wages
 Module510Desc=Record and follow payment of your employee wages
 Module520Name=Paskola
@@ -561,14 +567,14 @@ Module700Name=Parama
 Module700Desc=Paramos valdymas
 Module770Name=Išlaidų ataskaitos
 Module770Desc=Valdymo ir pretenzijų išlaidų ataskaitos (transportas, maistas, ...)
-Module1120Name=Tiekėjo komercinis pasiūlymas
-Module1120Desc=Prašyti tiekėjo komercinio pasiūlymo ir kainų
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Mančio integracija
 Module1520Name=Dokumento generavimas
 Module1520Desc=Masinis pašto dokumentų generavimas
 Module1780Name=Žymės / Kategorijos
-Module1780Desc=Sukurti žymes/kategorijas (produktai, klientai, tiekėjai, kontaktai ar nariai)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=WYSIWYG redaktorius
 Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
 Module2200Name=Dinaminės kainos
@@ -576,7 +582,7 @@ Module2200Desc=Nustatyti matematinių išraiškų naudojimą kainose
 Module2300Name=Suplanuoti darbai
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API/Web services (SOAP server)
@@ -613,7 +619,7 @@ Module50100Desc=Point of sales module (POS).
 Module50200Name=PayPal
 Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 Module50400Name=Apskaita (Išankstinė)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Poll, Survey or Vote
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=Vėlavimo tolerancija (dienų) prieš perspėjimą dė
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Vėlavimo tolerancija (dienų) prieš perspėjimą dėl čekių depozito įvykdymo
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=Kiti meniu įrašai valdo laisvai pasirenkamus (optional) parametrus.
 LogEvents=Saugumo audito įvykiai
 Audit=Auditas
@@ -1054,8 +1060,9 @@ LogEventDesc=Čia galite leisti prisijungimą prie Dolibarr saugumo įvykių. Ad
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Sistemos informacija yra įvairi techninė informacija, kurią gausite tik skaitymo režimu, ir bus matoma tik sistemos administratoriams.
 SystemAreaForAdminOnly=Ši sritis yra skirta tik administratoriams. Nė vienas iš Dolibarr leidimų negali sumažinti šio apribojimo.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=Čia galite rinktis ir keisti kiekvieną parametrą, susijusį su Dolibarr grafiniu vaizdu.
 AvailableModules=Available app/modules
 ToActivateModule=Norint įjungti modulius, reikia eiti į Nuostatų meniu (Pagrindinis-> Nuostatos-> Moduliai).
@@ -1188,11 +1195,11 @@ UserMailRequired=Naujo vartotojo sukūrimui reikalingas el. paštas
 HRMSetup=HRM module setup
 ##### Company setup #####
 CompanySetup=Įmonių modulio nuostatos
-CompanyCodeChecker=Trečiųjų šalių modulio kodo generavimas ir tikrinimas (klientas ar tiekėjas)
-AccountCodeManager=Module for accounting code generation (customer or supplier)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
 NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
 ModelModules=Dokumentų šablonai
 DocumentModelOdt=Sukurti dokumentus pagal OpenDocuments šablonus (.ODT arba .OAM failus OpenOffice, KOffice, TextEdit, ...)
@@ -1203,6 +1210,9 @@ MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
 TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Eksporto nuorodą į <b>%s</b> formatą galima rasti šiuo adresu: %s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=Laisvas tekstas komerciniame pasiūlyme
 WatermarkOnDraftProposal=Vandens ženklas komercinių pasiūlymų projekte (nėra, jei lapas tuščias)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Klausti pasiūlyme esančios banko sąskaitos paskirties
 ##### SupplierProposal #####
-SupplierProposalSetup=Tiekėjų modulyje kainos prašymo nustatymas
-SupplierProposalNumberingModules=Tiekėjų modulyje kainos prašymų numeracijos modeliai
-SupplierProposalPDFModules=Tiekėjų modulyje kainos prašymų dokumentų modeliai
-FreeLegalTextOnSupplierProposal=Laisvas tekstas kainos prašymuose
-WatermarkOnDraftSupplierProposal=Vandens ženklas ant kainų prašymų tiekėjų (nėra jei tuščias)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Klausti banko sąskaitos paskirties ant kainos užklausos
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=Užsakymų valdymo nuostatos
 OrdersNumberingModules=Užsakymų numeracijos modeliai
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=Prisijungimas prie serverio '%s' duomenų bazėje "%s" su varto
 OSCommerceTestKo1=Prisijungimas prie serverio '%s' pavyko, bet duomenų bazė "%s" nepasiekiama.
 OSCommerceTestKo2=Prisijungimas prie serverio '%s' su vartotoju '%s' nepavyko.
 ##### Stock #####
-StockSetup=Sandėlio modulio nustatymai
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
 ##### Menu #####
 MenuDeleted=Meniu ištrintas
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
 MultiCompanySetup=Multi-įmonės modulio nustatymas
 ##### Suppliers #####
 SuppliersSetup=Tiekėjo modulio nustatymas
-SuppliersCommandModel=Pilnas tiekėjo užsakymo šablonas (logo. ..)
-SuppliersInvoiceModel=Pilnas tiekėjo sąskaitos-faktūros šablonas (logo. ..)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Tiekėjo sąskaitų-faktūrų numeracijos modeliai
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=Nenaudokite dviprasmiškų simbolių ("1", "L", "aš",
 SalariesSetup=Atlyginimų modulio nustatymai
 SortOrder=Rūšiavimo tvarka
 Format=Forma, pobūdis
-TypePaymentDesc=0: Kliento mokėjimo tipas, 1: Tiekėjo mokėjimo tipas, 2: Abiejų kliento ir tiekėjo mokėjimo tipas
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Įtraukti kelią (kaip apibrėžta kintamojo %s)
 ExpenseReportsSetup=Išlaidų ataskaitų modulio nustatymai
 TemplatePDFExpenseReports=Šablonai Išlaidų ataskaitų generavimui
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Install of external module from applic
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
-TextTitleColor=Color of page title
+TextTitleColor=Text color of Page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=Background color for Top menu
 TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
 ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-MailToMember=To send email from member page
-MailToUser=To send email from user page
-MailToProject= To send email from project page
+MailToSendProposal=Customer proposals
+MailToSendOrder=Customer orders
+MailToSendInvoice=Customer invoices
+MailToSendShipment=Pakrovimai
+MailToSendIntervention=Intervencijos
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Sutartys
+MailToThirdparty=Trečiosios šalys
+MailToMember=Nariai
+MailToUser=Vartotojai
+MailToProject=Projects page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1780,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/lt_LT/bills.lang b/htdocs/langs/lt_LT/bills.lang
index 8ff3b0bef08..cbfce898c90 100644
--- a/htdocs/langs/lt_LT/bills.lang
+++ b/htdocs/langs/lt_LT/bills.lang
@@ -109,7 +109,7 @@ CancelBill=Atšaukti sąskaitą-faktūrą
 SendRemindByMail=Siųsti priminimą e-paštu
 DoPayment=Enter payment
 DoPaymentBack=Enter refund
-ConvertToReduc=Konvertuoti į ateities nuolaidą
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Įveskite gautą iš kliento mokėjimą
@@ -120,7 +120,7 @@ BillStatus=Sąskaitos-faktūros būklė
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Projektas (turi būti pripažintas galiojančiu)
 BillStatusPaid=Apmokėtas
-BillStatusPaidBackOrConverted=Credit note refund or converted into discount
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Neįvykęs
 BillStatusValidated=Pripažintas galiojančiu (turi būti apmokėtas)
@@ -296,10 +296,10 @@ DiscountType=Discount type
 NoteReason=Pastaba / Priežastis
 ReasonDiscount=Priežastis
 DiscountOfferedBy=Suteiktos
-DiscountStillRemaining=Discounts available
-DiscountAlreadyCounted=Discounts already consumed
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+SupplierDiscounts=Vendors discounts
 BillAddress=Sąskaitos adresas
 HelpEscompte=Ši nuolaida yra nuolaida suteikiama klientui, nes jo mokėjimas buvo atliktas prieš terminą.
 HelpAbandonBadCustomer=Šios sumos buvo atsisakyta (blogas klientas) ir ji yra laikoma išimtiniu nuostoliu.
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Every %s days
 FrequencyPer_m=Every %s months
 FrequencyPer_y=Every %s years
@@ -505,9 +511,14 @@ SituationAmount=Situation invoice amount(net)
 SituationDeduction=Situation subtraction
 ModifyAllLines=Modify all lines
 CreateNextSituationInvoice=Create next situation
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=Se
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
 NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
@@ -532,3 +543,4 @@ AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/lt_LT/categories.lang b/htdocs/langs/lt_LT/categories.lang
index ec7e8feeef2..eed01cc175d 100644
--- a/htdocs/langs/lt_LT/categories.lang
+++ b/htdocs/langs/lt_LT/categories.lang
@@ -16,7 +16,7 @@ MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
-SubCats=Subkategorijos
+SubCats=Sub-categories
 CatList=List of tags/categories
 NewCategory=New tag/category
 ModifCat=Modify tag/category
@@ -85,3 +85,4 @@ CategorieRecursivHelp=Jei įjungta, produktas taip pat susijęs su pirmine kateg
 AddProductServiceIntoCategory=Pridėti sekantį produktą / servisą
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
+ChooseCategory=Choose category
diff --git a/htdocs/langs/lt_LT/commercial.lang b/htdocs/langs/lt_LT/commercial.lang
index 809174dc819..9147927dfca 100644
--- a/htdocs/langs/lt_LT/commercial.lang
+++ b/htdocs/langs/lt_LT/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=Uždaryti
 ActionAC_EMAILING=Siųsti masinį e-laišką
 ActionAC_COM=Siųsti kliento užsakymą paštu
 ActionAC_SHIP=Siųsti pakrovimo dokumentus paštu
-ActionAC_SUP_ORD=Siųsti tiekėjo užsakymą paštu
-ActionAC_SUP_INV=Siųsti tiekėjo sąskaitą-faktūrą paštu
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=Kitas
 ActionAC_OTH_AUTO=Automatiškai įterpti įvykiai
 ActionAC_MANUAL=Rankiniu būdu įterpti įvykiai
diff --git a/htdocs/langs/lt_LT/companies.lang b/htdocs/langs/lt_LT/companies.lang
index dddf0eb74a2..3859d7b410b 100644
--- a/htdocs/langs/lt_LT/companies.lang
+++ b/htdocs/langs/lt_LT/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Are you sure you want to delete this contact and all inheri
 MenuNewThirdParty=Nauja trečioji šalis
 MenuNewCustomer=Naujas klientas
 MenuNewProspect=Naujas planas
-MenuNewSupplier=Naujas tiekėjas
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=Naujas privatus asmuo
-NewCompany=Nauja įmonė (planas, klientas, tiekėjas)
-NewThirdParty=Naujas trečioji šalis (planas, klientas, tiekėjas)
-CreateDolibarrThirdPartySupplier=Sukurti trečiąją šalį (tiekėją)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=Sukurti trečią šalį
 CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Numatoma sritis
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=Planai
 ThirdPartyCustomers=Klientai
 ThirdPartyCustomersStats=Klientai
 ThirdPartyCustomersWithIdProf12=Klientai su %s arba %s
-ThirdPartySuppliers=Tiekėjai
+ThirdPartySuppliers=Vendors
 ThirdPartyType=Trečioji šalis tipas
 Individual=Privatus asmuo
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
@@ -77,11 +77,11 @@ Web=WEB
 Poste= Pozicija
 DefaultLang=Kalba pagal nutylėjimą
 VATIsUsed=Sales tax is used
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
-ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Pasiūlymai
 OverAllOrders=Užsakymai
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=RE tipas
 TypeLocaltax2ES=IRPF tipas
 WrongCustomerCode=Klaidingas kliento kodas
-WrongSupplierCode=Klaidingas tiekėjo kodas
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Kliento kodo modelis
-SupplierCodeModel=Tiekėjo kodo modelis
+SupplierCodeModel=Vendor code model
 Gencod=Brūkšninis kodas
 ##### Professional ID #####
 ProfId1Short=Prof ID 1
@@ -267,7 +267,7 @@ Prospect=Planas
 CustomerCard=Kliento kortelė
 Customer=Klientas
 CustomerRelativeDiscount=Santykinė kliento nuolaida
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=Santykinė nuolaida
 CustomerAbsoluteDiscountShort=Absoliuti nuolaida
 CompanyHasRelativeDiscount=Šis klientas turi nuolaidą pagal nutylėjimą <b>%s%%</b>
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this suppl
 CompanyHasNoAbsoluteDiscount=Šis klientas neturi nuolaidų kreditų
 CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
 CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=Nė vienas
 Supplier=Tiekėjas
 AddContact=Sukurti kontaktą
@@ -304,13 +304,13 @@ DeleteACompany=Ištrinti įmonę
 PersonalInformations=Asmeniniai duomenys
 AccountancyCode=Apskaitos sąskaita
 CustomerCode=Kliento kodas
-SupplierCode=Tiekėjo kodas
+SupplierCode=Vendor code
 CustomerCodeShort=Kliento kodas
-SupplierCodeShort=Tiekėjo kodas
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=Kliento kodas, unikalus kiekvienam klientui
-SupplierCodeDesc=Tiekėjo kodas, unikalus kiekvienam tiekėjui
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=Būtina, jei trečioji šalis yra klientas arba kandidatas
-RequiredIfSupplier=Būtina, jei trečioji šalis yra tiekėjas
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=Galiojimas kontroliuojamas modulio
 ThisIsModuleRules=Šio modulio taisyklės
 ProspectToContact=Numatomas klientas susisiekti
@@ -338,7 +338,7 @@ MyContacts=Mano kontaktai
 Capital=Kapitalas
 CapitalOf=Kapitalas %s
 EditCompany=Redaguoti įmonę
-ThisUserIsNot=Šis vartotojas nėra numatomas klientas, klientas ar tiekėjas
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=Patikrinti
 VATIntraCheckDesc=Nuoroda <b>%s</b> leidžia paklausti Europos PVM tikrinimo paslaugas. Išorinė interneto prieiga iš serverio yra būtina.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -396,7 +396,7 @@ ImportDataset_company_4=Third parties/Sales representatives (Assign sales repres
 PriceLevel=Kainos lygis
 DeliveryAddress=Pristatymo adresas
 AddAddress=Pridėti adresą
-SupplierCategory=Tiekėjo kategorija
+SupplierCategory=Vendor category
 JuridicalStatus200=Independent
 DeleteFile=Ištrinti failą
 ConfirmDeleteFile=Ar tikrai norite ištrinti šį failą ?
@@ -406,7 +406,7 @@ FiscalYearInformation=Informacija apie finansinius metus
 FiscalMonthStart=Finansinių metų pirmas mėnuo
 YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
 YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
-ListSuppliersShort=Tiekėjų sąrašas
+ListSuppliersShort=List of vendors
 ListProspectsShort=Numatomų klientų sąrašas
 ListCustomersShort=Klientų sąrašas
 ThirdPartiesArea=Trečių šalių ir kontaktų sritis
@@ -420,7 +420,7 @@ CurrentOutstandingBill=Dabartinė neapmokėta sąskaita-faktūra
 OutstandingBill=Neapmokėtų sąskaitų-faktūrų maksimumas
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Gražinimo numeris formatu %syymm-nnnn kliento kodui ir %syymm-nnnn tiekėjo kodui, kur yy yra metai, mm yra mėnuo ir nnnn yra seka be pertrūkių ir be grąžinimo į 0.
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=Kodas yra nemokamas. Šis kodas gali būti modifikuotas bet kada.
 ManagingDirectors=Vadovo (-ų) pareigos (Vykdantysis direktorius (CEO), direktorius, prezidentas ...)
 MergeOriginThirdparty=Dubliuoti trečiąją šalį (trečiąją šalį, kurią norite ištrinti)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/lt_LT/compta.lang b/htdocs/langs/lt_LT/compta.lang
index 70f309b727f..62440f1f466 100644
--- a/htdocs/langs/lt_LT/compta.lang
+++ b/htdocs/langs/lt_LT/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=Grynasis apmokėtas
 VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
-VATSummary=Tax Balance
+VATSummary=Tax monthly
+VATBalance=Tax Balance
 VATPaid=Tax paid
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=Apskaitos/Iždo sritis
 NewPayment=Naujas mokėjimas
 Payments=Mokėjimai
 PaymentCustomerInvoice=Kliento sąskaitos-faktūros mokėjimas
-PaymentSupplierInvoice=Tiekėjo sąskaitos-faktūros apmokėjimas
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Socialinio / fiskalinio mokesčio mokėjimas
 PaymentVat=PVM mokėjimas
 ListPayment=Mokėjimų sąrašas
 ListOfCustomerPayments=Kliento mokėjimų sąrašas
-ListOfSupplierPayments=Tiekėjo mokėjimų sąrašas
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Periodo pradžios data
 DateEndPeriod=Periodo pabaigos data
 newLT1Payment=New tax 2 payment
@@ -110,7 +111,7 @@ ShowVatPayment=Rodyti PVM mokėjimą
 TotalToPay=Iš viso mokėti
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
 CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
 SupplierAccountancyCodeShort=Sup. account. code
 AccountNumber=Sąskaitos numeris
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Ataskaita pagal trečiosios šalies IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Ataskaita pagal Kliento gautą ir sumokėtą PVM
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Chart of accounts models
 Pcg_type=Pcg tipas
 Pcg_subtype=Pcg potipis
 InvoiceLinesToDispatch=Sąskaitos-faktūros eilutės išsiuntimui
-ByProductsAndServices=Pagal Produktus ir Paslaugas
+ByProductsAndServices=By product and service
 RefExt=Išorinė nuoroda
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
 LinkedOrder=Link to order
@@ -215,7 +218,8 @@ Mode1=Metodas 1
 Mode2=Metodas 2
 CalculationRuleDesc=Norint skaičiuoti visą PVM, yra du būdai:<br>Metodas 1 apvalina PVM kiekvienoje eilutėje, tada sudeda juos.<br>Metodas 2 sudeda visus PVM kiekvienoje eilutėje, tada rezultatą apvalina.<br>Galutinis rezultatas gali skirtis nuo kelių centų. Metodas pagal nutylėjimą yra <b>%s</b>.
 CalculationRuleDescSupplier=According to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Apyvartos ataskaita pagal produktą, kai naudojamas <b>Pinigų apskaita</b> būdas nėra tinkamas. Ši ataskaita yra prieinama tik tada, kai naudojama <b>Įsipareigojimų apskaita</b> režimas (žr. Apskaitos modulio nustatymus).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Skaičiavimo metodas
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
@@ -242,3 +246,10 @@ FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/lt_LT/dict.lang b/htdocs/langs/lt_LT/dict.lang
index ee6ecc422ab..feace182fd5 100644
--- a/htdocs/langs/lt_LT/dict.lang
+++ b/htdocs/langs/lt_LT/dict.lang
@@ -5,7 +5,8 @@ CountryIT=Italija
 CountryES=Ispanija
 CountryDE=Vokietija
 CountryCH=Šveicarija
-CountryGB=Didžioji Britanija
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=Jungtinė Karalystė
 CountryUK=Jungtinė Karalystė
 CountryIE=Airija
 CountryCN=Kinija
diff --git a/htdocs/langs/lt_LT/ecm.lang b/htdocs/langs/lt_LT/ecm.lang
index 2ca5985e3a6..eb5690552a6 100644
--- a/htdocs/langs/lt_LT/ecm.lang
+++ b/htdocs/langs/lt_LT/ecm.lang
@@ -39,9 +39,10 @@ ShowECMSection=Rodyti katalogą
 DeleteSection=Pašalinti katalogą
 ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
 ECMDirectoryForFiles=Susijęs failų katalogas
-CannotRemoveDirectoryContainsFiles=Pašalinimas negalimas, nes jame yra failų
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=Failų vadovas
-ECMSelectASection=Pasirinkite katalogą kairiajame medyje
+ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
diff --git a/htdocs/langs/lt_LT/errors.lang b/htdocs/langs/lt_LT/errors.lang
index 20d697d4d8e..b6277a20632 100644
--- a/htdocs/langs/lt_LT/errors.lang
+++ b/htdocs/langs/lt_LT/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Reikalingas brūkšninis kodas
 ErrorCustomerCodeAlreadyUsed=Kliento kodas jau naudojamas
 ErrorBarCodeAlreadyUsed=Brūkšninis kodas jau naudojamas
 ErrorPrefixRequired=Prefiksas reikalingas
-ErrorBadSupplierCodeSyntax=Bloga tiekėjo kodo sintaksė
-ErrorSupplierCodeRequired=Tiekėjo kodas reikalingas
-ErrorSupplierCodeAlreadyUsed=Tiekėjo kodas jau naudojamas
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Blogi parametrai
 ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
 ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
@@ -87,7 +87,7 @@ ErrorsOnXLines=Klaidos <b>%s</b> šaltinio įraše (-uose)
 ErrorFileIsInfectedWithAVirus=Antivirusinė programa negali patvirtinti failo (failas gali būti užkrėstas virusu)
 ErrorSpecialCharNotAllowedForField=Specialūs simboliai neleidžiami laukelyje "%s"
 ErrorNumRefModel=Nuoroda yra į duomenų bazę (%s) ir yra nesuderinama su šiomis numeravimo tasyklėmis. Pašalinkite įrašą arba pervadinkite nuorodą, kad aktyvuoti šį modulį.
-ErrorQtyTooLowForThisSupplier=Kiekis per maža šiam tiekėjui arba nėra nustatytos šio produkto apibrėžtos kainos šiam tiekėjui
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Maskavimo (mask) klaida
 ErrorBadMaskFailedToLocatePosOfSequence=Klaida, maskavimas be eilės numeris
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
-ErrorSupplierCountryIsNotDefined=Šio tiekėjo šalis nėra apibrėžta. Tai ištaisyti pirmiausia.
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
diff --git a/htdocs/langs/lt_LT/install.lang b/htdocs/langs/lt_LT/install.lang
index a0d76667593..05960c1b65b 100644
--- a/htdocs/langs/lt_LT/install.lang
+++ b/htdocs/langs/lt_LT/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=Konfigūracijos failas <b>%s</b> neegz
 ConfFileCouldBeCreated=Konfigūracijos failas <b>%s</b> gali būti sukurtas.
 ConfFileIsNotWritable=Konfigūracijos failas <b>%s</b> neįrašomas. Patikrinti leidimus. Diegiant pirmą kartą Jūsų serveris turi būti pajėgus įrašyti į šį failą konfigūracijos proceso metu ("chmod 666", pavyzdžiui Unix tipo OS).
 ConfFileIsWritable=Konfigūracijos failas <b>%s</b> įrašomas.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Perkrauti visą informaciją iš konfigūracijos failo.
 PHPSupportSessions=Šis PHP palaiko sesijas.
 PHPSupportPOSTGETOk=Šis PHP palaiko kintamuosius POST ir GET.
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
 WarningRemoveInstallDir=Įspėjimas. Dėl saugumo priežasčių, kai įdiegimas ar atnaujinimas baigtas, kad būtų išvengta diegimo iš naujo, turėtumėte pridėti failą pavadinimu <b>install.lock</b> į Dolibarr dokumentų aplanką, siekiant išvengti neteisingo jo naudojimo.
 FunctionNotAvailableInThisPHP=Negalimas su šiuo PHP
 ChoosedMigrateScript=Pasirinkite migracijos skriptą
-DataMigration=Duomenų migracija
-DatabaseMigration=Struktūra duomenų bazės migracijai
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Skriptas vykdomas
 ChooseYourSetupMode=Pasirinkite nustatymų režimą ir spauskite "Start" ...
 FreshInstall=Naujas diegimas
@@ -146,7 +147,7 @@ NothingToDo=Nothing to do
 # upgrade
 MigrationFixData=Fiksuoti pažeistus duomenis
 MigrationOrder=Klientų užsakymų duomenų perkėlimas
-MigrationSupplierOrder=Tiekėjų užsakymų duomenų perkėlimas
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Komercinių pasiūlymų duomenų perkėlimas
 MigrationInvoice=Klientų sąskaitų-faktūrų duomenų perkėlimas
 MigrationContract=Sutarčių duomenų perkėlimas
@@ -196,6 +197,8 @@ MigrationEvents=Įvykių migracija pridedant įvykio savininką į užduočių l
 MigrationEventsContact=Migration of events to add event contact into assignement table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
 MigrationReloadModule=Perkrauti modulį %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 ShowNotAvailableOptions=Parodyti negalimas opcijas
diff --git a/htdocs/langs/lt_LT/ldap.lang b/htdocs/langs/lt_LT/ldap.lang
index c31adbbb8ef..b54ec6b5d87 100644
--- a/htdocs/langs/lt_LT/ldap.lang
+++ b/htdocs/langs/lt_LT/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Slaptažodis domenui
 YouMustChangePassNextLogon=Slaptažodis vartotojui <b>%s</b> domene <b>%s</b> turi būti pakeistas.
 UserMustChangePassNextLogon=Vartotojas turi pakeisti slaptažodį domene %s
 LDAPInformationsForThisContact=Informacija LDAP duomenų bazėje šiam kontaktui
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Member type synchronized
 ContactSynchronized=Kontaktas sinchronizuotas
 ForceSynchronize=Pgreitintas sinchronizavimas Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Nepavyko nuskaityti LDAP duomenų bazės. Patikrinkite LDAP modulio nustatymus ir duomenų bazės prieinamumą.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/lt_LT/loan.lang b/htdocs/langs/lt_LT/loan.lang
index aef2d023357..b560d99177d 100644
--- a/htdocs/langs/lt_LT/loan.lang
+++ b/htdocs/langs/lt_LT/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=Kapitalas
 Insurance=Draudimas
 Interest=Palūkanos
 Nbterms=Sąlygos numeris
+Term=Term
 LoanAccountancyCapitalCode=Accounting account capital
 LoanAccountancyInsuranceCode=Accounting account insurance
 LoanAccountancyInterestCode=Accounting account interest
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=Patvirtinti šios paskolos panaikinimą
 LoanDeleted=Skola sėkmingai panaikinta 
 ConfirmPayLoan=Patvirtinti paskolos priskyrimą prie apmokėtų
 LoanPaid=Paskola grąžinta
-# Calc
-LoanCalc=Banko paskolų skaičiuoklė
-PurchaseFinanceInfo=Pirkimo ir finansavimo informacija
-SalePriceOfAsset=Turto pardavimo kaina
-PercentageDown=Procentų sumažėjimas
-LengthOfMortgage=Duration of loan
-AnnualInterestRate=Metinė palūkanų norma
-ExplainCalculations=Paaiškinti skaičiavimus
-ShowMeCalculationsAndAmortization=Parodyti skaičiavimus ir amortizaciją
-MortgagePaymentInformation=Įkeisto turto apmokėjimo informacija
-DownPayment=Pradinis mokėjimas
-DownPaymentDesc=<b>Pradinė įmoka</b> = Būsto kaina x procentų sumažėjimo / 100 ( 5% sumažėjimui yra 5/100 or 0.05)
-InterestRateDesc=<b>Palūkanų rodiklis</b> = Metinė palūkanų norma % / 100
-MonthlyFactorDesc=<b>Mėnesio faktorius</b> = Sekančios formulės rezultatas
-MonthlyInterestRateDesc=<b>Mėnesio palūkanų norma</b> = Metinė palūkanų norma / 12
-MonthTermDesc=<b>Mėnesių skaičius</b> = Paskolos metų skaičius x 12
-MonthlyPaymentDesc=Mėnesinė įmoka nustatoma pagal sekančią formulę
-AmortizationPaymentDesc=<a href="#amortizacija">amortizacija</a> parodo kokia mėnesinės įmokos dalis skiriama banko plaūkanoms ir kokia dalis - paskolos dengimui.
-AmountFinanced=Finansuota suma
-AmortizationMonthlyPaymentOverYears=Mėnesinės įmokos amortizacija: <b>%s</b> per %s metų
-Totalsforyear=Iš viso per metus
-MonthlyPayment=Mėnesinė įmoka
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
-GoToInterest=%s skiriama PALŪKANOMS
-GoToPrincipal=%s skiriama PASKOLOS GRĄŽINIMUI
-YouWillSpend=You will spend %s in year %s
 ListLoanAssociatedProject=List of loan associated with the project
 AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Palūkanos
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=Paskolos modulio konfigūracija
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-FinancialCommitment=Financial commitment
 CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/langs/lt_LT/mails.lang b/htdocs/langs/lt_LT/mails.lang
index 17a0b1feaad..c926c861083 100644
--- a/htdocs/langs/lt_LT/mails.lang
+++ b/htdocs/langs/lt_LT/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Siuntėjas
 MailErrorsTo=Klaidos
 MailReply=Atsakyti
 MailTo=Gavėjas (-ai)
+MailToUsers=To user(s)
 MailCC=Kopijuoti į
+MailToCCUsers=Copy to users(s)
 MailCCC=Sparčiosios tarpinės atminties (cache) kopija į
 MailTopic=E-pašto viršus
 MailText=Pranešimas
@@ -164,4 +166,4 @@ InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Informacija
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/lt_LT/main.lang b/htdocs/langs/lt_LT/main.lang
index ed03916ad6f..616d9c9967d 100644
--- a/htdocs/langs/lt_LT/main.lang
+++ b/htdocs/langs/lt_LT/main.lang
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is se
 Administrator=Administratorius
 Undefined=Neapibrėžtas
 PasswordForgotten=Password forgotten?
+NoAccount=No account?
 SeeAbove=Žiūrėti aukščiau
 HomeArea=Pagrindinė sritis
 LastConnexion=Latest connection
@@ -231,7 +232,7 @@ Limit=Riba
 Limits=Ribos
 Logout=Atsijungti
 NoLogoutProcessWithAuthMode=Nėra tinkamos atjungimo funkcijos su autentifikavimo režimu <b>%s</b>
-Connection=Sujungimas
+Connection=Prisijungimas
 Setup=Nustatymai
 Alert=Įspėjimas
 MenuWarnings=Įspėjimai
@@ -402,6 +403,7 @@ DefaultTaxRate=Default tax rate
 Average=Vidutinis
 Sum=Suma
 Delta=Delta
+RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Opcija
@@ -414,7 +416,7 @@ Favorite=Favoritas
 ShortInfo=Informacija
 Ref=Nuoroda
 ExternalRef=Nuoroda išorinė
-RefSupplier=Tiekėjo nuoroda
+RefSupplier=Ref. vendor
 RefPayment=Mokėjimo nuoroda
 CommercialProposalsShort=Komerciniai pasiūlymai
 Comment=Komentaras
@@ -493,7 +495,7 @@ Received=Gautas
 Paid=Apmokėtas
 Topic=Subject
 ByCompanies=Trečiųjų šalių
-ByUsers=Vartotojų
+ByUsers=By user
 Links=Saitai
 Link=Saitas
 Rejects=Atmetimai
@@ -619,9 +621,9 @@ BuildDoc=Sukurti DOC
 Entity=Aplinka
 Entities=Subjektai
 CustomerPreview=Kliento peržiūra
-SupplierPreview=Tiekėjo peržiūra
+SupplierPreview=Vendor preview
 ShowCustomerPreview=Rodyti Kliento peržiūrą
-ShowSupplierPreview=Rodyti Tiekėjo peržiūrą
+ShowSupplierPreview=Show vendor preview
 RefCustomer=Kliento nuoroda
 Currency=Valiuta
 InfoAdmin=Informacija administratoriams
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=Products or services
 SearchIntoProjects=Projektai
 SearchIntoTasks=Uždaviniai
 SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Intervencijos
 SearchIntoContracts=Sutartys
 SearchIntoCustomerShipments=Customer shipments
@@ -941,3 +943,5 @@ Remote=Remote
 LocalAndRemote=Local and Remote
 KeyboardShortcut=Keyboard shortcut
 AssignedTo=Priskirtas
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/lt_LT/margins.lang b/htdocs/langs/lt_LT/margins.lang
index 719b2b4d672..6f4906fd592 100644
--- a/htdocs/langs/lt_LT/margins.lang
+++ b/htdocs/langs/lt_LT/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=Kaip paslauga
 UseDiscountOnTotal=Tarpinė suma
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Apibrėžia, ar visuotinė nuolaida yra traktuojama kaip produktas, kaip paslaugos ar tik tarpinė sumamaržos skaičiavimui.
 MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best supplier price
+MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Savikaina
 UnitCharges=Vieneto sąnaudos
 Charges=Sąnaudos
diff --git a/htdocs/langs/lt_LT/members.lang b/htdocs/langs/lt_LT/members.lang
index 69a10185d57..580576f3203 100644
--- a/htdocs/langs/lt_LT/members.lang
+++ b/htdocs/langs/lt_LT/members.lang
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
diff --git a/htdocs/langs/lt_LT/opensurvey.lang b/htdocs/langs/lt_LT/opensurvey.lang
index 90fe3ff0c20..a5487491275 100644
--- a/htdocs/langs/lt_LT/opensurvey.lang
+++ b/htdocs/langs/lt_LT/opensurvey.lang
@@ -58,3 +58,4 @@ MoreChoices=Įveskite daugiau pasirinkimų balsuotojams
 SurveyExpiredInfo=Apklausa uždaryta arba baigiasi balsavimo laikas.
 EmailSomeoneVoted=%s užpildė eilutę.\nJūs galite rasti savo apklausą:\n%s
 ShowSurvey=Rodyti apklausą
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/lt_LT/orders.lang b/htdocs/langs/lt_LT/orders.lang
index e0257310163..a87350db19a 100644
--- a/htdocs/langs/lt_LT/orders.lang
+++ b/htdocs/langs/lt_LT/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Klientų užsakymų sritis
-SuppliersOrdersArea=Tiekėjų užsakymų sritis
+SuppliersOrdersArea=Purchase orders area
 OrderCard=Užsakyti kortelę
 OrderId=Užsakymo ID
 Order=Užsakymas
@@ -13,18 +13,18 @@ OrderToProcess=Užsakymo procesas
 NewOrder=Naujas užsakymas
 ToOrder=Sudaryti užsakymą
 MakeOrder=Sudaryti užsakymą
-SupplierOrder=Tiekėjo užsakymas
-SuppliersOrders=Tiekėjų užsakymai
-SuppliersOrdersRunning=Dabartiniai tiekėjų užsakymai
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=Kliento užsakymas
-CustomersOrders=Customer orders
+CustomersOrders=Klientų užsakymai
 CustomersOrdersRunning=Current customer orders
 CustomersOrdersAndOrdersLines=Customer orders and order lines
 OrdersDeliveredToBill=Customer orders delivered to bill
 OrdersToBill=Customer orders delivered
 OrdersInProcess=Customer orders in process
 OrdersToProcess=Customer orders to process
-SuppliersOrdersToProcess=Supplier orders to process
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=Atšauktas
 StatusOrderDraftShort=Projektas
 StatusOrderValidatedShort=Patvirtintas
@@ -75,15 +75,15 @@ ShowOrder=Rodyti užsakymą
 OrdersOpened=Orders to process
 NoDraftOrders=Nėra užsakymų projektų
 NoOrder=No order
-NoSupplierOrder=No supplier order
+NoSupplierOrder=No purchase order
 LastOrders=Latest %s customer orders
 LastCustomerOrders=Latest %s customer orders
-LastSupplierOrders=Latest %s supplier orders
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=Latest %s modified orders
 AllOrders=Visi užsakymai
 NbOfOrders=Užsakymų skaičius
 OrdersStatistics=Užsakymų statistika
-OrdersStatisticsSuppliers=Tiekėjo užsakymų statistika
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Užsakymų skaičius pagal mėnesį
 AmountOfOrdersByMonthHT=Užsakymų sumos pagal mėnesį (atskaičius mokesčius)
 ListOfOrders=Užsakymų sąrašas
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</
 GenerateBill=Sukurti sąskaitą-faktūrą
 ClassifyShipped=Rūšiuoti pristatytus
 DraftOrders=Užsakymų projektai
-DraftSuppliersOrders=Draft suppliers orders
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=Apdorojami užsakymai
 RefOrder=Užsakymo nuoroda
 RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for supplier
-RefOrderSupplierShort=Ref. order supplier
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=Užsakymą siųsti paštu
 ActionsOnOrder=Įvykiai užsakyme
 NoArticleOfTypeProduct=Nėra straipsnio tipo "produktas", todėl nėra gabenamo straipsnio šiam užsakymui.
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
 DispatchSupplierOrder=Tiekėjo užsakymo %s gavimas
 FirstApprovalAlreadyDone=Pirmas patvirtinimas jau atliktas
 SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=Supplier order %s received %s
-SupplierOrderSubmitedInDolibarr=Supplier order %s submited
-SupplierOrderClassifiedBilled=Supplier order %s set billed
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Kiti užsakymai
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Sekančio kliento užsakymo atstovas
@@ -125,11 +125,11 @@ TypeContact_commande_internal_SHIPPING=Sekančio pakrovimo atstovas
 TypeContact_commande_external_BILLING=Kliento kontaktai sąskaitai-faktūrai
 TypeContact_commande_external_SHIPPING=Kliento kontaktai gabenimui
 TypeContact_commande_external_CUSTOMER=Sekančio užsakymo kliento kontaktai
-TypeContact_order_supplier_internal_SALESREPFOLL=Atstovo sekantis tiekėjo užsakymas
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Pavyzdinis sekantis gabenimas
-TypeContact_order_supplier_external_BILLING=Tiekėjo adresas sąskaitai-faktūrai
-TypeContact_order_supplier_external_SHIPPING=Tiekėjo adresas gabenimui
-TypeContact_order_supplier_external_CUSTOMER=Tiekėjo adresas sekantis užsakymą
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Konstatnta COMMANDE_SUPPLIER_ADDON nėra apibrėžta
 Error_COMMANDE_ADDON_NotDefined=Konstanta COMMANDE_ADDON nėra apibrėžta
 Error_OrderNotChecked=Prie sąskaitos-faktūros nėra pasirinkta užsakymų
diff --git a/htdocs/langs/lt_LT/other.lang b/htdocs/langs/lt_LT/other.lang
index 12022b3545a..c64467c76cc 100644
--- a/htdocs/langs/lt_LT/other.lang
+++ b/htdocs/langs/lt_LT/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=Failai yra per dideli
 PleaseBePatient=Prašome būkite kantrūs ...
 NewPassword=New password
 ResetPassword=Reset password
-RequestToResetPasswordReceived=Gautas prašymas pakeisti Jūsų Dolibarr slaptažodį
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=Tai nauji Jūsų prisijungimo raktai
 NewKeyWillBe=Jūsų naujas prisijungimo prie programos raktas bus
 ClickHereToGoTo=Spauskite čia norėdami pereiti į %s
@@ -233,6 +233,8 @@ PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=Eksporto sritis
 AvailableFormats=Galimi formatai
diff --git a/htdocs/langs/lt_LT/productbatch.lang b/htdocs/langs/lt_LT/productbatch.lang
index 96e41145d69..8cb2bb62813 100644
--- a/htdocs/langs/lt_LT/productbatch.lang
+++ b/htdocs/langs/lt_LT/productbatch.lang
@@ -16,7 +16,7 @@ printEatby=Eat-by: %s
 printSellby=Sell-by: %s
 printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic increase/decrease stock mode is forced to shipping validate and manual dispatching for reception and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
 ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
diff --git a/htdocs/langs/lt_LT/products.lang b/htdocs/langs/lt_LT/products.lang
index 481d43eb676..0240cd635ac 100644
--- a/htdocs/langs/lt_LT/products.lang
+++ b/htdocs/langs/lt_LT/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=Nauja kaina
 MinPrice=Minimali pardavimo kaina
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=Pardavimo kaina negali būti mažesnė už minimalią leidžiamą šiam produktui (%s be mokesčių). Šis pranešimas taip pat gali pasirodyti, jei įvedate per labai didelę nuolaidą.
 ContractStatusClosed=Uždarytas
 ErrorProductAlreadyExists=Produktas su nuoroda %s jau egzistuoja.
@@ -155,7 +156,7 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Supplier prices
 SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
-CustomCode=Customs/Commodity/HS code
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=Kilmės šalis
 Nature=Prigimtis
 ShortLabel=Short label
diff --git a/htdocs/langs/lt_LT/projects.lang b/htdocs/langs/lt_LT/projects.lang
index 4f356e380ad..39b55732516 100644
--- a/htdocs/langs/lt_LT/projects.lang
+++ b/htdocs/langs/lt_LT/projects.lang
@@ -77,6 +77,7 @@ Time=Laikas
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=Komercinių pasiūlymų, susijusių su projektu, sąrašas
 ListOrdersAssociatedProject=List of customer orders associated with the project
@@ -226,4 +227,4 @@ AllowCommentOnProject=Allow user comments on projects
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/lt_LT/stocks.lang b/htdocs/langs/lt_LT/stocks.lang
index a3b43cc9d1e..ae464d1ae00 100644
--- a/htdocs/langs/lt_LT/stocks.lang
+++ b/htdocs/langs/lt_LT/stocks.lang
@@ -203,3 +203,4 @@ RegulateStock=Regulate Stock
 ListInventory=Sąrašas
 StockSupportServices=Stock management support services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/lt_LT/stripe.lang b/htdocs/langs/lt_LT/stripe.lang
index 3b04daa584f..1a111c8c366 100644
--- a/htdocs/langs/lt_LT/stripe.lang
+++ b/htdocs/langs/lt_LT/stripe.lang
@@ -58,8 +58,8 @@ NameOnCard=Name on card
 CardNumber=Card Number
 ExpiryDate=Expiry Date
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/lt_LT/supplier_proposal.lang b/htdocs/langs/lt_LT/supplier_proposal.lang
index fb25276b7a5..d221dab6e76 100644
--- a/htdocs/langs/lt_LT/supplier_proposal.lang
+++ b/htdocs/langs/lt_LT/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Supplier commercial proposals
-supplier_proposalDESC=Manage price requests to suppliers
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
 SupplierProposalNew=New price request
 CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
-SupplierProposalsDraft=Draft supplier proposals
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=Latest %s modified price requests
 RequestsOpened=Open price requests
-SupplierProposalArea=Supplier proposals area
-SupplierProposalShort=Supplier proposal
-SupplierProposals=Supplier proposals
-SupplierProposalsShort=Supplier proposals
+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=Supplier ref
+SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=Pristatymo data
 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>?
@@ -47,9 +47,9 @@ CommercialAsk=Price request
 DefaultModelSupplierProposalCreate=Modelio sukūrimas pagal nutylėjimą
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposals=List of supplier proposal requests
-ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
-SupplierProposalsToClose=Supplier proposals to close
-SupplierProposalsToProcess=Supplier proposals to process
+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
diff --git a/htdocs/langs/lt_LT/suppliers.lang b/htdocs/langs/lt_LT/suppliers.lang
index 11b4c2e8696..acd6057e466 100644
--- a/htdocs/langs/lt_LT/suppliers.lang
+++ b/htdocs/langs/lt_LT/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Tiekėjai
-SuppliersInvoice=Tiekėjo sąskaita-faktūra
-ShowSupplierInvoice=Show Supplier Invoice
-NewSupplier=Naujas tiekėjas
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=Istorija
-ListOfSuppliers=Tiekėjų sąrašas
-ShowSupplier=Rodyti tiekėją
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=Užsakymo data
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Kai kurie subproduktai neturi apibrėžtos kainos
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
-SupplierPrices=Supplier prices
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Šis nuorodytas tiekėjas jau yra susietas su nuoroda: %s
-NoRecordedSuppliers=Nėra įrašytų tiekėjų
-SupplierPayment=Tiekėjo mokėjimas
-SuppliersArea=Tiekėjų sritis
-RefSupplierShort=Tiekėjo nuoroda
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=Prieinamumas
-ExportDataset_fournisseur_1=Tiekėjo sąskaitų-faktūrų sąrašas ir sąskaitos-faktūros eilutės
-ExportDataset_fournisseur_2=Tiekėjo sąskaitos-faktūros ir mokėjimai
-ExportDataset_fournisseur_3=Tiekėjo užsakymai ir užsakymo eilutės
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=Patvirtinti šį užsakymą
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Atmesti šį užsakymą
 ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
 ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
-AddSupplierOrder=Sukurti tiekėjo užsakymą
-AddSupplierInvoice=Sukurti tiekėjo sąskaitą-faktūrą
-ListOfSupplierProductForSupplier=Produktų ir kainų sąrašas tiekėjui <b>%s</b>
-SentToSuppliers=Nusiųsta tiekėjams
-ListOfSupplierOrders=Tiekėjo užsakymų sąrašas
-MenuOrdersSupplierToBill=Tiekėjo užsakymai sąskaitoms
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Pristatymo vėlavimas dienomis
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-SupplierReputation=Supplier reputation
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
 AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=Supplier prices
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/lt_LT/website.lang b/htdocs/langs/lt_LT/website.lang
index bfebf4b4b91..4c9347c884c 100644
--- a/htdocs/langs/lt_LT/website.lang
+++ b/htdocs/langs/lt_LT/website.lang
@@ -73,7 +73,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
diff --git a/htdocs/langs/lt_LT/workflow.lang b/htdocs/langs/lt_LT/workflow.lang
index e609ef71146..8f890cc26a4 100644
--- a/htdocs/langs/lt_LT/workflow.lang
+++ b/htdocs/langs/lt_LT/workflow.lang
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source custome
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/lv_LV/accountancy.lang b/htdocs/langs/lv_LV/accountancy.lang
index d113a080a6b..b1098f3a131 100644
--- a/htdocs/langs/lv_LV/accountancy.lang
+++ b/htdocs/langs/lv_LV/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Accounting
 ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
 ACCOUNTING_EXPORT_DATE=Date format for export file
 ACCOUNTING_EXPORT_PIECE=Export the number of piece
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Accounts with non zero values
 ListOfAccounts=List of accounts
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers 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
 
-AccountancyArea=Grāmatvedības zona
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
 AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
@@ -89,7 +90,7 @@ MenuProductsAccounts=Product accounts
 ProductsBinding=Products accounts
 Ventilation=Binding to accounts
 CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Supplier invoice binding
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Izveidot jaunu darījumu
 UpdateMvts=Modification of a transaction
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
 ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
@@ -185,11 +187,12 @@ ListeMvts=Pārvietošanas saraksts
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=Trešo personu kontu saraksts
-DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Kontu grupa
 Pcgsubtype=Konta apakšgrupa
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
 ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
 DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report 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 fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -293,4 +296,9 @@ Binded=Lines bound
 ToBind=Lines to bind
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index 66b0adc1076..3707e334e77 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=SMTP / SMTPS serveris (Pēc noklusējuma php.ini: <b>%s)</
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP / SMTPS Port (Nav noteikts uz PHP uz Unix, piemēram, sistēmas)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPS Host (Nav noteikts uz PHP uz Unix, piemēram, sistēmas)
 MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= Nosūtīt sistemātiski visu nosūtīto e-pastu slēptu kopiju uz
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=Metode ko izmantot sūtot e-pastus
 MAIN_MAIL_SMTPS_ID=SMTP ID ja autentificēšana nepieciešama
 MAIN_MAIL_SMTPS_PW=SMTP parole ja autentificēšanās nepieciešama
@@ -291,7 +292,7 @@ ModuleSetup=Moduļa iestatīšana
 ModulesSetup=Moduļu/Aplikāciju iestatīšana
 ModuleFamilyBase=Sistēma
 ModuleFamilyCrm=Klientu pārvaldība (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Produktu Pārvaldība (PP)
 ModuleFamilyHr=Darbinieku resursu pārvaldība (DRP)
 ModuleFamilyProjects=Projekti / Sadarbības darbi
@@ -373,7 +374,8 @@ NoSmsEngine=Nav SMS sūtītšanas iespēja pieejama. SMS sūtīšanas iespēja n
 PDF=PDF
 PDFDesc=Jūs varat iestatīt katru pasaules iespējas, kas saistītas ar PDF paaudzes
 PDFAddressForging=Noteikumi veidojot adreses lauku
-HideAnyVATInformationOnPDF=Paslēpt visu informāciju, kas saistīta ar PVN, izveidotajā PDF
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=Slēpt produktu aprakstu radītos PDF
@@ -445,7 +447,8 @@ DisplayCompanyInfo=Rādīt uzņēmuma adresi
 DisplayCompanyManagers=Rādīt menedžeru vārdus
 DisplayCompanyInfoAndManagers=Rādīt uzņēmuma adresi un menedžeru vārdus
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party 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.
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Set this to 1 if you want to attach main document to emai
 FilesAttachedToEmail=Pievienot failu
 SendEmailsReminders=Send agenda reminders by emails
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=Lietotāji un grupas
 Module0Desc=Lietotāju / Darbinieku un Grupu vadība
@@ -479,7 +485,7 @@ Module1Desc=Uzņēmumu un kontaktinformācijas vadība (klientu, perspektīvu ..
 Module2Name=Tirdzniecība
 Module2Desc=Komerciālā pārvaldība
 Module10Name=Grāmatvedība
-Module10Desc=Vienkāršā grāmatvedības atskaites (žurnāli, apgrozījums), pamatojoties uz datu bāzes saturu. Nav nosūtīšana.
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=Priekšlikumi
 Module20Desc=Komerc priekšlikumu vadība
 Module22Name=Masveida e-pasta sūtījumi
@@ -546,8 +552,8 @@ Module400Name=Projekti/Iespējas/Leads
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Vebkalendārs
 Module410Desc=Web kalendāra integrācija
-Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Payment of employee wages
 Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
@@ -561,14 +567,14 @@ Module700Name=Ziedojumi
 Module700Desc=Ziedojumu pārvaldība
 Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Mantis integrācija
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
 Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=WYSIWYG redaktors
 Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
 Module2200Name=Dinamiskas cenas
@@ -576,7 +582,7 @@ Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Plānotie darbi
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Pasākumi / darba kārtība
-Module2400Desc=Sekojiet notikušiem un gaidāmiem notikumiem. Ļaujiet programmai reģistrēt automātiskus notikumus izsekošanas nolūkos vai ierakstiet manuāli notikumus vai sarunas.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API/Web services (SOAP server)
@@ -613,7 +619,7 @@ Module50100Desc=Point of sales module (POS).
 Module50200Name=Paypal
 Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Aptauja vai balsojums
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance kavēšanās (dienās) pirms brīdinājumu p
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance kavēšanās (dienās) pirms brīdinājumu par pārbaudēm, depozītu darīt
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=Citas izvēlnes ieraksti pārvaldīt izvēles parametrus.
 LogEvents=Drošības audita notikumi
 Audit=Audits
@@ -1054,8 +1060,9 @@ LogEventDesc=Jūs varat ļaut šeit reģistrēšanu Dolibarr drošības notikumi
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Sistēmas informācija ir dažādi tehniskā informācija jums tikai lasīšanas režīmā un redzama tikai administratoriem.
 SystemAreaForAdminOnly=Šī joma ir pieejama administratora lietotājiem. Neviens no Dolibarr atļauju var samazināt šo robežu.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=Jūs varat izvēlēties katru parametru, kas saistīts ar Dolibarr izskatu un justies šeit
 AvailableModules=Pieejamās progrmma / moduļi
 ToActivateModule=Lai aktivizētu moduļus, dodieties uz iestatīšanas zonas (Home->Setup->Moduļi).
@@ -1188,11 +1195,11 @@ UserMailRequired=E-pasts nepieciešams, lai izveidotu jaunu lietotāju
 HRMSetup=HRM module setup
 ##### Company setup #####
 CompanySetup=Uzņēmuma moduļa uzstādīšana
-CompanyCodeChecker=Modulis trešajām personām koda paaudzes un pārbaudes (klients, vai piegādātājs)
-AccountCodeManager=Module for accounting code generation (customer or supplier)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
 NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
 ModelModules=Dokumentu veidnes
 DocumentModelOdt=Izveidot dokumentus no OpenDocument veidnes (. ODT vai. ODS failus OpenOffice, KOffice, TextEdit, ...)
@@ -1203,6 +1210,9 @@ MustBeUnique=Jābūt unikālam?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
 TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Eksporta saite uz <b>%s</b> formātā ir pieejams šādā tīmekļa vietnē: %s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=Brīvais teksts komerciālajos priekšlikumos
 WatermarkOnDraftProposal=Ūdenszīme projektu komerciālo priekšlikumu (none ja tukšs)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
 ##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=Pasūtījumu vadības iestatīšana
 OrdersNumberingModules=Pasūtījumu numerācijas modeļi
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=Savienojums ar serveri '%s' par datu bāzē '%s' ar lietotāja
 OSCommerceTestKo1=Savienojums ar serveri '%s' izdoties, bet datubāze '%s' nevar sasniegt.
 OSCommerceTestKo2=Savienojums ar serveri '%s' ar lietotāja '%s' neizdevās.
 ##### Stock #####
-StockSetup=Noliktavu moduļa iestatījumi
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
 ##### Menu #####
 MenuDeleted=Izvēlne dzēsta
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
 MultiCompanySetup=Multi-kompānija modulis iestatīšana
 ##### Suppliers #####
 SuppliersSetup=Piegādātāja moduļa iestatījumi
-SuppliersCommandModel=Pilnīga veidni no piegādātāja secībā (logo. ..)
-SuppliersInvoiceModel=Pilnīga veidni no piegādātāja rēķina (logo. ..)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Piegādātāju rēķinu numerācijas modeļus
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","
 SalariesSetup=Setup of module salaries
 SortOrder=Kārtošanas secība
 Format=Formāts
-TypePaymentDesc=0:Klienta maksāšanas veids, 1:Piegādātāja maksāšanas veids, 2:Abi klientu un piegādātāju maksāšanas veids
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Install of external module from applic
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
-TextTitleColor=Lapas virsraksta krāsa
+TextTitleColor=Text color of Page title
 LinkColor=Linku krāsa
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=Fona krāsa augšējai izvēlnei
 TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Fona krāsa kreisajai izvēlnei
 BackgroundTableTitleColor=Fona krāsa tabulas virsraksta līnijai
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
 ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=Sūtīt e-pastu no trešās puses lapas
-MailToMember=To send email from member page
-MailToUser=To send email from user page
-MailToProject= To send email from project page
+MailToSendProposal=Klienta piedāvājumi
+MailToSendOrder=Klienta pasūtījumi
+MailToSendInvoice=Klienta rēķini
+MailToSendShipment=Sūtījumi
+MailToSendIntervention=Interventions
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Līgumi
+MailToThirdparty=Trešās personas
+MailToMember=Dalībnieki
+MailToUser=Lietotāji
+MailToProject=Projects page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=Jūs izmantojat pēdējo stabilo versiju
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1780,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/lv_LV/bills.lang b/htdocs/langs/lv_LV/bills.lang
index b2c47a05c90..f8109f862ec 100644
--- a/htdocs/langs/lv_LV/bills.lang
+++ b/htdocs/langs/lv_LV/bills.lang
@@ -109,7 +109,7 @@ CancelBill=Atcelt rēķinu
 SendRemindByMail=Sūtīt atgādinājumu izmantojot e-pastu
 DoPayment=Ievadiet maksājumu
 DoPaymentBack=Ievadiet atmaksu
-ConvertToReduc=Pārvērst nākotnes atlaidē
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Ievadiet saņemto naudas summu no klienta
@@ -120,7 +120,7 @@ BillStatus=Rēķina statuss
 StatusOfGeneratedInvoices=Izveidoto rēķinu statuss
 BillStatusDraft=Melnraksts (jāapstiprina)
 BillStatusPaid=Apmaksāts
-BillStatusPaidBackOrConverted=Credit note refund or converted into discount
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Pamesti
 BillStatusValidated=Apstiprināts (jāapmaksā)
@@ -296,10 +296,10 @@ DiscountType=Discount type
 NoteReason=Piezīme / Iemesls
 ReasonDiscount=Iemesls
 DiscountOfferedBy=Piešķīris
-DiscountStillRemaining=Discounts available
-DiscountAlreadyCounted=Discounts already consumed
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+SupplierDiscounts=Vendors discounts
 BillAddress=Rēķina adrese
 HelpEscompte=Šī atlaide ir piešķirta klientam, jo ​​tas maksājumu veica pirms termiņa.
 HelpAbandonBadCustomer=Šī summa ir pamests (klients teica, ka slikts klients), un tiek uzskatīts par ārkārtēju zaudēt.
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but
 PaymentNote=Maksājuma piezīmes
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Katras %s dienas
 FrequencyPer_m=Katrus %s mēnešus
 FrequencyPer_y=Katrus %s gadus
@@ -505,9 +511,14 @@ SituationAmount=Situation invoice amount(net)
 SituationDeduction=Situation subtraction
 ModifyAllLines=Labot visas līnijas
 CreateNextSituationInvoice=Izveidot nākošo situāciju
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=Sv
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
 NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
@@ -532,3 +543,4 @@ AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/lv_LV/categories.lang b/htdocs/langs/lv_LV/categories.lang
index 20d6b736367..914b413fb8f 100644
--- a/htdocs/langs/lv_LV/categories.lang
+++ b/htdocs/langs/lv_LV/categories.lang
@@ -16,7 +16,7 @@ MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
-SubCats=Apakšsadaļas
+SubCats=Sub-categories
 CatList=List of tags/categories
 NewCategory=Jauna etiķete/sadaļa
 ModifCat=Labot etiķeti/sadaļu
@@ -85,3 +85,4 @@ CategorieRecursivHelp=If activated, product will also linked to parent category
 AddProductServiceIntoCategory=Add the following product/service
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
+ChooseCategory=Choose category
diff --git a/htdocs/langs/lv_LV/commercial.lang b/htdocs/langs/lv_LV/commercial.lang
index d9e98877c69..f4168b499f6 100644
--- a/htdocs/langs/lv_LV/commercial.lang
+++ b/htdocs/langs/lv_LV/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=Aizvērt
 ActionAC_EMAILING=Sūtīt masveida e-pastu
 ActionAC_COM=Nosūtīt klienta pasūtījumu pa pastu
 ActionAC_SHIP=Nosūtīt piegādi pa pastu
-ActionAC_SUP_ORD=Nosūtīt piegādātāja pasūtījumu pa pastu
-ActionAC_SUP_INV=Nosūtīt piegādātāja rēķinu pa pastu
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=Cits
 ActionAC_OTH_AUTO=Automātiski ievietoti notikumi
 ActionAC_MANUAL=Manuāli ievietoti notikumi
diff --git a/htdocs/langs/lv_LV/companies.lang b/htdocs/langs/lv_LV/companies.lang
index 34d40bddf9a..0f5b3264b9e 100644
--- a/htdocs/langs/lv_LV/companies.lang
+++ b/htdocs/langs/lv_LV/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Vai tiešām vēlaties dzēst šo kontaktu un visu informā
 MenuNewThirdParty=Jauna trešā persona
 MenuNewCustomer=Jauns klients
 MenuNewProspect=Jauna perspektīva
-MenuNewSupplier=Jauns piegādātājs
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=Jauna privātpersona
-NewCompany=Jauns uzņēmums (perspektīva, klients, piegādātājs)
-NewThirdParty=Jauna trešā persona (perspektīva, klients, piegādātājs)
-CreateDolibarrThirdPartySupplier=Izveidot trešo pusi (pegādātjs)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=Izveidot trešo personu
 CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Apzināšanas lauks
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=Perspektīvas
 ThirdPartyCustomers=Klienti
 ThirdPartyCustomersStats=Klienti
 ThirdPartyCustomersWithIdProf12=Klienti ar %s vai %s
-ThirdPartySuppliers=Piegādātāji
+ThirdPartySuppliers=Vendors
 ThirdPartyType=Trešās puses tips
 Individual=Privātpersona
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
@@ -77,11 +77,11 @@ Web=Mājaslapa
 Poste= Pozīcija
 DefaultLang=Valoda pēc noklusējuma
 VATIsUsed=Sales tax is used
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
-ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Priekšlikumi
 OverAllOrders=Pasūtījumi
@@ -99,9 +99,9 @@ LocalTax2ES=INFP
 TypeLocaltax1ES=RE Type
 TypeLocaltax2ES=IRPF Type
 WrongCustomerCode=Klienta kods nederīgs
-WrongSupplierCode=Piegādātājs kods nederīgs
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Klienta koda modelis
-SupplierCodeModel=Piegādātāja koda modelis
+SupplierCodeModel=Vendor code model
 Gencod=Svītrkods
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
@@ -267,7 +267,7 @@ Prospect=Perspektīva
 CustomerCard=Klienta kartiņa
 Customer=Klients
 CustomerRelativeDiscount=Relatīvā klienta atlaide
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=Relatīvā atlaide
 CustomerAbsoluteDiscountShort=Absolūtā atlaide
 CompanyHasRelativeDiscount=Šim klientam ir pastāvīgā atlaide <b>%s%%</b>
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this suppl
 CompanyHasNoAbsoluteDiscount=Šim klientam nav  pieejams atlaižu kredīts
 CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
 CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=Nav
 Supplier=Piegādātājs
 AddContact=Izveidot kontaktu
@@ -304,13 +304,13 @@ DeleteACompany=Dzēst uzņēmumu
 PersonalInformations=Personas dati
 AccountancyCode=Accounting account
 CustomerCode=Klienta kods
-SupplierCode=Piegādātāja kods
+SupplierCode=Vendor code
 CustomerCodeShort=Klienta kods
-SupplierCodeShort=Piegādātāja kods
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=Klienta kods, unikāls visiem klientiem
-SupplierCodeDesc=Piegādātājs kods, unikāls visiem piegādātājiem
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=Nepieciešams, ja trešā puse ir klients vai perspektīva
-RequiredIfSupplier=Nepieciešams, ja trešā puse ir piegādātājs
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=Derīguma vadību kontrolēta ar moduli
 ThisIsModuleRules=Šie noteikumi šim modulim
 ProspectToContact=Perspektīva ar ko sazināties
@@ -338,7 +338,7 @@ MyContacts=Mani kontakti
 Capital=Kapitāls
 CapitalOf=Capital %s
 EditCompany=Labot uzņēmumu
-ThisUserIsNot=Šis lietotājs nav perspektīvs klients vai piegādātājs
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=Pārbaudīt
 VATIntraCheckDesc=Saite <b>%s</b> ļauj lūgt Eiropas PVN pārbaudītājs pakalpojumu. Ārējo interneta pieslēgums no servera ir nepieciešams šo pakalpojumu, lai strādātu.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -396,7 +396,7 @@ ImportDataset_company_4=Third parties/Sales representatives (Assign sales repres
 PriceLevel=Cenu līmenis
 DeliveryAddress=Piegādes adrese
 AddAddress=Pievienot adresi
-SupplierCategory=Piegādātāja sadaļa
+SupplierCategory=Vendor category
 JuridicalStatus200=Neatkarīgs
 DeleteFile=Izdzēst failu
 ConfirmDeleteFile=Vai jūs tiešām vēlaties izdzēst šo failu?
@@ -406,7 +406,7 @@ FiscalYearInformation=Informācija par fiskālo gadu
 FiscalMonthStart=Fiskālā gada pirmais mēnesis
 YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
 YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
-ListSuppliersShort=Piegādātāju saraksts
+ListSuppliersShort=List of vendors
 ListProspectsShort=Saraksts perspektīvas
 ListCustomersShort=Klientu saraksts
 ThirdPartiesArea=Trešās personas u kontaktu sadaļa
@@ -420,7 +420,7 @@ CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Maks. par izcilu rēķinu
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Atgriešanās Numero ar formātu %syymm-NNNN par klientu kodu un %syymm-NNNN forsupplier kodu, kur gg ir gads, MM ir mēnesis, un nnnn ir secība bez pārtraukuma un bez atgriezties 0.
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=Kods ir bez maksas. Šo kodu var mainīt jebkurā laikā.
 ManagingDirectors=Menedžera(u) vārds (CEO, direktors, prezidents...) 
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=Tirdzniecības pārstāvja vārds
 SaleRepresentativeLastname=Tirdzniecības pārstāvja uzvārds
 ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/lv_LV/compta.lang b/htdocs/langs/lv_LV/compta.lang
index bc740f7bfe9..f76b267cfb1 100644
--- a/htdocs/langs/lv_LV/compta.lang
+++ b/htdocs/langs/lv_LV/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=Neto samaksāts
 VATToPay=Tax sales
 VATReceived=Saņemti nodokļi
 VATToCollect=Tax purchases
-VATSummary=Nodokļu bilance
+VATSummary=Tax monthly
+VATBalance=Nodokļu bilance
 VATPaid=Samaksātie nodokļi
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=Grāmatvedība / kase laukums
 NewPayment=Jauns maksājums
 Payments=Maksājumi
 PaymentCustomerInvoice=Klienta rēķina apmaksa
-PaymentSupplierInvoice=Piegādātāja rēķina apmaksa
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=PVN maksājumi
 ListPayment=Maksājumu saraksts
 ListOfCustomerPayments=Saraksts klientu maksājumu
-ListOfSupplierPayments=Saraksts piegādātāja maksājumu
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Date start period
 DateEndPeriod=Datums un periods
 newLT1Payment=New tax 2 payment
@@ -110,7 +111,7 @@ ShowVatPayment=Rādīt PVN maksājumu
 TotalToPay=Summa
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
 CustomerAccountancyCode=Klienta grāmatvedības kods
-SupplierAccountancyCode=Piegādātāja grāmatvedības kods
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
 SupplierAccountancyCodeShort=Sup. account. code
 AccountNumber=Konta numurs
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Ziņojumā, ko trešās puses IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Ziņojums klientu PVN iekasē un izmaksā
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Chart of accounts models
 Pcg_type=PCG veids
 Pcg_subtype=PCG apakštipu
 InvoiceLinesToDispatch=Rēķina līnijas nosūtīšanas
-ByProductsAndServices=Ar precēm un pakalpojumiem
+ByProductsAndServices=By product and service
 RefExt=Ārējā ref
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
 LinkedOrder=Link to order
@@ -215,7 +218,8 @@ Mode1=Metode 1
 Mode2=Metode 2
 CalculationRuleDesc=Lai aprēķinātu kopējo PVN, ir divas metodes: <br> 1 metode ir noapaļošanas pvn par katru līniju, tad summējot tos. <br> Metode 2 summējot visu PVN par katru līniju, tad noapaļošanas rezultāts. <br> Gala rezultāts var būt atšķirīgs no dažiem centiem. Noklusētais režīms ir režīms <b>%s.</b>
 CalculationRuleDescSupplier=According to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Apgrozījums ziņojums par produktu, izmantojot <b>skaidras naudas uzskaites</b> režīmu nav nozīmes. Šis ziņojums ir pieejams tikai tad, ja izmanto <b>saderināšanās grāmatvedības</b> režīmu (skat. iestatīšanu grāmatvedības moduli).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Aprēķinu režīms
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
@@ -242,3 +246,10 @@ FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/lv_LV/dict.lang b/htdocs/langs/lv_LV/dict.lang
index 0112a62171f..b48eed3b4b3 100644
--- a/htdocs/langs/lv_LV/dict.lang
+++ b/htdocs/langs/lv_LV/dict.lang
@@ -5,6 +5,7 @@ CountryIT=Itālija
 CountryES=Spānija
 CountryDE=Vācija
 CountryCH=Šveice
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
 CountryGB=Lielbritānija
 CountryUK=Lielbritānija
 CountryIE=Īrija
diff --git a/htdocs/langs/lv_LV/ecm.lang b/htdocs/langs/lv_LV/ecm.lang
index 4c98d4e581a..38865f029d5 100644
--- a/htdocs/langs/lv_LV/ecm.lang
+++ b/htdocs/langs/lv_LV/ecm.lang
@@ -39,9 +39,10 @@ ShowECMSection=Rādīt katalogu
 DeleteSection=Dzēst direktoriju
 ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
 ECMDirectoryForFiles=Relatīvais failu katalogs
-CannotRemoveDirectoryContainsFiles=Noņemt nav iespējams, jo satur dažus failus
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=Failu pārvaldnieks
-ECMSelectASection=Izvēlieties direktoriju kreisajā pusē ...
+ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
diff --git a/htdocs/langs/lv_LV/errors.lang b/htdocs/langs/lv_LV/errors.lang
index 42e99d71bc9..53ec393bb00 100644
--- a/htdocs/langs/lv_LV/errors.lang
+++ b/htdocs/langs/lv_LV/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Svītrkods nepieciešams
 ErrorCustomerCodeAlreadyUsed=Klienta kods jau tiek izmantots
 ErrorBarCodeAlreadyUsed=Svītrkods jau tiek izmantots
 ErrorPrefixRequired=Prefikss nepieciešams
-ErrorBadSupplierCodeSyntax=Nepareiza sintakse piegādātāju kods
-ErrorSupplierCodeRequired=Piegādātāja kods nepieciešams
-ErrorSupplierCodeAlreadyUsed=Piegādātāja kods jau tiek izmantots
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Slikts parametrs
 ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
 ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
@@ -87,7 +87,7 @@ ErrorsOnXLines=Kļūdas <b>%s</b> avota ierakstu (-s)
 ErrorFileIsInfectedWithAVirus=Antivīrusu programma nevarēja apstiprināt failu (fails varētu būt inficēti ar vīrusu)
 ErrorSpecialCharNotAllowedForField=Speciālās rakstzīmes nav atļautas lauka &quot;%s&quot;
 ErrorNumRefModel=Norāde pastāv to datubāzē (%s), un tas nav saderīgs ar šo numerācijas noteikuma. Noņemt ierakstu vai pārdēvēts atsauci, lai aktivizētu šo moduli.
-ErrorQtyTooLowForThisSupplier=Daudzums ir pārāk zema šim piegādātājam vai nav cena noteikta par šo produktu šim piegādātājam
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complet
 ErrorBadMask=Kļūda masku
 ErrorBadMaskFailedToLocatePosOfSequence=Kļūda, maska ​​bez kārtas numuru
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
 ErrorSavingChanges=Kļūda saglabājot izmaiņas
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
-ErrorSupplierCountryIsNotDefined=Valsts šim piegādātājam nav noteikts. Labot šo pirmo.
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
diff --git a/htdocs/langs/lv_LV/install.lang b/htdocs/langs/lv_LV/install.lang
index 58420856577..1c31bc01f0e 100644
--- a/htdocs/langs/lv_LV/install.lang
+++ b/htdocs/langs/lv_LV/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=Konfigurācijas fails <b>%s</b> nav un
 ConfFileCouldBeCreated=Konfigurācijas failu <b>%s</b> var izveidot.
 ConfFileIsNotWritable=Konfigurācijas failam <b>%s</b> nav rakstīšanas tiesības. Pārbaudiet atļaujas. Par pirmo instalēt, jūsu tīmekļa serveris ir jāpiešķir, lai varētu rakstīt šajā failā laikā konfigurācijas process ("chmod 666", piemēram, uz kā OS UNIX).
 ConfFileIsWritable=Konfigurācijas failā <b>%s</b> var ierakstīt.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Pārlādē visu informāciju no konfigurācijas faila.
 PHPSupportSessions=PHP atbalsta sesijas.
 PHPSupportPOSTGETOk=PHP atbalsta mainīgos POST un GET.
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
 WarningRemoveInstallDir=Brīdinājums, drošības apsvērumu dēļ pēc instalēšanas vai atjaunināšanas beigām, lai izvairītos no instalēšanas rīku atkārtotas izmantošanas, Jums jāpievieno failu ar nosaukumu <b>install.lock</b> Dolibarr dokumentu direktorijā, lai novērstu ļaunprātīgu instalācijas izmantošanu.
 FunctionNotAvailableInThisPHP=Nav pieejams šajā PHP versijā
 ChoosedMigrateScript=Izvēlieties migrācijas skriptu
-DataMigration=Datu migrācija
-DatabaseMigration=Struktūras datu bāzes migrācija
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Skripts darbojas
 ChooseYourSetupMode=Izvēlies savu instalācijas režīmu un noklikšķiniet uz "Sākt" ...
 FreshInstall=Svaiga instalēšana
@@ -146,7 +147,7 @@ NothingToDo=Nothing to do
 # upgrade
 MigrationFixData=Noteikt, denormalized datiem
 MigrationOrder=Klientu pasūtījumu datu migrācija
-MigrationSupplierOrder=Piegādātāju pasūtījumu datu migrācija
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Datu migrācija komerciāliem priekšlikumus
 MigrationInvoice=Klienta rēķinu datu migrācija
 MigrationContract=Datu migrācija līgumiem
@@ -196,6 +197,8 @@ MigrationEvents=Migration of events to add event owner into assignement table
 MigrationEventsContact=Migration of events to add event contact into assignement table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 ShowNotAvailableOptions=Rādīt nepieejamās iespējas
diff --git a/htdocs/langs/lv_LV/ldap.lang b/htdocs/langs/lv_LV/ldap.lang
index 8d0940464b2..0283b92eda9 100644
--- a/htdocs/langs/lv_LV/ldap.lang
+++ b/htdocs/langs/lv_LV/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Domēna parole
 YouMustChangePassNextLogon=Parole lietotāju <b>%s</b> par domēna <b>%s</b> ir jāmaina.
 UserMustChangePassNextLogon=Lietotājam ir nomainīt paroli uz domēna %s
 LDAPInformationsForThisContact=Informācija LDAP datubāzē šim kontaktam
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Member type synchronized
 ContactSynchronized=Kontakti sinhronizēti
 ForceSynchronize=Force sinhronizācija Dolibarr -&gt; LDAP
 ErrorFailedToReadLDAP=Neizdevās nolasīt LDAP datu bāzi. Pārbaudiet LDAP modulis uzstādīšanas un datu bāzes pieejamību.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/lv_LV/loan.lang b/htdocs/langs/lv_LV/loan.lang
index 44116e35787..a2fe3ff53ed 100644
--- a/htdocs/langs/lv_LV/loan.lang
+++ b/htdocs/langs/lv_LV/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=Capital
 Insurance=Apdrošināšana
 Interest=Interest
 Nbterms=Number of terms
+Term=Term
 LoanAccountancyCapitalCode=Accounting account capital
 LoanAccountancyInsuranceCode=Accounting account insurance
 LoanAccountancyInterestCode=Accounting account interest
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=Confirm deleting this loan
 LoanDeleted=Loan Deleted Successfully
 ConfirmPayLoan=Confirm classify paid this loan
 LoanPaid=Loan Paid
-# Calc
-LoanCalc=Bank Loans Calculator
-PurchaseFinanceInfo=Purchase & Financing Information
-SalePriceOfAsset=Sale Price of Asset
-PercentageDown=Percentage Down
-LengthOfMortgage=Aizdevuma ilgums
-AnnualInterestRate=Annual Interest Rate
-ExplainCalculations=Explain Calculations
-ShowMeCalculationsAndAmortization=Show me the calculations and amortization
-MortgagePaymentInformation=Mortgage Payment Information
-DownPayment=Down Payment
-DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
-InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
-MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
-MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
-MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
-MonthlyPaymentDesc=The montly payment is figured out using the following formula
-AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
-AmountFinanced=Amount Financed
-AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
-Totalsforyear=Totals for year
-MonthlyPayment=Monthly Payment
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
-GoToInterest=%s will go towards INTEREST
-GoToPrincipal=%s will go towards PRINCIPAL
-YouWillSpend=Jūs iztērēsiet %s gadā %s
 ListLoanAssociatedProject=List of loan associated with the project
 AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Interest
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-FinancialCommitment=Financial commitment
 CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/langs/lv_LV/mails.lang b/htdocs/langs/lv_LV/mails.lang
index 86760a9f8ba..e65e1cc0131 100644
--- a/htdocs/langs/lv_LV/mails.lang
+++ b/htdocs/langs/lv_LV/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Nosūtītājs
 MailErrorsTo=Kļūdas līdz
 MailReply=Atbildēt uz
 MailTo=Saņēmējs (-i)
+MailToUsers=To user(s)
 MailCC=Kopēt
+MailToCCUsers=Copy to users(s)
 MailCCC=Kešatmiņā kopiju
 MailTopic=E-pasta tēma
 MailText=Ziņa
@@ -164,4 +166,4 @@ InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Informācija
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/lv_LV/main.lang b/htdocs/langs/lv_LV/main.lang
index 881719def28..e8185c39a04 100644
--- a/htdocs/langs/lv_LV/main.lang
+++ b/htdocs/langs/lv_LV/main.lang
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is se
 Administrator=Administrators
 Undefined=Nav definēts
 PasswordForgotten=Aizmirsāt paroli?
+NoAccount=No account?
 SeeAbove=Skatīt iepriekš
 HomeArea=Mājas sadaļa
 LastConnexion=Latest connection
@@ -133,7 +134,7 @@ Never=Nekad
 Under=saskaņā ar
 Period=Periods
 PeriodEndDate=Beigu datums periodam
-SelectedPeriod=Selected period
+SelectedPeriod=Izvēlētais periods
 PreviousPeriod=Previous period
 Activate=Aktivizēt
 Activated=Aktivizēta
@@ -231,7 +232,7 @@ Limit=Ierobežot
 Limits=Ierobežojums
 Logout=Iziet
 NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Pieslēgties
+Connection=Login
 Setup=Iestatījumi
 Alert=Brīdināt
 MenuWarnings=Brīdinājumi
@@ -402,6 +403,7 @@ DefaultTaxRate=Default tax rate
 Average=Vidējais
 Sum=Summa
 Delta=Delta
+RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Moduļi/lietojumprogrammas
 Option=Iespējas
@@ -414,7 +416,7 @@ Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
 ExternalRef=Ref. extern
-RefSupplier=Ref. piegādātājs
+RefSupplier=Ref. vendor
 RefPayment=Ref. maksājums
 CommercialProposalsShort=Komerciālie priekšlikumi
 Comment=Komentēt
@@ -493,7 +495,7 @@ Received=Saņemts
 Paid=Apmaksāts
 Topic=Virsraksts
 ByCompanies=Pēc trešajām personām
-ByUsers=Pēc lietotājiem
+ByUsers=By user
 Links=Saites
 Link=Saite
 Rejects=Atteikumi
@@ -619,9 +621,9 @@ BuildDoc=Izveidot Doc
 Entity=Vide
 Entities=Subjekti
 CustomerPreview=Klientu pirmskats
-SupplierPreview=Piegādātāju pirmskats
+SupplierPreview=Vendor preview
 ShowCustomerPreview=Rādīt klientu priekšskatījumu
-ShowSupplierPreview=Rādīt piegādātāja priekšskatījumu
+ShowSupplierPreview=Show vendor preview
 RefCustomer=Ref. klienta
 Currency=Valūta
 InfoAdmin=Informācija administratoriem
@@ -679,7 +681,7 @@ Color=Krāsa
 Documents=Piesaistītie faili
 Documents2=Dokumenti
 UploadDisabled=Augšupielāde bloķēta
-MenuAccountancy=Grāmatvedība
+MenuAccountancy=Accounting
 MenuECM=Dokumenti
 MenuAWStats=AWStats
 MenuMembers=Dalībnieki
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=Preces un pakalpojumi
 SearchIntoProjects=Projekti
 SearchIntoTasks=Uzdevumi
 SearchIntoCustomerInvoices=Klienta rēķini
-SearchIntoSupplierInvoices=Piegādātāju rēķini
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Klienta pasūtījumi
-SearchIntoSupplierOrders=Piegādātāja pasūtījumi
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=Klienta piedāvājumi
-SearchIntoSupplierProposals=Piegādātāja pedāvājumi
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Interventions
 SearchIntoContracts=Līgumi
 SearchIntoCustomerShipments=Klientu sūtījumi
@@ -941,3 +943,5 @@ Remote=Remote
 LocalAndRemote=Local and Remote
 KeyboardShortcut=Keyboard shortcut
 AssignedTo=Piešķirts
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/lv_LV/margins.lang b/htdocs/langs/lv_LV/margins.lang
index 1a5609fff7b..8d7d7dc3a90 100644
--- a/htdocs/langs/lv_LV/margins.lang
+++ b/htdocs/langs/lv_LV/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=Kā pakalpojums
 UseDiscountOnTotal=Par starpsummu
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Nosaka, ja globālā atlaide tiek uzskatīts par produktu, pakalpojumu, vai tikai starpsumma starpības aprēķinu.
 MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best supplier price
+MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Pašizmaksa
 UnitCharges=Vienības izmaksas
 Charges=Maksas
diff --git a/htdocs/langs/lv_LV/members.lang b/htdocs/langs/lv_LV/members.lang
index 61809e044f9..22ae7355e96 100644
--- a/htdocs/langs/lv_LV/members.lang
+++ b/htdocs/langs/lv_LV/members.lang
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
diff --git a/htdocs/langs/lv_LV/opensurvey.lang b/htdocs/langs/lv_LV/opensurvey.lang
index a4aea8e5917..4708347d844 100644
--- a/htdocs/langs/lv_LV/opensurvey.lang
+++ b/htdocs/langs/lv_LV/opensurvey.lang
@@ -58,3 +58,4 @@ MoreChoices=Enter more choices for the voters
 SurveyExpiredInfo=The poll has been closed or voting delay has expired.
 EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link:\n%s
 ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/lv_LV/orders.lang b/htdocs/langs/lv_LV/orders.lang
index ae19bc254ea..f4d190a0d51 100644
--- a/htdocs/langs/lv_LV/orders.lang
+++ b/htdocs/langs/lv_LV/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Klienti pasūtījumu sadaļa
-SuppliersOrdersArea=Piegādātāji pasūtījumi platība
+SuppliersOrdersArea=Purchase orders area
 OrderCard=Pasūtījumu kartiņa
 OrderId=Pasūtījuma ID
 Order=Rīkojums
@@ -13,18 +13,18 @@ OrderToProcess=Pasūtījums, kas jāapstrādā
 NewOrder=Jauns pasūtījums
 ToOrder=Veicot pasūtījumu
 MakeOrder=Veicot pasūtījumu
-SupplierOrder=Piegādātājs rīkojums
-SuppliersOrders=Piegādātāji pasūtījumi
-SuppliersOrdersRunning=Pašreizējie piegādātāju pasūtījumi
-CustomerOrder=Klienta rīkojums
-CustomersOrders=Klienta pasūtījumi
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=Klienta pasūtijums
+CustomersOrders=Klientu Pasūtījumi
 CustomersOrdersRunning=Current customer orders
 CustomersOrdersAndOrdersLines=Customer orders and order lines
 OrdersDeliveredToBill=Klienta pasūtījumi piegādāti rēķinam
 OrdersToBill=Customer orders delivered
 OrdersInProcess=Klientu pasūtījumi apstrādē
 OrdersToProcess=Klientu pasūtījumi, kas jāapstrādā
-SuppliersOrdersToProcess=Supplier orders to process
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=Atcelts
 StatusOrderDraftShort=Projekts
 StatusOrderValidatedShort=Apstiprināts
@@ -75,15 +75,15 @@ ShowOrder=Rādīt pasūtījumu
 OrdersOpened=Orders to process
 NoDraftOrders=Nav projektu pasūtījumi
 NoOrder=Nav pasūtījuma
-NoSupplierOrder=No supplier order
+NoSupplierOrder=No purchase order
 LastOrders=Latest %s customer orders
 LastCustomerOrders=Latest %s customer orders
-LastSupplierOrders=Latest %s supplier orders
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=Latest %s modified orders
 AllOrders=Visi pasūtījumi
 NbOfOrders=Pasūtījumu skaits
 OrdersStatistics=Pasūtījuma-u statistika
-OrdersStatisticsSuppliers=Piegādātāj pasūtījuma/u statistika
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Pasūtījumu skaits pa mēnešiem
 AmountOfOrdersByMonthHT=Pasūtījumu summa mēnesī (bez nodokļiem)
 ListOfOrders=Pasūtījumu saraksts
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</
 GenerateBill=Izveidot rēķinu
 ClassifyShipped=Klasificēt piegādāts
 DraftOrders=Projekts pasūtījumi
-DraftSuppliersOrders=Draft suppliers orders
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=Pasūtījumi procesā
 RefOrder=Ref. pasūtījuma
 RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for supplier
-RefOrderSupplierShort=Ref. order supplier
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=Nosūtīt pasūtījumu pa pastu
 ActionsOnOrder=Notikumi pēc pasūtījuma
 NoArticleOfTypeProduct=Nav raksts tips &quot;produkts&quot; tā nav shippable rakstu par šo rīkojumu
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Vai jūs tiešām vēlaties klonēt šo pasūtījumu <b>%s</b>
 DispatchSupplierOrder=Saņemšanas piegādātājs pasūtījuma %s
 FirstApprovalAlreadyDone=First approval already done
 SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=Piegādātāja pasūtījums %s saņemts %s
-SupplierOrderSubmitedInDolibarr=Piegādātāja pasūtījums %s iesniegts
-SupplierOrderClassifiedBilled=Piegādātāja pasūtījums %s atzīmēts kā apmaksāts
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Citi rīkojumi
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Pārstāvis turpinot darboties klienta pasūtījumu
@@ -125,11 +125,11 @@ TypeContact_commande_internal_SHIPPING=Pārstāvis turpinot darboties kuģniecī
 TypeContact_commande_external_BILLING=Klienta rēķina kontakts
 TypeContact_commande_external_SHIPPING=Klientu kuģniecības kontakts
 TypeContact_commande_external_CUSTOMER=Klientu kontaktu šādi pasākumi, lai
-TypeContact_order_supplier_internal_SALESREPFOLL=Pārstāvis turpinot darboties piegādātājs pasūtīt
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Pārstāvis turpinot darboties kuģniecības
-TypeContact_order_supplier_external_BILLING=Piegādātāju rēķinu kontakts
-TypeContact_order_supplier_external_SHIPPING=Piegādātājs kuģniecības kontakts
-TypeContact_order_supplier_external_CUSTOMER=Piegādātājs kontaktu šādi pasākumi, lai
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Pastāvīga COMMANDE_SUPPLIER_ADDON nav noteikts
 Error_COMMANDE_ADDON_NotDefined=Pastāvīga COMMANDE_ADDON nav noteikts
 Error_OrderNotChecked=Nav pasūtījumus izvēlētā rēķina
diff --git a/htdocs/langs/lv_LV/other.lang b/htdocs/langs/lv_LV/other.lang
index 726d1b6a1fa..b3ebe64fcb0 100644
--- a/htdocs/langs/lv_LV/other.lang
+++ b/htdocs/langs/lv_LV/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=Faili ir pārāk lieli
 PleaseBePatient=Lūdzu, esiet pacietīgi ...
 NewPassword=New password
 ResetPassword=Reset password
-RequestToResetPasswordReceived=Pieprasījumu, lai mainītu savu Dolibarr paroli ir saņemta
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=Tas ir jūsu jaunās atslēgas, lai pieteiktos
 NewKeyWillBe=Jūsu jaunais galvenais, lai pieteiktos uz programmatūru, būs
 ClickHereToGoTo=Klikšķiniet šeit, lai dotos uz %s
@@ -233,6 +233,8 @@ PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=Eksportēšanas sadaļa
 AvailableFormats=Pieejamie formāti
diff --git a/htdocs/langs/lv_LV/productbatch.lang b/htdocs/langs/lv_LV/productbatch.lang
index c106802810f..88e5c429844 100644
--- a/htdocs/langs/lv_LV/productbatch.lang
+++ b/htdocs/langs/lv_LV/productbatch.lang
@@ -16,7 +16,7 @@ printEatby=Eat-by: %s
 printSellby=Sell-by: %s
 printQty=Daudz.: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic increase/decrease stock mode is forced to shipping validate and manual dispatching for reception and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
 ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
diff --git a/htdocs/langs/lv_LV/products.lang b/htdocs/langs/lv_LV/products.lang
index 5745a6e69c4..a4be557f13c 100644
--- a/htdocs/langs/lv_LV/products.lang
+++ b/htdocs/langs/lv_LV/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Pārdošanas apjoms
 PurchasedAmount=Iegādātā summa
 NewPrice=Jaunā cena
 MinPrice=Min. pārdošanas cena
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=Pārdošanas cena nevar būt zemāka par minimālo pieļaujamo šī produkta (%s bez PVN). Šis ziņojums var būt arī parādās, ja esat ievadījis pārāk lielu atlaidi.
 ContractStatusClosed=Slēgts
 ErrorProductAlreadyExists=Prece ar atsauci %s jau pastāv.
@@ -155,7 +156,7 @@ BuyingPrices=Iepirkšanas cenas
 CustomerPrices=Klienta cenas
 SuppliersPrices=Piegādātāja cenas
 SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
-CustomCode=Customs/Commodity/HS code
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=Izcelsmes valsts
 Nature=Daba
 ShortLabel=Short label
diff --git a/htdocs/langs/lv_LV/projects.lang b/htdocs/langs/lv_LV/projects.lang
index e4f9303f709..bcd56713d48 100644
--- a/htdocs/langs/lv_LV/projects.lang
+++ b/htdocs/langs/lv_LV/projects.lang
@@ -77,6 +77,7 @@ Time=Laiks
 ListOfTasks=Uzdevumu saraksts
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=Saraksts tirdzniecības priekšlikumiem saistībā ar projektu
 ListOrdersAssociatedProject=Saraksts ar klienta pasūtījumiem saistīts ar projektu
@@ -226,4 +227,4 @@ AllowCommentOnProject=Allow user comments on projects
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/lv_LV/stocks.lang b/htdocs/langs/lv_LV/stocks.lang
index cbe38e64f42..d77cde02aa8 100644
--- a/htdocs/langs/lv_LV/stocks.lang
+++ b/htdocs/langs/lv_LV/stocks.lang
@@ -203,3 +203,4 @@ RegulateStock=Regulēt krājumus
 ListInventory=Saraksts
 StockSupportServices=Stock management support services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/lv_LV/stripe.lang b/htdocs/langs/lv_LV/stripe.lang
index 4b326fb4688..a688ad06c1b 100644
--- a/htdocs/langs/lv_LV/stripe.lang
+++ b/htdocs/langs/lv_LV/stripe.lang
@@ -58,8 +58,8 @@ NameOnCard=Name on card
 CardNumber=Card Number
 ExpiryDate=Expiry Date
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/lv_LV/supplier_proposal.lang b/htdocs/langs/lv_LV/supplier_proposal.lang
index 31aecb739f7..c18fa6f869f 100644
--- a/htdocs/langs/lv_LV/supplier_proposal.lang
+++ b/htdocs/langs/lv_LV/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Supplier commercial proposals
-supplier_proposalDESC=Manage price requests to suppliers
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
 SupplierProposalNew=Jauns cenas pieprasījums
 CommRequest=Cenas pieprasījums
 CommRequests=Cenas pieprasījumi
 SearchRequest=Atrast pieprasījumu
 DraftRequests=Pieprasījuma melnraksts
-SupplierProposalsDraft=Draft supplier proposals
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=Pēdējie %s labotie cenu pieprasījumi
 RequestsOpened=Atvērt cenas pieprasījumu
-SupplierProposalArea=Supplier proposals area
-SupplierProposalShort=Supplier proposal
-SupplierProposals=Supplier proposals
-SupplierProposalsShort=Supplier proposals
+SupplierProposalArea=Vendor proposals area
+SupplierProposalShort=Vendor proposal
+SupplierProposals=Vendor proposals
+SupplierProposalsShort=Vendor proposals
 NewAskPrice=Jauns cenas pieprasījums
 ShowSupplierProposal=Rādīt cenas pieprasījumu
 AddSupplierProposal=Izveidot cenas pieprasījumu
-SupplierProposalRefFourn=Supplier ref
+SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=Piegādes datums
 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>?
@@ -47,9 +47,9 @@ CommercialAsk=Cenas pieprasījums
 DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposals=List of supplier proposal requests
-ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
-SupplierProposalsToClose=Supplier proposals to close
-SupplierProposalsToProcess=Supplier proposals to process
+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=Visi pieprasījumi
diff --git a/htdocs/langs/lv_LV/suppliers.lang b/htdocs/langs/lv_LV/suppliers.lang
index 3db39c059e9..4db0e85c2c9 100644
--- a/htdocs/langs/lv_LV/suppliers.lang
+++ b/htdocs/langs/lv_LV/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Piegādātāji
-SuppliersInvoice=Piegādātāji rēķins
-ShowSupplierInvoice=Show Supplier Invoice
-NewSupplier=Jauns piegādātājs
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=Vēsture
-ListOfSuppliers=Piegādātāju
-ShowSupplier=Rādīt piegādātāju
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=Pasūtīt datumu
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Dažiem apakšproduktiem nav norādītas cenas
 AddSupplierPrice=Pievienot pirkšanas cenu
 ChangeSupplierPrice=Mainīt piegādātāja cenu
-SupplierPrices=Piegādātāja cenas
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Šī atsauce piegādātājam jau ir saistīta ar atsauci: %s
-NoRecordedSuppliers=Nav reģistrētu piegādātāju
-SupplierPayment=Piegādātājs maksājums
-SuppliersArea=Piegādātāju sadaļa
-RefSupplierShort=Ref. piegādātājs
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=Pieejamība
-ExportDataset_fournisseur_1=Piegādātāju rēķinu sarakstu un rēķinu līnijas
-ExportDataset_fournisseur_2=Piegādātāju rēķiniem un maksājumiem
-ExportDataset_fournisseur_3=Piegādātājs pasūtījumus un pasūtījumu līnijas
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=Apstiprināt šo pasūtījumu
 ConfirmApproveThisOrder=Vai jūs tiešām vēlaties apstiprināt pasūtījumu <b>%s?</b>
 DenyingThisOrder=Deny this order
 ConfirmDenyingThisOrder=Vai jūs tiešām vēlaties aizliegt šo pasūtījumu <b>%s</b> ?
 ConfirmCancelThisOrder=Vai esat pārliecināts, ka vēlaties atcelt šo pasūtījumu <b>%s</b> ?
-AddSupplierOrder=Izveidot piegādātāju pasūtījumu
-AddSupplierInvoice=Izveidot piegādātāju rēķinu
-ListOfSupplierProductForSupplier=Produktu saraksts un piegādātāju cenas <b>%s</b>
-SentToSuppliers=Nosūtīti uz piegādātājiem
-ListOfSupplierOrders=Saraksts ar piegādātāju pasūtījumiem
-MenuOrdersSupplierToBill=Supplier orders to invoice
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Piegādes kavēšanās dienās
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-SupplierReputation=Piegādātāja reputācija
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Nepasūtīt
 NotTheGoodQualitySupplier=Nepareizs daudzums
 ReputationForThisProduct=Reputācija
 BuyerName=Pircēja vārds
 AllProductServicePrices=Visas produktu / pakalpojumu cenas
 AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=Piegādātāja cenas
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/lv_LV/website.lang b/htdocs/langs/lv_LV/website.lang
index 59ed70d7976..ff78442b0b2 100644
--- a/htdocs/langs/lv_LV/website.lang
+++ b/htdocs/langs/lv_LV/website.lang
@@ -73,7 +73,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
diff --git a/htdocs/langs/lv_LV/workflow.lang b/htdocs/langs/lv_LV/workflow.lang
index a419d4729e6..2cac3b3f650 100644
--- a/htdocs/langs/lv_LV/workflow.lang
+++ b/htdocs/langs/lv_LV/workflow.lang
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source custome
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=Automātiska veidošana
 AutomaticClassification=Automātiskā klasifikācija
diff --git a/htdocs/langs/mk_MK/accountancy.lang b/htdocs/langs/mk_MK/accountancy.lang
index c37db78c215..daa15928096 100644
--- a/htdocs/langs/mk_MK/accountancy.lang
+++ b/htdocs/langs/mk_MK/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Accounting
 ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
 ACCOUNTING_EXPORT_DATE=Date format for export file
 ACCOUNTING_EXPORT_PIECE=Export the number of piece
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Accounts with non zero values
 ListOfAccounts=List of accounts
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers 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
 
-AccountancyArea=Accountancy area
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
 AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
@@ -89,7 +90,7 @@ MenuProductsAccounts=Product accounts
 ProductsBinding=Products accounts
 Ventilation=Binding to accounts
 CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Supplier invoice binding
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
 ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
@@ -185,11 +187,12 @@ ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
-DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Group of account
 Pcgsubtype=Subgroup of account
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
 ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
 DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report 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 fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -293,4 +296,9 @@ Binded=Lines bound
 ToBind=Lines to bind
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang
index 9c7578180ab..48155618394 100644
--- a/htdocs/langs/mk_MK/admin.lang
+++ b/htdocs/langs/mk_MK/admin.lang
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems)
 MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=Method to use to send EMails
 MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
 MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
@@ -291,7 +292,7 @@ ModuleSetup=Module setup
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projects/Collaborative work
@@ -373,7 +374,8 @@ NoSmsEngine=No SMS sender manager available. SMS sender manager are not installe
 PDF=PDF
 PDFDesc=You can set each global options related to the PDF generation
 PDFAddressForging=Rules to forge address boxes
-HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=Hide products description on generated PDF
@@ -445,7 +447,8 @@ DisplayCompanyInfo=Display company address
 DisplayCompanyManagers=Display manager names
 DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party 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.
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Set this to 1 if you want to attach main document to emai
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -479,7 +485,7 @@ Module1Desc=Companies and contact management (customers, prospects...)
 Module2Name=Commercial
 Module2Desc=Commercial management
 Module10Name=Accounting
-Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching.
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=Proposals
 Module20Desc=Commercial proposal management
 Module22Name=Mass E-mailings
@@ -546,8 +552,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
-Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Payment of employee wages
 Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
@@ -561,14 +567,14 @@ Module700Name=Donations
 Module700Desc=Donation management
 Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Mantis integration
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
 Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
 Module2200Name=Dynamic Prices
@@ -576,7 +582,7 @@ Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Scheduled jobs
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API/Web services (SOAP server)
@@ -613,7 +619,7 @@ Module50100Desc=Point of sales module (POS).
 Module50200Name=Paypal
 Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Poll, Survey or Vote
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed memb
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=Other menu entries manage optional parameters.
 LogEvents=Security audit events
 Audit=Audit
@@ -1054,8 +1060,9 @@ LogEventDesc=You can enable here the logging for Dolibarr security events. Admin
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1188,11 +1195,11 @@ UserMailRequired=EMail required to create a new user
 HRMSetup=HRM module setup
 ##### Company setup #####
 CompanySetup=Companies module setup
-CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier)
-AccountCodeManager=Module for accounting code generation (customer or supplier)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
 NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
 ModelModules=Documents templates
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
@@ -1203,6 +1210,9 @@ MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
 TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=Free text on commercial proposals
 WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
 ##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=Order management setup
 OrdersNumberingModules=Orders numbering models
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe
 OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
 OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
 ##### Stock #####
-StockSetup=Warehouse module setup
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
 ##### Menu #####
 MenuDeleted=Menu deleted
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
 MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
 SuppliersSetup=Supplier module setup
-SuppliersCommandModel=Complete template of supplier order (logo...)
-SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","
 SalariesSetup=Setup of module salaries
 SortOrder=Sort order
 Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Install of external module from applic
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
-TextTitleColor=Color of page title
+TextTitleColor=Text color of Page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=Background color for Top menu
 TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
 ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-MailToMember=To send email from member page
-MailToUser=To send email from user page
-MailToProject= To send email from project page
+MailToSendProposal=Customer proposals
+MailToSendOrder=Customer orders
+MailToSendInvoice=Customer invoices
+MailToSendShipment=Shipments
+MailToSendIntervention=Interventions
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Contracts
+MailToThirdparty=Third parties
+MailToMember=Members
+MailToUser=Users
+MailToProject=Projects page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1780,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/mk_MK/bills.lang b/htdocs/langs/mk_MK/bills.lang
index 5898daa72b0..2f029928beb 100644
--- a/htdocs/langs/mk_MK/bills.lang
+++ b/htdocs/langs/mk_MK/bills.lang
@@ -109,7 +109,7 @@ CancelBill=Cancel an invoice
 SendRemindByMail=Send reminder by EMail
 DoPayment=Enter payment
 DoPaymentBack=Enter refund
-ConvertToReduc=Convert into future discount
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
@@ -120,7 +120,7 @@ BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
 BillStatusPaid=Paid
-BillStatusPaidBackOrConverted=Credit note refund or converted into discount
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Abandoned
 BillStatusValidated=Validated (needs to be paid)
@@ -296,10 +296,10 @@ DiscountType=Discount type
 NoteReason=Note/Reason
 ReasonDiscount=Reason
 DiscountOfferedBy=Granted by
-DiscountStillRemaining=Discounts available
-DiscountAlreadyCounted=Discounts already consumed
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+SupplierDiscounts=Vendors discounts
 BillAddress=Bill address
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Every %s days
 FrequencyPer_m=Every %s months
 FrequencyPer_y=Every %s years
@@ -505,9 +511,14 @@ SituationAmount=Situation invoice amount(net)
 SituationDeduction=Situation subtraction
 ModifyAllLines=Modify all lines
 CreateNextSituationInvoice=Create next situation
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=S
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
 NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
@@ -532,3 +543,4 @@ AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/mk_MK/categories.lang b/htdocs/langs/mk_MK/categories.lang
index 721f6779124..8ce44b06dbc 100644
--- a/htdocs/langs/mk_MK/categories.lang
+++ b/htdocs/langs/mk_MK/categories.lang
@@ -16,7 +16,7 @@ MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
-SubCats=Subcategories
+SubCats=Sub-categories
 CatList=List of tags/categories
 NewCategory=New tag/category
 ModifCat=Modify tag/category
@@ -85,3 +85,4 @@ CategorieRecursivHelp=If activated, product will also linked to parent category
 AddProductServiceIntoCategory=Add the following product/service
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
+ChooseCategory=Choose category
diff --git a/htdocs/langs/mk_MK/commercial.lang b/htdocs/langs/mk_MK/commercial.lang
index f6bfea9c0d3..efadc44d700 100644
--- a/htdocs/langs/mk_MK/commercial.lang
+++ b/htdocs/langs/mk_MK/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=Close
 ActionAC_EMAILING=Send mass email
 ActionAC_COM=Send customer order by mail
 ActionAC_SHIP=Send shipping by mail
-ActionAC_SUP_ORD=Send supplier order by mail
-ActionAC_SUP_INV=Send supplier invoice by mail
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=Other
 ActionAC_OTH_AUTO=Automatically inserted events
 ActionAC_MANUAL=Manually inserted events
diff --git a/htdocs/langs/mk_MK/companies.lang b/htdocs/langs/mk_MK/companies.lang
index 3473667fe55..b3e1e7b6c86 100644
--- a/htdocs/langs/mk_MK/companies.lang
+++ b/htdocs/langs/mk_MK/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Are you sure you want to delete this contact and all inheri
 MenuNewThirdParty=New third party
 MenuNewCustomer=New customer
 MenuNewProspect=New prospect
-MenuNewSupplier=New supplier
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=New private individual
-NewCompany=New company (prospect, customer, supplier)
-NewThirdParty=New third party (prospect, customer, supplier)
-CreateDolibarrThirdPartySupplier=Create a third party (supplier)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=Create third party
 CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Prospection area
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=Prospects
 ThirdPartyCustomers=Customers
 ThirdPartyCustomersStats=Customers
 ThirdPartyCustomersWithIdProf12=Customers with %s or %s
-ThirdPartySuppliers=Suppliers
+ThirdPartySuppliers=Vendors
 ThirdPartyType=Third party type
 Individual=Private individual
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
@@ -77,11 +77,11 @@ Web=Web
 Poste= Position
 DefaultLang=Language by default
 VATIsUsed=Sales tax is used
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
-ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Proposals
 OverAllOrders=Orders
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=RE Type
 TypeLocaltax2ES=IRPF Type
 WrongCustomerCode=Customer code invalid
-WrongSupplierCode=Supplier code invalid
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Customer code model
-SupplierCodeModel=Supplier code model
+SupplierCodeModel=Vendor code model
 Gencod=Bar code
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
@@ -267,7 +267,7 @@ Prospect=Prospect
 CustomerCard=Customer Card
 Customer=Customer
 CustomerRelativeDiscount=Relative customer discount
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=Relative discount
 CustomerAbsoluteDiscountShort=Absolute discount
 CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this suppl
 CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
 CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
 CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=None
 Supplier=Supplier
 AddContact=Create contact
@@ -304,13 +304,13 @@ DeleteACompany=Delete a company
 PersonalInformations=Personal data
 AccountancyCode=Accounting account
 CustomerCode=Customer code
-SupplierCode=Supplier code
+SupplierCode=Vendor code
 CustomerCodeShort=Customer code
-SupplierCodeShort=Supplier code
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=Customer code, unique for all customers
-SupplierCodeDesc=Supplier code, unique for all suppliers
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=Required if third party is a customer or prospect
-RequiredIfSupplier=Required if third party is a supplier
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=Validity controled by module
 ThisIsModuleRules=This is rules for this module
 ProspectToContact=Prospect to contact
@@ -338,7 +338,7 @@ MyContacts=My contacts
 Capital=Capital
 CapitalOf=Capital of %s
 EditCompany=Edit company
-ThisUserIsNot=This user is not a prospect, customer nor supplier
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=Check
 VATIntraCheckDesc=The link <b>%s</b> allows to ask the european VAT checker service. An external internet access from server is required for this service to work.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -396,7 +396,7 @@ ImportDataset_company_4=Third parties/Sales representatives (Assign sales repres
 PriceLevel=Price level
 DeliveryAddress=Delivery address
 AddAddress=Add address
-SupplierCategory=Supplier category
+SupplierCategory=Vendor category
 JuridicalStatus200=Independent
 DeleteFile=Delete file
 ConfirmDeleteFile=Are you sure you want to delete this file?
@@ -406,7 +406,7 @@ FiscalYearInformation=Information on the fiscal year
 FiscalMonthStart=Starting month of the fiscal year
 YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
 YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
-ListSuppliersShort=List of suppliers
+ListSuppliersShort=List of vendors
 ListProspectsShort=List of prospects
 ListCustomersShort=List of customers
 ThirdPartiesArea=Third parties and contact area
@@ -420,7 +420,7 @@ CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/mk_MK/compta.lang b/htdocs/langs/mk_MK/compta.lang
index cda96a546b8..d2cfb714900 100644
--- a/htdocs/langs/mk_MK/compta.lang
+++ b/htdocs/langs/mk_MK/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=Net paid
 VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
-VATSummary=Tax Balance
+VATSummary=Tax monthly
+VATBalance=Tax Balance
 VATPaid=Tax paid
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=Accountancy/Treasury area
 NewPayment=New payment
 Payments=Payments
 PaymentCustomerInvoice=Customer invoice payment
-PaymentSupplierInvoice=Supplier invoice payment
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
-ListOfSupplierPayments=List of supplier payments
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -110,7 +111,7 @@ ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
 CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
 SupplierAccountancyCodeShort=Sup. account. code
 AccountNumber=Account number
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
 Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
-ByProductsAndServices=By products and services
+ByProductsAndServices=By product and service
 RefExt=External ref
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
 LinkedOrder=Link to order
@@ -215,7 +218,8 @@ Mode1=Method 1
 Mode2=Method 2
 CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
 CalculationRuleDescSupplier=According to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
@@ -242,3 +246,10 @@ FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/mk_MK/dict.lang b/htdocs/langs/mk_MK/dict.lang
index ca0c61a9cbc..61a7237f472 100644
--- a/htdocs/langs/mk_MK/dict.lang
+++ b/htdocs/langs/mk_MK/dict.lang
@@ -5,7 +5,8 @@ CountryIT=Italy
 CountryES=Spain
 CountryDE=Germany
 CountryCH=Switzerland
-CountryGB=Great Britain
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=United Kingdom
 CountryUK=United Kingdom
 CountryIE=Ireland
 CountryCN=China
diff --git a/htdocs/langs/mk_MK/ecm.lang b/htdocs/langs/mk_MK/ecm.lang
index 65e9b17bdb2..5200fa30b1d 100644
--- a/htdocs/langs/mk_MK/ecm.lang
+++ b/htdocs/langs/mk_MK/ecm.lang
@@ -39,9 +39,10 @@ ShowECMSection=Show directory
 DeleteSection=Remove directory
 ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
 ECMDirectoryForFiles=Relative directory for files
-CannotRemoveDirectoryContainsFiles=Removed not possible because it contains some files
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=File manager
-ECMSelectASection=Select a directory on left tree...
+ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
diff --git a/htdocs/langs/mk_MK/errors.lang b/htdocs/langs/mk_MK/errors.lang
index ec036b28bc5..0ca7488b8cb 100644
--- a/htdocs/langs/mk_MK/errors.lang
+++ b/htdocs/langs/mk_MK/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Bar code required
 ErrorCustomerCodeAlreadyUsed=Customer code already used
 ErrorBarCodeAlreadyUsed=Bar code already used
 ErrorPrefixRequired=Prefix required
-ErrorBadSupplierCodeSyntax=Bad syntax for supplier code
-ErrorSupplierCodeRequired=Supplier code required
-ErrorSupplierCodeAlreadyUsed=Supplier code already used
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Bad parameters
 ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
 ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
@@ -87,7 +87,7 @@ ErrorsOnXLines=Errors on <b>%s</b> source record(s)
 ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
 ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s"
 ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
-ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Error on mask
 ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
-ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
diff --git a/htdocs/langs/mk_MK/install.lang b/htdocs/langs/mk_MK/install.lang
index e602c54640c..587d4f83da6 100644
--- a/htdocs/langs/mk_MK/install.lang
+++ b/htdocs/langs/mk_MK/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not
 ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
 ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be granted to be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reload all information from configuration file.
 PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
 WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called <b>install.lock</b> into Dolibarr document directory, in order to avoid malicious use of it.
 FunctionNotAvailableInThisPHP=Not available on this PHP
 ChoosedMigrateScript=Choose migration script
-DataMigration=Data migration
-DatabaseMigration=Structure database migration
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script processing
 ChooseYourSetupMode=Choose your setup mode and click "Start"...
 FreshInstall=Fresh install
@@ -146,7 +147,7 @@ NothingToDo=Nothing to do
 # upgrade
 MigrationFixData=Fix for denormalized data
 MigrationOrder=Data migration for customer's orders
-MigrationSupplierOrder=Data migration for supplier's orders
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Data migration for commercial proposals
 MigrationInvoice=Data migration for customer's invoices
 MigrationContract=Data migration for contracts
@@ -196,6 +197,8 @@ MigrationEvents=Migration of events to add event owner into assignement table
 MigrationEventsContact=Migration of events to add event contact into assignement table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 ShowNotAvailableOptions=Show not available options
diff --git a/htdocs/langs/mk_MK/ldap.lang b/htdocs/langs/mk_MK/ldap.lang
index d6360f3e540..abe11602147 100644
--- a/htdocs/langs/mk_MK/ldap.lang
+++ b/htdocs/langs/mk_MK/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Password for domain
 YouMustChangePassNextLogon=Password for user <b>%s</b> on the domain <b>%s</b> must be changed.
 UserMustChangePassNextLogon=User must change password on the domain %s
 LDAPInformationsForThisContact=Information in LDAP database for this contact
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Member type synchronized
 ContactSynchronized=Contact synchronized
 ForceSynchronize=Force synchronizing Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Failed to read LDAP database. Check LDAP module setup and database accessibility.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/mk_MK/loan.lang b/htdocs/langs/mk_MK/loan.lang
index 9aae3869cc3..534dee08867 100644
--- a/htdocs/langs/mk_MK/loan.lang
+++ b/htdocs/langs/mk_MK/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=Capital
 Insurance=Insurance
 Interest=Interest
 Nbterms=Number of terms
+Term=Term
 LoanAccountancyCapitalCode=Accounting account capital
 LoanAccountancyInsuranceCode=Accounting account insurance
 LoanAccountancyInterestCode=Accounting account interest
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=Confirm deleting this loan
 LoanDeleted=Loan Deleted Successfully
 ConfirmPayLoan=Confirm classify paid this loan
 LoanPaid=Loan Paid
-# Calc
-LoanCalc=Bank Loans Calculator
-PurchaseFinanceInfo=Purchase & Financing Information
-SalePriceOfAsset=Sale Price of Asset
-PercentageDown=Percentage Down
-LengthOfMortgage=Duration of loan
-AnnualInterestRate=Annual Interest Rate
-ExplainCalculations=Explain Calculations
-ShowMeCalculationsAndAmortization=Show me the calculations and amortization
-MortgagePaymentInformation=Mortgage Payment Information
-DownPayment=Down Payment
-DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
-InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
-MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
-MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
-MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
-MonthlyPaymentDesc=The montly payment is figured out using the following formula
-AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
-AmountFinanced=Amount Financed
-AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
-Totalsforyear=Totals for year
-MonthlyPayment=Monthly Payment
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
-GoToInterest=%s will go towards INTEREST
-GoToPrincipal=%s will go towards PRINCIPAL
-YouWillSpend=You will spend %s in year %s
 ListLoanAssociatedProject=List of loan associated with the project
 AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Interest
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-FinancialCommitment=Financial commitment
 CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/langs/mk_MK/mails.lang b/htdocs/langs/mk_MK/mails.lang
index cedcd01066b..2313910de93 100644
--- a/htdocs/langs/mk_MK/mails.lang
+++ b/htdocs/langs/mk_MK/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Sender
 MailErrorsTo=Errors to
 MailReply=Reply to
 MailTo=Receiver(s)
+MailToUsers=To user(s)
 MailCC=Copy to
+MailToCCUsers=Copy to users(s)
 MailCCC=Cached copy to
 MailTopic=EMail topic
 MailText=Message
@@ -164,4 +166,4 @@ InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/mk_MK/main.lang b/htdocs/langs/mk_MK/main.lang
index d49dbe31da4..34be39dd13f 100644
--- a/htdocs/langs/mk_MK/main.lang
+++ b/htdocs/langs/mk_MK/main.lang
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is se
 Administrator=Administrator
 Undefined=Undefined
 PasswordForgotten=Password forgotten?
+NoAccount=No account?
 SeeAbove=See above
 HomeArea=Home area
 LastConnexion=Latest connection
@@ -231,7 +232,7 @@ Limit=Limit
 Limits=Limits
 Logout=Logout
 NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Connection
+Connection=Login
 Setup=Setup
 Alert=Alert
 MenuWarnings=Alerts
@@ -402,6 +403,7 @@ DefaultTaxRate=Default tax rate
 Average=Average
 Sum=Sum
 Delta=Delta
+RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
@@ -414,7 +416,7 @@ Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
 ExternalRef=Ref. extern
-RefSupplier=Ref. supplier
+RefSupplier=Ref. vendor
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
 Comment=Comment
@@ -493,7 +495,7 @@ Received=Received
 Paid=Paid
 Topic=Subject
 ByCompanies=By third parties
-ByUsers=By users
+ByUsers=By user
 Links=Links
 Link=Link
 Rejects=Rejects
@@ -619,9 +621,9 @@ BuildDoc=Build Doc
 Entity=Environment
 Entities=Entities
 CustomerPreview=Customer preview
-SupplierPreview=Supplier preview
+SupplierPreview=Vendor preview
 ShowCustomerPreview=Show customer preview
-ShowSupplierPreview=Show supplier preview
+ShowSupplierPreview=Show vendor preview
 RefCustomer=Ref. customer
 Currency=Currency
 InfoAdmin=Information for administrators
@@ -679,7 +681,7 @@ Color=Color
 Documents=Linked files
 Documents2=Documents
 UploadDisabled=Upload disabled
-MenuAccountancy=Accountancy
+MenuAccountancy=Accounting
 MenuECM=Documents
 MenuAWStats=AWStats
 MenuMembers=Members
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=Products or services
 SearchIntoProjects=Projects
 SearchIntoTasks=Tasks
 SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Interventions
 SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
@@ -941,3 +943,5 @@ Remote=Remote
 LocalAndRemote=Local and Remote
 KeyboardShortcut=Keyboard shortcut
 AssignedTo=Assigned to
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/mk_MK/margins.lang b/htdocs/langs/mk_MK/margins.lang
index 9f590ef3718..b9d52dcfdc6 100644
--- a/htdocs/langs/mk_MK/margins.lang
+++ b/htdocs/langs/mk_MK/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=As a service
 UseDiscountOnTotal=On subtotal
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
 MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best supplier price
+MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Cost price
 UnitCharges=Unit charges
 Charges=Charges
diff --git a/htdocs/langs/mk_MK/members.lang b/htdocs/langs/mk_MK/members.lang
index 7326f3b9950..b29477e346d 100644
--- a/htdocs/langs/mk_MK/members.lang
+++ b/htdocs/langs/mk_MK/members.lang
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
diff --git a/htdocs/langs/mk_MK/opensurvey.lang b/htdocs/langs/mk_MK/opensurvey.lang
index 87e6a74913a..76684955e56 100644
--- a/htdocs/langs/mk_MK/opensurvey.lang
+++ b/htdocs/langs/mk_MK/opensurvey.lang
@@ -58,3 +58,4 @@ MoreChoices=Enter more choices for the voters
 SurveyExpiredInfo=The poll has been closed or voting delay has expired.
 EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
 ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/mk_MK/orders.lang b/htdocs/langs/mk_MK/orders.lang
index 8de0279be44..1b36a25df66 100644
--- a/htdocs/langs/mk_MK/orders.lang
+++ b/htdocs/langs/mk_MK/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Customers orders area
-SuppliersOrdersArea=Suppliers orders area
+SuppliersOrdersArea=Purchase orders area
 OrderCard=Order card
 OrderId=Order Id
 Order=Order
@@ -13,18 +13,18 @@ OrderToProcess=Order to process
 NewOrder=New order
 ToOrder=Make order
 MakeOrder=Make order
-SupplierOrder=Supplier order
-SuppliersOrders=Suppliers orders
-SuppliersOrdersRunning=Current suppliers orders
-CustomerOrder=Customer order
-CustomersOrders=Customer orders
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=Customer Order
+CustomersOrders=Customer Orders
 CustomersOrdersRunning=Current customer orders
 CustomersOrdersAndOrdersLines=Customer orders and order lines
 OrdersDeliveredToBill=Customer orders delivered to bill
 OrdersToBill=Customer orders delivered
 OrdersInProcess=Customer orders in process
 OrdersToProcess=Customer orders to process
-SuppliersOrdersToProcess=Supplier orders to process
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=Canceled
 StatusOrderDraftShort=Draft
 StatusOrderValidatedShort=Validated
@@ -75,15 +75,15 @@ ShowOrder=Show order
 OrdersOpened=Orders to process
 NoDraftOrders=No draft orders
 NoOrder=No order
-NoSupplierOrder=No supplier order
+NoSupplierOrder=No purchase order
 LastOrders=Latest %s customer orders
 LastCustomerOrders=Latest %s customer orders
-LastSupplierOrders=Latest %s supplier orders
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=Latest %s modified orders
 AllOrders=All orders
 NbOfOrders=Number of orders
 OrdersStatistics=Order's statistics
-OrdersStatisticsSuppliers=Supplier order's statistics
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Number of orders by month
 AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
 ListOfOrders=List of orders
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</
 GenerateBill=Generate invoice
 ClassifyShipped=Classify delivered
 DraftOrders=Draft orders
-DraftSuppliersOrders=Draft suppliers orders
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=In process orders
 RefOrder=Ref. order
 RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for supplier
-RefOrderSupplierShort=Ref. order supplier
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=Send order by mail
 ActionsOnOrder=Events on order
 NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
 DispatchSupplierOrder=Receiving supplier order %s
 FirstApprovalAlreadyDone=First approval already done
 SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=Supplier order %s received %s
-SupplierOrderSubmitedInDolibarr=Supplier order %s submited
-SupplierOrderClassifiedBilled=Supplier order %s set billed
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Other orders
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
@@ -125,11 +125,11 @@ TypeContact_commande_internal_SHIPPING=Representative following-up shipping
 TypeContact_commande_external_BILLING=Customer invoice contact
 TypeContact_commande_external_SHIPPING=Customer shipping contact
 TypeContact_commande_external_CUSTOMER=Customer contact following-up order
-TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
-TypeContact_order_supplier_external_BILLING=Supplier invoice contact
-TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact
-TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
 Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
 Error_OrderNotChecked=No orders to invoice selected
diff --git a/htdocs/langs/mk_MK/other.lang b/htdocs/langs/mk_MK/other.lang
index 2afabe43b06..13907ca380e 100644
--- a/htdocs/langs/mk_MK/other.lang
+++ b/htdocs/langs/mk_MK/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=Files is too big
 PleaseBePatient=Please be patient...
 NewPassword=New password
 ResetPassword=Reset password
-RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
@@ -233,6 +233,8 @@ PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=Exports area
 AvailableFormats=Available formats
diff --git a/htdocs/langs/mk_MK/productbatch.lang b/htdocs/langs/mk_MK/productbatch.lang
index 1c2d22395ce..54270c4a23b 100644
--- a/htdocs/langs/mk_MK/productbatch.lang
+++ b/htdocs/langs/mk_MK/productbatch.lang
@@ -16,7 +16,7 @@ printEatby=Eat-by: %s
 printSellby=Sell-by: %s
 printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic increase/decrease stock mode is forced to shipping validate and manual dispatching for reception and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
 ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
diff --git a/htdocs/langs/mk_MK/products.lang b/htdocs/langs/mk_MK/products.lang
index b9ebefc91c9..72e717367fc 100644
--- a/htdocs/langs/mk_MK/products.lang
+++ b/htdocs/langs/mk_MK/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
 MinPrice=Min. selling price
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
 ContractStatusClosed=Closed
 ErrorProductAlreadyExists=A product with reference %s already exists.
@@ -155,7 +156,7 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Supplier prices
 SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
-CustomCode=Customs/Commodity/HS code
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
 Nature=Nature
 ShortLabel=Short label
diff --git a/htdocs/langs/mk_MK/projects.lang b/htdocs/langs/mk_MK/projects.lang
index 319a6e7e0e2..e04f28689a1 100644
--- a/htdocs/langs/mk_MK/projects.lang
+++ b/htdocs/langs/mk_MK/projects.lang
@@ -77,6 +77,7 @@ Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer orders associated with the project
@@ -226,4 +227,4 @@ AllowCommentOnProject=Allow user comments on projects
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/mk_MK/stocks.lang b/htdocs/langs/mk_MK/stocks.lang
index 7fbe2f6b82a..aaa7e21fc0d 100644
--- a/htdocs/langs/mk_MK/stocks.lang
+++ b/htdocs/langs/mk_MK/stocks.lang
@@ -203,3 +203,4 @@ RegulateStock=Regulate Stock
 ListInventory=List
 StockSupportServices=Stock management support services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/mk_MK/stripe.lang b/htdocs/langs/mk_MK/stripe.lang
index 9fb2fa45113..6fa072b4c9a 100644
--- a/htdocs/langs/mk_MK/stripe.lang
+++ b/htdocs/langs/mk_MK/stripe.lang
@@ -58,8 +58,8 @@ NameOnCard=Name on card
 CardNumber=Card Number
 ExpiryDate=Expiry Date
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/mk_MK/supplier_proposal.lang b/htdocs/langs/mk_MK/supplier_proposal.lang
index d5b51978920..ef2e7242e31 100644
--- a/htdocs/langs/mk_MK/supplier_proposal.lang
+++ b/htdocs/langs/mk_MK/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Supplier commercial proposals
-supplier_proposalDESC=Manage price requests to suppliers
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
 SupplierProposalNew=New price request
 CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
-SupplierProposalsDraft=Draft supplier proposals
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=Latest %s modified price requests
 RequestsOpened=Open price requests
-SupplierProposalArea=Supplier proposals area
-SupplierProposalShort=Supplier proposal
-SupplierProposals=Supplier proposals
-SupplierProposalsShort=Supplier proposals
+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=Supplier ref
+SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=Delivery date
 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>?
@@ -47,9 +47,9 @@ CommercialAsk=Price request
 DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposals=List of supplier proposal requests
-ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
-SupplierProposalsToClose=Supplier proposals to close
-SupplierProposalsToProcess=Supplier proposals to process
+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
diff --git a/htdocs/langs/mk_MK/suppliers.lang b/htdocs/langs/mk_MK/suppliers.lang
index aaec88a2037..def35a334b4 100644
--- a/htdocs/langs/mk_MK/suppliers.lang
+++ b/htdocs/langs/mk_MK/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Suppliers
-SuppliersInvoice=Suppliers invoice
-ShowSupplierInvoice=Show Supplier Invoice
-NewSupplier=New supplier
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=History
-ListOfSuppliers=List of suppliers
-ShowSupplier=Show supplier
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=Order date
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
-SupplierPrices=Supplier prices
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
-NoRecordedSuppliers=No suppliers recorded
-SupplierPayment=Supplier payment
-SuppliersArea=Suppliers area
-RefSupplierShort=Ref. supplier
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=Availability
-ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
-ExportDataset_fournisseur_2=Supplier invoices and payments
-ExportDataset_fournisseur_3=Supplier orders and order lines
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=Approve this order
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b> ?
 DenyingThisOrder=Deny this order
 ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b> ?
 ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b> ?
-AddSupplierOrder=Create supplier order
-AddSupplierInvoice=Create supplier invoice
-ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
-SentToSuppliers=Sent to suppliers
-ListOfSupplierOrders=List of supplier orders
-MenuOrdersSupplierToBill=Supplier orders to invoice
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-SupplierReputation=Supplier reputation
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
 AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=Supplier prices
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/mk_MK/website.lang b/htdocs/langs/mk_MK/website.lang
index 0350da13f8f..0f0673e3716 100644
--- a/htdocs/langs/mk_MK/website.lang
+++ b/htdocs/langs/mk_MK/website.lang
@@ -73,7 +73,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
diff --git a/htdocs/langs/mk_MK/workflow.lang b/htdocs/langs/mk_MK/workflow.lang
index a50bd91595b..783373ad66d 100644
--- a/htdocs/langs/mk_MK/workflow.lang
+++ b/htdocs/langs/mk_MK/workflow.lang
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source custome
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/mn_MN/accountancy.lang b/htdocs/langs/mn_MN/accountancy.lang
index c37db78c215..daa15928096 100644
--- a/htdocs/langs/mn_MN/accountancy.lang
+++ b/htdocs/langs/mn_MN/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Accounting
 ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
 ACCOUNTING_EXPORT_DATE=Date format for export file
 ACCOUNTING_EXPORT_PIECE=Export the number of piece
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Accounts with non zero values
 ListOfAccounts=List of accounts
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers 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
 
-AccountancyArea=Accountancy area
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
 AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
@@ -89,7 +90,7 @@ MenuProductsAccounts=Product accounts
 ProductsBinding=Products accounts
 Ventilation=Binding to accounts
 CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Supplier invoice binding
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
 ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
@@ -185,11 +187,12 @@ ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
-DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Group of account
 Pcgsubtype=Subgroup of account
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
 ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
 DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report 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 fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -293,4 +296,9 @@ Binded=Lines bound
 ToBind=Lines to bind
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/mn_MN/admin.lang b/htdocs/langs/mn_MN/admin.lang
index fed6af9a6fa..28eb076c540 100644
--- a/htdocs/langs/mn_MN/admin.lang
+++ b/htdocs/langs/mn_MN/admin.lang
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems)
 MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=Method to use to send EMails
 MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
 MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
@@ -291,7 +292,7 @@ ModuleSetup=Module setup
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projects/Collaborative work
@@ -373,7 +374,8 @@ NoSmsEngine=No SMS sender manager available. SMS sender manager are not installe
 PDF=PDF
 PDFDesc=You can set each global options related to the PDF generation
 PDFAddressForging=Rules to forge address boxes
-HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=Hide products description on generated PDF
@@ -445,7 +447,8 @@ DisplayCompanyInfo=Display company address
 DisplayCompanyManagers=Display manager names
 DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party 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.
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Set this to 1 if you want to attach main document to emai
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -479,7 +485,7 @@ Module1Desc=Companies and contact management (customers, prospects...)
 Module2Name=Commercial
 Module2Desc=Commercial management
 Module10Name=Accounting
-Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching.
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=Proposals
 Module20Desc=Commercial proposal management
 Module22Name=Mass E-mailings
@@ -546,8 +552,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
-Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Payment of employee wages
 Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
@@ -561,14 +567,14 @@ Module700Name=Donations
 Module700Desc=Donation management
 Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Mantis integration
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
 Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
 Module2200Name=Dynamic Prices
@@ -576,7 +582,7 @@ Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Scheduled jobs
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API/Web services (SOAP server)
@@ -613,7 +619,7 @@ Module50100Desc=Point of sales module (POS).
 Module50200Name=Paypal
 Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Poll, Survey or Vote
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed memb
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=Other menu entries manage optional parameters.
 LogEvents=Security audit events
 Audit=Audit
@@ -1054,8 +1060,9 @@ LogEventDesc=You can enable here the logging for Dolibarr security events. Admin
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1188,11 +1195,11 @@ UserMailRequired=EMail required to create a new user
 HRMSetup=HRM module setup
 ##### Company setup #####
 CompanySetup=Companies module setup
-CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier)
-AccountCodeManager=Module for accounting code generation (customer or supplier)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
 NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
 ModelModules=Documents templates
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
@@ -1203,6 +1210,9 @@ MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
 TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=Free text on commercial proposals
 WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
 ##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=Order management setup
 OrdersNumberingModules=Orders numbering models
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe
 OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
 OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
 ##### Stock #####
-StockSetup=Warehouse module setup
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
 ##### Menu #####
 MenuDeleted=Menu deleted
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
 MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
 SuppliersSetup=Supplier module setup
-SuppliersCommandModel=Complete template of supplier order (logo...)
-SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","
 SalariesSetup=Setup of module salaries
 SortOrder=Sort order
 Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Install of external module from applic
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
-TextTitleColor=Color of page title
+TextTitleColor=Text color of Page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=Background color for Top menu
 TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
 ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-MailToMember=To send email from member page
-MailToUser=To send email from user page
-MailToProject= To send email from project page
+MailToSendProposal=Customer proposals
+MailToSendOrder=Customer orders
+MailToSendInvoice=Customer invoices
+MailToSendShipment=Shipments
+MailToSendIntervention=Interventions
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Contracts
+MailToThirdparty=Third parties
+MailToMember=Members
+MailToUser=Users
+MailToProject=Projects page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1780,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/mn_MN/bills.lang b/htdocs/langs/mn_MN/bills.lang
index 5898daa72b0..2f029928beb 100644
--- a/htdocs/langs/mn_MN/bills.lang
+++ b/htdocs/langs/mn_MN/bills.lang
@@ -109,7 +109,7 @@ CancelBill=Cancel an invoice
 SendRemindByMail=Send reminder by EMail
 DoPayment=Enter payment
 DoPaymentBack=Enter refund
-ConvertToReduc=Convert into future discount
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
@@ -120,7 +120,7 @@ BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
 BillStatusPaid=Paid
-BillStatusPaidBackOrConverted=Credit note refund or converted into discount
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Abandoned
 BillStatusValidated=Validated (needs to be paid)
@@ -296,10 +296,10 @@ DiscountType=Discount type
 NoteReason=Note/Reason
 ReasonDiscount=Reason
 DiscountOfferedBy=Granted by
-DiscountStillRemaining=Discounts available
-DiscountAlreadyCounted=Discounts already consumed
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+SupplierDiscounts=Vendors discounts
 BillAddress=Bill address
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Every %s days
 FrequencyPer_m=Every %s months
 FrequencyPer_y=Every %s years
@@ -505,9 +511,14 @@ SituationAmount=Situation invoice amount(net)
 SituationDeduction=Situation subtraction
 ModifyAllLines=Modify all lines
 CreateNextSituationInvoice=Create next situation
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=S
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
 NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
@@ -532,3 +543,4 @@ AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/mn_MN/categories.lang b/htdocs/langs/mn_MN/categories.lang
index 41e5f4e4c13..c0c8d4c0cef 100644
--- a/htdocs/langs/mn_MN/categories.lang
+++ b/htdocs/langs/mn_MN/categories.lang
@@ -16,7 +16,7 @@ MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
-SubCats=Subcategories
+SubCats=Sub-categories
 CatList=List of tags/categories
 NewCategory=New tag/category
 ModifCat=Modify tag/category
@@ -85,3 +85,4 @@ CategorieRecursivHelp=If activated, product will also linked to parent category
 AddProductServiceIntoCategory=Add the following product/service
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
+ChooseCategory=Choose category
diff --git a/htdocs/langs/mn_MN/commercial.lang b/htdocs/langs/mn_MN/commercial.lang
index f6bfea9c0d3..efadc44d700 100644
--- a/htdocs/langs/mn_MN/commercial.lang
+++ b/htdocs/langs/mn_MN/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=Close
 ActionAC_EMAILING=Send mass email
 ActionAC_COM=Send customer order by mail
 ActionAC_SHIP=Send shipping by mail
-ActionAC_SUP_ORD=Send supplier order by mail
-ActionAC_SUP_INV=Send supplier invoice by mail
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=Other
 ActionAC_OTH_AUTO=Automatically inserted events
 ActionAC_MANUAL=Manually inserted events
diff --git a/htdocs/langs/mn_MN/companies.lang b/htdocs/langs/mn_MN/companies.lang
index 3473667fe55..b3e1e7b6c86 100644
--- a/htdocs/langs/mn_MN/companies.lang
+++ b/htdocs/langs/mn_MN/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Are you sure you want to delete this contact and all inheri
 MenuNewThirdParty=New third party
 MenuNewCustomer=New customer
 MenuNewProspect=New prospect
-MenuNewSupplier=New supplier
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=New private individual
-NewCompany=New company (prospect, customer, supplier)
-NewThirdParty=New third party (prospect, customer, supplier)
-CreateDolibarrThirdPartySupplier=Create a third party (supplier)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=Create third party
 CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Prospection area
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=Prospects
 ThirdPartyCustomers=Customers
 ThirdPartyCustomersStats=Customers
 ThirdPartyCustomersWithIdProf12=Customers with %s or %s
-ThirdPartySuppliers=Suppliers
+ThirdPartySuppliers=Vendors
 ThirdPartyType=Third party type
 Individual=Private individual
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
@@ -77,11 +77,11 @@ Web=Web
 Poste= Position
 DefaultLang=Language by default
 VATIsUsed=Sales tax is used
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
-ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Proposals
 OverAllOrders=Orders
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=RE Type
 TypeLocaltax2ES=IRPF Type
 WrongCustomerCode=Customer code invalid
-WrongSupplierCode=Supplier code invalid
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Customer code model
-SupplierCodeModel=Supplier code model
+SupplierCodeModel=Vendor code model
 Gencod=Bar code
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
@@ -267,7 +267,7 @@ Prospect=Prospect
 CustomerCard=Customer Card
 Customer=Customer
 CustomerRelativeDiscount=Relative customer discount
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=Relative discount
 CustomerAbsoluteDiscountShort=Absolute discount
 CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this suppl
 CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
 CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
 CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=None
 Supplier=Supplier
 AddContact=Create contact
@@ -304,13 +304,13 @@ DeleteACompany=Delete a company
 PersonalInformations=Personal data
 AccountancyCode=Accounting account
 CustomerCode=Customer code
-SupplierCode=Supplier code
+SupplierCode=Vendor code
 CustomerCodeShort=Customer code
-SupplierCodeShort=Supplier code
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=Customer code, unique for all customers
-SupplierCodeDesc=Supplier code, unique for all suppliers
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=Required if third party is a customer or prospect
-RequiredIfSupplier=Required if third party is a supplier
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=Validity controled by module
 ThisIsModuleRules=This is rules for this module
 ProspectToContact=Prospect to contact
@@ -338,7 +338,7 @@ MyContacts=My contacts
 Capital=Capital
 CapitalOf=Capital of %s
 EditCompany=Edit company
-ThisUserIsNot=This user is not a prospect, customer nor supplier
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=Check
 VATIntraCheckDesc=The link <b>%s</b> allows to ask the european VAT checker service. An external internet access from server is required for this service to work.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -396,7 +396,7 @@ ImportDataset_company_4=Third parties/Sales representatives (Assign sales repres
 PriceLevel=Price level
 DeliveryAddress=Delivery address
 AddAddress=Add address
-SupplierCategory=Supplier category
+SupplierCategory=Vendor category
 JuridicalStatus200=Independent
 DeleteFile=Delete file
 ConfirmDeleteFile=Are you sure you want to delete this file?
@@ -406,7 +406,7 @@ FiscalYearInformation=Information on the fiscal year
 FiscalMonthStart=Starting month of the fiscal year
 YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
 YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
-ListSuppliersShort=List of suppliers
+ListSuppliersShort=List of vendors
 ListProspectsShort=List of prospects
 ListCustomersShort=List of customers
 ThirdPartiesArea=Third parties and contact area
@@ -420,7 +420,7 @@ CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/mn_MN/compta.lang b/htdocs/langs/mn_MN/compta.lang
index cda96a546b8..d2cfb714900 100644
--- a/htdocs/langs/mn_MN/compta.lang
+++ b/htdocs/langs/mn_MN/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=Net paid
 VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
-VATSummary=Tax Balance
+VATSummary=Tax monthly
+VATBalance=Tax Balance
 VATPaid=Tax paid
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=Accountancy/Treasury area
 NewPayment=New payment
 Payments=Payments
 PaymentCustomerInvoice=Customer invoice payment
-PaymentSupplierInvoice=Supplier invoice payment
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
-ListOfSupplierPayments=List of supplier payments
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -110,7 +111,7 @@ ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
 CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
 SupplierAccountancyCodeShort=Sup. account. code
 AccountNumber=Account number
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
 Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
-ByProductsAndServices=By products and services
+ByProductsAndServices=By product and service
 RefExt=External ref
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
 LinkedOrder=Link to order
@@ -215,7 +218,8 @@ Mode1=Method 1
 Mode2=Method 2
 CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
 CalculationRuleDescSupplier=According to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
@@ -242,3 +246,10 @@ FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/mn_MN/dict.lang b/htdocs/langs/mn_MN/dict.lang
index ca0c61a9cbc..61a7237f472 100644
--- a/htdocs/langs/mn_MN/dict.lang
+++ b/htdocs/langs/mn_MN/dict.lang
@@ -5,7 +5,8 @@ CountryIT=Italy
 CountryES=Spain
 CountryDE=Germany
 CountryCH=Switzerland
-CountryGB=Great Britain
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=United Kingdom
 CountryUK=United Kingdom
 CountryIE=Ireland
 CountryCN=China
diff --git a/htdocs/langs/mn_MN/ecm.lang b/htdocs/langs/mn_MN/ecm.lang
index 65e9b17bdb2..5200fa30b1d 100644
--- a/htdocs/langs/mn_MN/ecm.lang
+++ b/htdocs/langs/mn_MN/ecm.lang
@@ -39,9 +39,10 @@ ShowECMSection=Show directory
 DeleteSection=Remove directory
 ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
 ECMDirectoryForFiles=Relative directory for files
-CannotRemoveDirectoryContainsFiles=Removed not possible because it contains some files
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=File manager
-ECMSelectASection=Select a directory on left tree...
+ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
diff --git a/htdocs/langs/mn_MN/errors.lang b/htdocs/langs/mn_MN/errors.lang
index ec036b28bc5..0ca7488b8cb 100644
--- a/htdocs/langs/mn_MN/errors.lang
+++ b/htdocs/langs/mn_MN/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Bar code required
 ErrorCustomerCodeAlreadyUsed=Customer code already used
 ErrorBarCodeAlreadyUsed=Bar code already used
 ErrorPrefixRequired=Prefix required
-ErrorBadSupplierCodeSyntax=Bad syntax for supplier code
-ErrorSupplierCodeRequired=Supplier code required
-ErrorSupplierCodeAlreadyUsed=Supplier code already used
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Bad parameters
 ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
 ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
@@ -87,7 +87,7 @@ ErrorsOnXLines=Errors on <b>%s</b> source record(s)
 ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
 ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s"
 ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
-ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Error on mask
 ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
-ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
diff --git a/htdocs/langs/mn_MN/install.lang b/htdocs/langs/mn_MN/install.lang
index e602c54640c..587d4f83da6 100644
--- a/htdocs/langs/mn_MN/install.lang
+++ b/htdocs/langs/mn_MN/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not
 ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
 ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be granted to be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reload all information from configuration file.
 PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
 WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called <b>install.lock</b> into Dolibarr document directory, in order to avoid malicious use of it.
 FunctionNotAvailableInThisPHP=Not available on this PHP
 ChoosedMigrateScript=Choose migration script
-DataMigration=Data migration
-DatabaseMigration=Structure database migration
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script processing
 ChooseYourSetupMode=Choose your setup mode and click "Start"...
 FreshInstall=Fresh install
@@ -146,7 +147,7 @@ NothingToDo=Nothing to do
 # upgrade
 MigrationFixData=Fix for denormalized data
 MigrationOrder=Data migration for customer's orders
-MigrationSupplierOrder=Data migration for supplier's orders
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Data migration for commercial proposals
 MigrationInvoice=Data migration for customer's invoices
 MigrationContract=Data migration for contracts
@@ -196,6 +197,8 @@ MigrationEvents=Migration of events to add event owner into assignement table
 MigrationEventsContact=Migration of events to add event contact into assignement table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 ShowNotAvailableOptions=Show not available options
diff --git a/htdocs/langs/mn_MN/ldap.lang b/htdocs/langs/mn_MN/ldap.lang
index d6360f3e540..abe11602147 100644
--- a/htdocs/langs/mn_MN/ldap.lang
+++ b/htdocs/langs/mn_MN/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Password for domain
 YouMustChangePassNextLogon=Password for user <b>%s</b> on the domain <b>%s</b> must be changed.
 UserMustChangePassNextLogon=User must change password on the domain %s
 LDAPInformationsForThisContact=Information in LDAP database for this contact
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Member type synchronized
 ContactSynchronized=Contact synchronized
 ForceSynchronize=Force synchronizing Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Failed to read LDAP database. Check LDAP module setup and database accessibility.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/mn_MN/loan.lang b/htdocs/langs/mn_MN/loan.lang
index 9aae3869cc3..534dee08867 100644
--- a/htdocs/langs/mn_MN/loan.lang
+++ b/htdocs/langs/mn_MN/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=Capital
 Insurance=Insurance
 Interest=Interest
 Nbterms=Number of terms
+Term=Term
 LoanAccountancyCapitalCode=Accounting account capital
 LoanAccountancyInsuranceCode=Accounting account insurance
 LoanAccountancyInterestCode=Accounting account interest
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=Confirm deleting this loan
 LoanDeleted=Loan Deleted Successfully
 ConfirmPayLoan=Confirm classify paid this loan
 LoanPaid=Loan Paid
-# Calc
-LoanCalc=Bank Loans Calculator
-PurchaseFinanceInfo=Purchase & Financing Information
-SalePriceOfAsset=Sale Price of Asset
-PercentageDown=Percentage Down
-LengthOfMortgage=Duration of loan
-AnnualInterestRate=Annual Interest Rate
-ExplainCalculations=Explain Calculations
-ShowMeCalculationsAndAmortization=Show me the calculations and amortization
-MortgagePaymentInformation=Mortgage Payment Information
-DownPayment=Down Payment
-DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
-InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
-MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
-MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
-MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
-MonthlyPaymentDesc=The montly payment is figured out using the following formula
-AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
-AmountFinanced=Amount Financed
-AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
-Totalsforyear=Totals for year
-MonthlyPayment=Monthly Payment
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
-GoToInterest=%s will go towards INTEREST
-GoToPrincipal=%s will go towards PRINCIPAL
-YouWillSpend=You will spend %s in year %s
 ListLoanAssociatedProject=List of loan associated with the project
 AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Interest
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-FinancialCommitment=Financial commitment
 CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/langs/mn_MN/mails.lang b/htdocs/langs/mn_MN/mails.lang
index cedcd01066b..2313910de93 100644
--- a/htdocs/langs/mn_MN/mails.lang
+++ b/htdocs/langs/mn_MN/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Sender
 MailErrorsTo=Errors to
 MailReply=Reply to
 MailTo=Receiver(s)
+MailToUsers=To user(s)
 MailCC=Copy to
+MailToCCUsers=Copy to users(s)
 MailCCC=Cached copy to
 MailTopic=EMail topic
 MailText=Message
@@ -164,4 +166,4 @@ InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/mn_MN/main.lang b/htdocs/langs/mn_MN/main.lang
index dc1de2e4f7a..d49881763a1 100644
--- a/htdocs/langs/mn_MN/main.lang
+++ b/htdocs/langs/mn_MN/main.lang
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is se
 Administrator=Administrator
 Undefined=Undefined
 PasswordForgotten=Password forgotten?
+NoAccount=No account?
 SeeAbove=See above
 HomeArea=Home area
 LastConnexion=Latest connection
@@ -231,7 +232,7 @@ Limit=Limit
 Limits=Limits
 Logout=Logout
 NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Connection
+Connection=Login
 Setup=Setup
 Alert=Alert
 MenuWarnings=Alerts
@@ -402,6 +403,7 @@ DefaultTaxRate=Default tax rate
 Average=Average
 Sum=Sum
 Delta=Delta
+RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
@@ -414,7 +416,7 @@ Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
 ExternalRef=Ref. extern
-RefSupplier=Ref. supplier
+RefSupplier=Ref. vendor
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
 Comment=Comment
@@ -493,7 +495,7 @@ Received=Received
 Paid=Paid
 Topic=Subject
 ByCompanies=By third parties
-ByUsers=By users
+ByUsers=By user
 Links=Links
 Link=Link
 Rejects=Rejects
@@ -619,9 +621,9 @@ BuildDoc=Build Doc
 Entity=Environment
 Entities=Entities
 CustomerPreview=Customer preview
-SupplierPreview=Supplier preview
+SupplierPreview=Vendor preview
 ShowCustomerPreview=Show customer preview
-ShowSupplierPreview=Show supplier preview
+ShowSupplierPreview=Show vendor preview
 RefCustomer=Ref. customer
 Currency=Currency
 InfoAdmin=Information for administrators
@@ -679,7 +681,7 @@ Color=Color
 Documents=Linked files
 Documents2=Documents
 UploadDisabled=Upload disabled
-MenuAccountancy=Accountancy
+MenuAccountancy=Accounting
 MenuECM=Documents
 MenuAWStats=AWStats
 MenuMembers=Members
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=Products or services
 SearchIntoProjects=Projects
 SearchIntoTasks=Tasks
 SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Interventions
 SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
@@ -941,3 +943,5 @@ Remote=Remote
 LocalAndRemote=Local and Remote
 KeyboardShortcut=Keyboard shortcut
 AssignedTo=Assigned to
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/mn_MN/margins.lang b/htdocs/langs/mn_MN/margins.lang
index 9f590ef3718..b9d52dcfdc6 100644
--- a/htdocs/langs/mn_MN/margins.lang
+++ b/htdocs/langs/mn_MN/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=As a service
 UseDiscountOnTotal=On subtotal
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
 MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best supplier price
+MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Cost price
 UnitCharges=Unit charges
 Charges=Charges
diff --git a/htdocs/langs/mn_MN/members.lang b/htdocs/langs/mn_MN/members.lang
index 7326f3b9950..b29477e346d 100644
--- a/htdocs/langs/mn_MN/members.lang
+++ b/htdocs/langs/mn_MN/members.lang
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
diff --git a/htdocs/langs/mn_MN/opensurvey.lang b/htdocs/langs/mn_MN/opensurvey.lang
index 87e6a74913a..76684955e56 100644
--- a/htdocs/langs/mn_MN/opensurvey.lang
+++ b/htdocs/langs/mn_MN/opensurvey.lang
@@ -58,3 +58,4 @@ MoreChoices=Enter more choices for the voters
 SurveyExpiredInfo=The poll has been closed or voting delay has expired.
 EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
 ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/mn_MN/orders.lang b/htdocs/langs/mn_MN/orders.lang
index 8de0279be44..1b36a25df66 100644
--- a/htdocs/langs/mn_MN/orders.lang
+++ b/htdocs/langs/mn_MN/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Customers orders area
-SuppliersOrdersArea=Suppliers orders area
+SuppliersOrdersArea=Purchase orders area
 OrderCard=Order card
 OrderId=Order Id
 Order=Order
@@ -13,18 +13,18 @@ OrderToProcess=Order to process
 NewOrder=New order
 ToOrder=Make order
 MakeOrder=Make order
-SupplierOrder=Supplier order
-SuppliersOrders=Suppliers orders
-SuppliersOrdersRunning=Current suppliers orders
-CustomerOrder=Customer order
-CustomersOrders=Customer orders
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=Customer Order
+CustomersOrders=Customer Orders
 CustomersOrdersRunning=Current customer orders
 CustomersOrdersAndOrdersLines=Customer orders and order lines
 OrdersDeliveredToBill=Customer orders delivered to bill
 OrdersToBill=Customer orders delivered
 OrdersInProcess=Customer orders in process
 OrdersToProcess=Customer orders to process
-SuppliersOrdersToProcess=Supplier orders to process
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=Canceled
 StatusOrderDraftShort=Draft
 StatusOrderValidatedShort=Validated
@@ -75,15 +75,15 @@ ShowOrder=Show order
 OrdersOpened=Orders to process
 NoDraftOrders=No draft orders
 NoOrder=No order
-NoSupplierOrder=No supplier order
+NoSupplierOrder=No purchase order
 LastOrders=Latest %s customer orders
 LastCustomerOrders=Latest %s customer orders
-LastSupplierOrders=Latest %s supplier orders
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=Latest %s modified orders
 AllOrders=All orders
 NbOfOrders=Number of orders
 OrdersStatistics=Order's statistics
-OrdersStatisticsSuppliers=Supplier order's statistics
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Number of orders by month
 AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
 ListOfOrders=List of orders
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</
 GenerateBill=Generate invoice
 ClassifyShipped=Classify delivered
 DraftOrders=Draft orders
-DraftSuppliersOrders=Draft suppliers orders
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=In process orders
 RefOrder=Ref. order
 RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for supplier
-RefOrderSupplierShort=Ref. order supplier
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=Send order by mail
 ActionsOnOrder=Events on order
 NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
 DispatchSupplierOrder=Receiving supplier order %s
 FirstApprovalAlreadyDone=First approval already done
 SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=Supplier order %s received %s
-SupplierOrderSubmitedInDolibarr=Supplier order %s submited
-SupplierOrderClassifiedBilled=Supplier order %s set billed
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Other orders
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
@@ -125,11 +125,11 @@ TypeContact_commande_internal_SHIPPING=Representative following-up shipping
 TypeContact_commande_external_BILLING=Customer invoice contact
 TypeContact_commande_external_SHIPPING=Customer shipping contact
 TypeContact_commande_external_CUSTOMER=Customer contact following-up order
-TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
-TypeContact_order_supplier_external_BILLING=Supplier invoice contact
-TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact
-TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
 Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
 Error_OrderNotChecked=No orders to invoice selected
diff --git a/htdocs/langs/mn_MN/other.lang b/htdocs/langs/mn_MN/other.lang
index 2afabe43b06..13907ca380e 100644
--- a/htdocs/langs/mn_MN/other.lang
+++ b/htdocs/langs/mn_MN/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=Files is too big
 PleaseBePatient=Please be patient...
 NewPassword=New password
 ResetPassword=Reset password
-RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
@@ -233,6 +233,8 @@ PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=Exports area
 AvailableFormats=Available formats
diff --git a/htdocs/langs/mn_MN/productbatch.lang b/htdocs/langs/mn_MN/productbatch.lang
index 1c2d22395ce..54270c4a23b 100644
--- a/htdocs/langs/mn_MN/productbatch.lang
+++ b/htdocs/langs/mn_MN/productbatch.lang
@@ -16,7 +16,7 @@ printEatby=Eat-by: %s
 printSellby=Sell-by: %s
 printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic increase/decrease stock mode is forced to shipping validate and manual dispatching for reception and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
 ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
diff --git a/htdocs/langs/mn_MN/products.lang b/htdocs/langs/mn_MN/products.lang
index b9ebefc91c9..72e717367fc 100644
--- a/htdocs/langs/mn_MN/products.lang
+++ b/htdocs/langs/mn_MN/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
 MinPrice=Min. selling price
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
 ContractStatusClosed=Closed
 ErrorProductAlreadyExists=A product with reference %s already exists.
@@ -155,7 +156,7 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Supplier prices
 SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
-CustomCode=Customs/Commodity/HS code
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
 Nature=Nature
 ShortLabel=Short label
diff --git a/htdocs/langs/mn_MN/projects.lang b/htdocs/langs/mn_MN/projects.lang
index 319a6e7e0e2..e04f28689a1 100644
--- a/htdocs/langs/mn_MN/projects.lang
+++ b/htdocs/langs/mn_MN/projects.lang
@@ -77,6 +77,7 @@ Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer orders associated with the project
@@ -226,4 +227,4 @@ AllowCommentOnProject=Allow user comments on projects
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/mn_MN/stocks.lang b/htdocs/langs/mn_MN/stocks.lang
index 7fbe2f6b82a..aaa7e21fc0d 100644
--- a/htdocs/langs/mn_MN/stocks.lang
+++ b/htdocs/langs/mn_MN/stocks.lang
@@ -203,3 +203,4 @@ RegulateStock=Regulate Stock
 ListInventory=List
 StockSupportServices=Stock management support services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/mn_MN/stripe.lang b/htdocs/langs/mn_MN/stripe.lang
index 9fb2fa45113..6fa072b4c9a 100644
--- a/htdocs/langs/mn_MN/stripe.lang
+++ b/htdocs/langs/mn_MN/stripe.lang
@@ -58,8 +58,8 @@ NameOnCard=Name on card
 CardNumber=Card Number
 ExpiryDate=Expiry Date
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/mn_MN/supplier_proposal.lang b/htdocs/langs/mn_MN/supplier_proposal.lang
index d5b51978920..ef2e7242e31 100644
--- a/htdocs/langs/mn_MN/supplier_proposal.lang
+++ b/htdocs/langs/mn_MN/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Supplier commercial proposals
-supplier_proposalDESC=Manage price requests to suppliers
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
 SupplierProposalNew=New price request
 CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
-SupplierProposalsDraft=Draft supplier proposals
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=Latest %s modified price requests
 RequestsOpened=Open price requests
-SupplierProposalArea=Supplier proposals area
-SupplierProposalShort=Supplier proposal
-SupplierProposals=Supplier proposals
-SupplierProposalsShort=Supplier proposals
+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=Supplier ref
+SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=Delivery date
 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>?
@@ -47,9 +47,9 @@ CommercialAsk=Price request
 DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposals=List of supplier proposal requests
-ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
-SupplierProposalsToClose=Supplier proposals to close
-SupplierProposalsToProcess=Supplier proposals to process
+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
diff --git a/htdocs/langs/mn_MN/suppliers.lang b/htdocs/langs/mn_MN/suppliers.lang
index f9e383e09af..d0cf540d3eb 100644
--- a/htdocs/langs/mn_MN/suppliers.lang
+++ b/htdocs/langs/mn_MN/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Suppliers
-SuppliersInvoice=Suppliers invoice
-ShowSupplierInvoice=Show Supplier Invoice
-NewSupplier=New supplier
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=History
-ListOfSuppliers=List of suppliers
-ShowSupplier=Show supplier
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=Order date
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
-SupplierPrices=Supplier prices
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
-NoRecordedSuppliers=No suppliers recorded
-SupplierPayment=Supplier payment
-SuppliersArea=Suppliers area
-RefSupplierShort=Ref. supplier
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=Availability
-ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
-ExportDataset_fournisseur_2=Supplier invoices and payments
-ExportDataset_fournisseur_3=Supplier orders and order lines
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=Approve this order
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
 ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
 ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
-AddSupplierOrder=Create supplier order
-AddSupplierInvoice=Create supplier invoice
-ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
-SentToSuppliers=Sent to suppliers
-ListOfSupplierOrders=List of supplier orders
-MenuOrdersSupplierToBill=Supplier orders to invoice
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-SupplierReputation=Supplier reputation
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
 AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=Supplier prices
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/mn_MN/website.lang b/htdocs/langs/mn_MN/website.lang
index 0350da13f8f..0f0673e3716 100644
--- a/htdocs/langs/mn_MN/website.lang
+++ b/htdocs/langs/mn_MN/website.lang
@@ -73,7 +73,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
diff --git a/htdocs/langs/mn_MN/workflow.lang b/htdocs/langs/mn_MN/workflow.lang
index a50bd91595b..783373ad66d 100644
--- a/htdocs/langs/mn_MN/workflow.lang
+++ b/htdocs/langs/mn_MN/workflow.lang
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source custome
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/nb_NO/accountancy.lang b/htdocs/langs/nb_NO/accountancy.lang
index f2bdc0ec065..5766eda6699 100644
--- a/htdocs/langs/nb_NO/accountancy.lang
+++ b/htdocs/langs/nb_NO/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Regnskap
 ACCOUNTING_EXPORT_SEPARATORCSV=Kolonneseparator for eksportfil
 ACCOUNTING_EXPORT_DATE=Datoformat for eksportfil
 ACCOUNTING_EXPORT_PIECE=Eksporter antall enheter
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Kontoer med ingen nullverdier
 ListOfAccounts=Liste over kontoer
 
 MainAccountForCustomersNotDefined=Hoved regnskapskonto for kunder som ikke er definert i oppsettet
-MainAccountForSuppliersNotDefined=Hoved regnskapskonto for leverandører som ikke er definert i oppsettet
+MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
 MainAccountForUsersNotDefined=Hoved regnskapskonto for brukere som ikke er definert i oppsettet
 MainAccountForVatPaymentNotDefined=Hoved regnskapskonto for MVA-betaling ikke definert i oppsettet
 
-AccountancyArea=Område for regnskap
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Bruk av regnskapsmodulen er gjort i flere skritt:
 AccountancyAreaDescActionOnce=Følgende tiltak blir vanligvis utført en gang, eller en gang i året ...
 AccountancyAreaDescActionOnceBis=De neste skrittene bør gjøres for å spare tid i fremtiden ved å foreslå deg riktig standardregnskapskonto når du foretar journalføringen (skriv inn post i journaler og hovedbok)
@@ -89,7 +90,7 @@ MenuProductsAccounts=Varekontoer
 ProductsBinding=Varekontoer
 Ventilation=Binding til kontoer
 CustomersVentilation=Binding av kundefakturaer
-SuppliersVentilation=Binding av leverandørfakturaer
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Utgiftsrapport-binding
 CreateMvts=Opprett ny transaksjon
 UpdateMvts=Endre en transaksjon
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=Innkjøpsjournal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Diverseprotokoll
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Utgiftsjournal
 ACCOUNTING_SOCIAL_JOURNAL=Sosialjournal
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Regnskapskonto for overførsel
 ACCOUNTING_ACCOUNT_SUSPENSE=Regnskapskonto for vent
@@ -185,11 +187,12 @@ ListeMvts=Liste over bevegelser
 ErrorDebitCredit=Debet og kredit kan ikke ha en verdi samtidig
 AddCompteFromBK=Legg til regnskapskontoer til gruppen
 ReportThirdParty=List tredjepartskonto
-DescThirdPartyReport=Liste over kunder og leverandører og deres regnskapskontoer
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=Liste over regnskapskontoer
 UnknownAccountForThirdparty=Ukjent tredjepartskonto. Vi vil bruke %s
 UnknownAccountForThirdpartyBlocking=Ukjent tredjepartskonto. Blokkeringsfeil
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Ukjent tredjepartskonto og ventekonto ikke definert. Blokkeringsfeil
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Kontogruppe
 Pcgsubtype=Konto-undergruppe
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Liste over kunde-fakturalinjer og deres vare-regnskapskon
 DescVentilTodoCustomer=Bind fakturalinjer som ikke allerede er bundet, til en vare-regnskapskonto
 ChangeAccount=Endre regnskapskonto for valgte vare-/tjenestelinjer til følgende konto:
 Vide=-
-DescVentilSupplier=Liste over leverandørfaktura-linjer bundet eller ikke bundet til en vare-regnskapskonto
-DescVentilDoneSupplier=Liste over leverandørfakturalinjer og tilhørende regnskapskonto
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Bind utgiftsrapport-linjer til en gebyr-regnskapskonto
 DescVentilExpenseReport=Liste over utgiftsrapport-linjer bundet (eller ikke) til en gebyr-regnskapskonto
 DescVentilExpenseReportMore=Hvis du setter opp regnskapskonto med type utgiftsrapport-linjer, vil programmet være i stand til å gjøre alle bindinger mellom utgiftsrapport-linjer og regnskapskontoer med et klikk på knappen <strong>"%s"</strong>. Hvis du fortsatt har noen linjer som ikke er bundet til en konto, må du foreta en manuell binding fra menyen "<strong>%s</strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Bind automatisk
 AutomaticBindingDone=Automatisk binding utført
 
 ErrorAccountancyCodeIsAlreadyUse=Feil, du kan ikke slette denne regnskapskontoen fordi den er i bruk
-MvtNotCorrectlyBalanced=Bevegelsen er ikke riktig balansert. Kreditt = %s. Debet = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Binding-kort
 GeneralLedgerIsWritten=Transaksjoner blir skrevet inn i hovedboken
 GeneralLedgerSomeRecordWasNotRecorded=Noen av transaksjonene kunne ikke journalføres. Hvis det ikke er noen annen feilmelding, er dette trolig fordi de allerede var journalført.
@@ -293,4 +296,9 @@ Binded=Bundne linjer
 ToBind=Linjer som skal bindes
 UseMenuToSetBindindManualy=Autodeteksjon ikke mulig, bruk menyen <a href="%s"> %s </a> for å gjøre bindingen manuelt
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Advarsel, denne rapporten er ikke basert på hovedboken, så den inneholder ikke transaksjoner endret manuelt i hovedboken. Hvis journaliseringen din er oppdatert, er bokføringsvisningen mer nøyaktig.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
index 1e345045a9e..3403cc51146 100644
--- a/htdocs/langs/nb_NO/admin.lang
+++ b/htdocs/langs/nb_NO/admin.lang
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=SMTP-server (Standard i php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP-port (Settes ikke i PHP på Unix/Linux)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP-server (Settes ikke i PHP på Unix/Linux)
 MAIN_MAIL_EMAIL_FROM=Avsender-e-post for automatiske e-poster (Som standard i php.ini: <b> %s</b>)
-MAIN_MAIL_ERRORS_TO=E-post brukt som "Feil til" -felt i e-postmeldinger sendt
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= Send systematisk en skjult karbon-kopi av alle sendte e-post til
 MAIN_DISABLE_ALL_MAILS=Deaktiver alle e-postmeldinger (for testformål eller demoer)
 MAIN_MAIL_FORCE_SENDTO=Send alle e-post til (i stedet for ekte mottakere, til testformål)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=Metode for å sende e-post
 MAIN_MAIL_SMTPS_ID=SMTP-ID hvis godkjenning kreves
 MAIN_MAIL_SMTPS_PW=SMTP-passord hvis godkjenning kreves
@@ -291,7 +292,7 @@ ModuleSetup=Modulinnstillinger
 ModulesSetup=Moduler/Applikasjonsoppsett
 ModuleFamilyBase=System
 ModuleFamilyCrm=Kunderelasjonshåndtering (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Products Management/Varehåndtering (PM)
 ModuleFamilyHr=Human Resource Management (HRM)
 ModuleFamilyProjects=Prosjekter/Samarbeid
@@ -373,7 +374,8 @@ NoSmsEngine=Ingen SMS avsender tilgjengelig. SMS håndterer er ikke installert m
 PDF=PDF
 PDFDesc=Du kan angi globale alternativer relatert til PDF-generering
 PDFAddressForging=Regler for å lage adressebokser
-HideAnyVATInformationOnPDF=Skjul alle opplysninger knyttet til MVA på genererte PDF-filer
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Regler for %s
 HideLocalTaxOnPDF=Skjul %s rente i pdf kolonne 
 HideDescOnPDF=Skjul varebeskrivelse på generert PDF
@@ -445,7 +447,8 @@ DisplayCompanyInfo=Vis firmaadresse
 DisplayCompanyManagers=Vis ledernavn
 DisplayCompanyInfoAndManagers=Vis firmaadresser og ledernavn
 EnableAndSetupModuleCron=Hvis du ønsker at gjentakende fakturaer skal genereres automatisk, må modulen *%s* være aktivert og riktig konfigurert. Ellers må generering av fakturaer gjøres manuelt fra denne malen med knapp *Lag*. Merk at selv om du har aktivert automatisk generering, kan du likevel trygt starte manuell generasjon. Generering av duplikater for samme periode er ikke mulig.
-ModuleCompanyCodeAquarium=Returner en regnskapskode som er bygd opp av: <br> %s etterfulgt av leverandørkode fra tredjepart for en leverandør-regnskapskode, <br> %s etterfulgt av tredjeparts kundekode for en kunde-regnskapskode.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Returner en tom regnskapskode.
 ModuleCompanyCodeDigitaria=Regnskapskode avhenger av tredjepartskode. Koden består av tegnet "C" i den første stillingen etterfulgt av de første 5 tegnene til tredjepartskoden.
 Use3StepsApproval=Som standard må innkjøpsordrer opprettes og godkjennes av 2 forskjellige brukere (ett trinn/bruker for å opprette og ett trinn/bruker for å godkjenne. Merk at hvis brukeren har både tillatelse til å opprette og godkjenne, vil ett trinn/ bruker vil være nok). Du kan bruke dette alternativet for å innføre et tredje trinn/bruker godkjenning, hvis beløpet er høyere enn en spesifisert verdi (så vil 3 trinn være nødvendig: 1=validering, 2=første godkjenning og 3=andre godkjenning dersom beløpet er høyt nok). <br> Sett denne tom en godkjenning (2 trinn) er nok, sett den til en svært lav verdi (0,1) hvis det alltid kreves en andre godkjenning (3 trinn).
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Sett dette til 1 hvis du vil legge ved hoveddokumentet ti
 FilesAttachedToEmail=Legg ved fil
 SendEmailsReminders=Send agendapåminnelser via e-post
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=Brukere & grupper
 Module0Desc=Håndtering av Brukere/Ansatte og Grupper
@@ -479,7 +485,7 @@ Module1Desc=Behandling av bedrifter og kontaktpersoner
 Module2Name=Handel
 Module2Desc=Behandling av handelsfunksjoner
 Module10Name=Regnskap
-Module10Desc=Enkel regnskapshåndtering (faktura og betalingsregistrering)
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=Tilbud
 Module20Desc=Behandling av tilbud
 Module22Name=E-postutsendelser
@@ -546,8 +552,8 @@ Module400Name=Prosjekter/Muligheter
 Module400Desc=Håndtering av prosjekter, muligheter og/eller oppgaver. Du kan også tildele et element (faktura, rekkefølge, forslag, intervensjon, ...) til et prosjekt og få en tverrgående visning fra prosjektvisningen.
 Module410Name=Webkalender
 Module410Desc=Integrasjon med webkalender
-Module500Name=Spesielle utgifter
-Module500Desc=Behandling av spesielle utgifter (skatter og avgifter, utbytte mm)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Betaling av lønn til ansatte
 Module510Desc=Legg inn og følg betalingen av ansattes lønn
 Module520Name=Lån
@@ -561,14 +567,14 @@ Module700Name=Donasjoner
 Module700Desc=Behandling av donasjoner
 Module770Name=Utgiftsrapporter
 Module770Desc=Håndtering av utgiftsrapporter (reise, diett, mm)
-Module1120Name=Leverandørtilbud
-Module1120Desc=Forespør leverandørtilbud og tilbud
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Mantisintegrasjon
 Module1520Name=Dokumentgenerering
 Module1520Desc=Masse-epost dokumentgenerering
 Module1780Name=Merker/kategorier
-Module1780Desc=Opprett merker/categorier (varer, kunder, leverandører, kontakter eller medlemmer)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=WYSIWYG Editor
 Module2000Desc=Tillater å endre tekstområder med en avansert editor (Basert på CKEditor)
 Module2200Name=Dynamiske priser
@@ -576,7 +582,7 @@ Module2200Desc=Aktiver mulighet for matematiske utrykk for å beregne priser
 Module2300Name=Planlagte jobber
 Module2300Desc=Planlagt jobbadministrasjon (alias cron- eller chronotabell)
 Module2400Name=Hendelser/Agenda
-Module2400Desc=Følg utførte og kommende hendelser. La applikasjonen logge hendelser automatisk for sporingsformål .
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Dokumenthåndteringssystem / Elektronisk innholdshåndtering. Automatisk organisering av dine genererte eller lagrede dokumenter. Del dem når du trenger det.
 Module2600Name=API/Web tjenseter(SOAP server)
@@ -613,7 +619,7 @@ Module50100Desc=Salgssted-modul (POS).
 Module50200Name=Paypal
 Module50200Desc=Modul for å tilby en online betalingsside som godtar betaling ved hjelp av PayPal (kredittkort eller PayPal-kreditt). Dette kan brukes til å la kundene utføre gratis betalinger eller for betaling på et bestemt Dolibarr-objekt (faktura, bestilling, ...)
 Module50400Name=Regnskap (avansert)
-Module50400Desc=Regnskapsadministrasjon (dobbeltoppføringer, generell støtte og hjelpeledger)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=PrintIPP
 Module54000Desc=Direkteutskrift (uten å åpne dokumentet)ved hjelp av CUPS IPP inteface (Skriveren må være synlig for serveren, og CUPS må være installert på serveren)
 Module55000Name=Meningsmåling, undersøkelse eller avstemming
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=Forsinkelsestoleranse (i dager) før varsel om forsink
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Forsinkelsestoleranse (i dager) før varsel om sjekker som må settes inn i bank
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tillatt forsinkelse (i dager) før varsel om at utgiftsrapport skal godkjennes
 SetupDescription1=Oppsettområdet er for førstegangsparametre før du begynner å bruke Dolibarr.
-SetupDescription2=De to obligatoriske oppsettstrinnene er de to første i oppsettmenyen til venstre: %s oppsettside og %s oppsettside:
-SetupDescription3=Parametre i menyen <a href="%s"> %s -> %s </a> kreves fordi definerte data brukes på Dolibarr-skjermer og for å tilpasse standardoppførselen til programvaren (for eksempel landrelaterte funksjoner).
-SetupDescription4=Parametre i menyen <a href="%s"> %s -> %s </a> kreves fordi Dolibarr ERP/CRM er en samling av flere moduler/applikasjoner, alle mer eller mindre uavhengige. Nye funksjoner blir lagt til i menyene for hver modul du vil aktivere.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=Administrere andre menyoppføringers valgfrie parametre.
 LogEvents=Hendelser relatert til sikkerhet
 Audit=Revisjon
@@ -1054,8 +1060,9 @@ LogEventDesc=Her kan du slå på loggen for sikkerhetshendelser i Dolibarr. Admi
 AreaForAdminOnly=Oppsettparametere kan bare angis av <b> administratorbrukere </b>.
 SystemInfoDesc=Systeminformasjon er diverse teknisk informasjon som kun vises i skrivebeskyttet modus, og som kun er synlig for administratorer.
 SystemAreaForAdminOnly=Dette området er bare tilgjengelig for administratorer. Ingen av tillatelsene i Dolibarr kan senke denne grensen.
-CompanyFundationDesc=Her kan du legge inn informasjon om firmaet eller organisasjonen din (klikk på "Endre"- eller "Lagre"-knappen i bunnen av siden)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=Her kan du velge innstillinger som styrer Dolibarrs utseende og virkemåte
 AvailableModules=Tilgjengelige apper/moduler
 ToActivateModule=Gå til innstillinger for å aktivere moduler.
@@ -1188,11 +1195,11 @@ UserMailRequired=E-postadresse kreves for å opprette en ny bruker
 HRMSetup=Oppsett av HRM-modul
 ##### Company setup #####
 CompanySetup=Firmamodul
-CompanyCodeChecker=Modul for tredjeparts kodegenerering og kontroll (kunde eller leverandør)
-AccountCodeManager=Modul for generering av regnskapskoder (kunde eller leverandør)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=Funksjonen E-postvarslinger lar deg automatisk sende stille e-poster for noen Dolibarrhendelser. Mål for meldinger kan defineres:
 NotificationsDescUser=* pr. bruker, en bruker om gangen
-NotificationsDescContact=*pr. tredjepartskontakt (kunde eller leverandør), en kontakt om gangen.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* eller ved å sette global mål-e-post i modulen Oppsett
 ModelModules=Dokumentmaler
 DocumentModelOdt=Generer dokumenter fra OpenDocument-maler (.ODT eller .ODS fra OpenOffice, KOffice, TextEdit, mm)
@@ -1203,6 +1210,9 @@ MustBeUnique=Må være unik?
 MustBeMandatory=Obligatorisk å opprette tredjeparter?
 MustBeInvoiceMandatory=Obligatorisk å validere fakturaer?
 TechnicalServicesProvided=Tekniske tjenester som tilbys
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=En eksportlenke til <b>%s</b> formatet er tilgjengelig på følgende lenke: %s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=Fritekst på tilbud
 WatermarkOnDraftProposal=Vannmerke på tilbudskladder (ingen hvis tom)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Be om bankkonto for tilbudet
 ##### SupplierProposal #####
-SupplierProposalSetup=Oppsett av leverandør prisforspørsel-modulen
-SupplierProposalNumberingModules=Leverandør prisforespørsel nummereringsmodell
-SupplierProposalPDFModules=Dokumentmodeller for prisforespørsler leverandør
-FreeLegalTextOnSupplierProposal=Fritekst på prisforespørsler leverandør
-WatermarkOnDraftSupplierProposal=Vannmerke på kladder på prisforespørsler leverandør (ingen hvis tom)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Spør om bankkonto på prisforespørsel
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Spør om Lagerkilde for ordre
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Be om bankkonto for leverandørordre
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=Innstillinger for ordre
 OrdersNumberingModules=Nummereringsmodul for ordre
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=Tilkobling til server '%s' for database '%s' med bruker '%s' va
 OSCommerceTestKo1=Tilkobling til server '%s' var vellykket, men databasen '%s' kunne ikke nåes.
 OSCommerceTestKo2=Tilkobling til server '%s' med bruker '%s' feilet.
 ##### Stock #####
-StockSetup=Oppsett av lager-modulen
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=Hvis du bruker en Point-of-Sale-modul (standard POS-modul eller en annen ekstern modul), kan dette oppsettet bli ignorert av din Point-Of-Sale modul. De fleste POS-moduler er designet for øyeblikkelig å lage faktura og redusere lager som standard, uansett hva som settes her. Så husk å sjekke hvordan POS-modulen er satt opp.
 ##### Menu #####
 MenuDeleted=Menyen er slettet
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Nummereringsmodul for sjekk-kvitteringer
 MultiCompanySetup=Oppsett av multi-selskap-modulen
 ##### Suppliers #####
 SuppliersSetup=Oppsett av  leverandørmodulen
-SuppliersCommandModel=Komplett mal for leverandørordre (logo. ..)
-SuppliersInvoiceModel=Komplett mal for leverandørfaktura (logo. ..)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Nummereringsmodel for leverandørfakturaer
 IfSetToYesDontForgetPermission=Hvis ja, ikke glem å gi tillatelser til grupper eller brukere tillatt for 2. godkjenning
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=Ikke bruk tvetydige tegn ("1","l","i","|","0","O") for
 SalariesSetup=Oppsett av lønnsmodulen
 SortOrder=Sorteringsrekkefølge
 Format=Format
-TypePaymentDesc=0:Kundebetaling, 1:Leverandørbetaling, 2:Både kunde- og leverandørbetaling
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Inkluder bane (definert i variael %s)
 ExpenseReportsSetup=Oppsett av utgiftsrapport-modulen
 TemplatePDFExpenseReports=Dokumentmaler for å generere utgiftsrapporter
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Administrator har deaktivert mulighete
 ConfFileMustContainCustom=Ved installering eller bygging av en ekstern modul fra programmet må modulfilene lagres i katalogen <strong> %s</strong>. Hvis du vil ha denne katalogen behandlet av Dolibarr, må du sette opp <strong> conf/conf.php</strong> for å legge til 2 direktivlinjer: <br><strong> $dolibarr_main_url_root_alt = '/custom'; </strong><br><strong> $dolibarr_main_document_root_alt = '%s/custom'; </strong>
 HighlightLinesOnMouseHover=Fremhev tabellinjer når musen flyttes over
 HighlightLinesColor=Uthev fargen på linjen når musen føres over (holdes tom for ingen uthevning)
-TextTitleColor=Farge på sidetittel
+TextTitleColor=Text color of Page title
 LinkColor=Farge på lenker
 PressF5AfterChangingThis=Trykk CTRL+F5 på tastaturet eller tøm nettlesercache når du har endret denne verdien for å få den til å fungere effektivt
 NotSupportedByAllThemes=Vil virke med kjernetemaer, vil kanskje ikke virke med eksterne temaer
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=Bakgrunnsfarge for toppmeny
 TopMenuDisableImages=Skjul bilder i toppmeny
 LeftMenuBackgroundColor=Bakgrunnsfarge for venstre meny
 BackgroundTableTitleColor=Bakgrunnsfarge for tittellinje i tabellen
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Bakgrunnsfarge for oddetalls-tabellinjer
 BackgroundTableLineEvenColor=Bakgrunnsfarge for partalls-tabellinjer
 MinimumNoticePeriod=Frist for beskjed (Feriesøknaden må sendes inn før denne fristen)
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=Eksempel: +2 (fylles kun ut ved problemer)
 ExpectedChecksum=Forventet sjekksum
 CurrentChecksum=Gjeldende sjekksum
 ForcedConstants=Obligatoriske konstante verdier
-MailToSendProposal=For å sende tilbud
-MailToSendOrder=For å sende kundeordre
-MailToSendInvoice=For å sende kundefaktura
-MailToSendShipment=For å sende levereing
-MailToSendIntervention=For å sende intervensjon
-MailToSendSupplierRequestForQuotation=For å sende forespørsel til leverandør
-MailToSendSupplierOrder=For å sende leverandørordre
-MailToSendSupplierInvoice=For å sende leverandørfaktura
-MailToSendContract=For å sende en kontrakt
-MailToThirdparty=For å sende epost fra tredjepart-side
-MailToMember=For å sende e-post fra medlemsside
-MailToUser=For å sende e-post fra brukerside
-MailToProject= To send email from project page
+MailToSendProposal=Kundetilbud
+MailToSendOrder=Kundeordre
+MailToSendInvoice=Kundefakturaer
+MailToSendShipment=Leveringer
+MailToSendIntervention=Intervensjoner
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Kontrakter
+MailToThirdparty=Tredjeparter
+MailToMember=Medlemmer
+MailToUser=Brukere
+MailToProject=Projects page
 ByDefaultInList=Vis som standard for liste
 YouUseLastStableVersion=Du bruker siste stabile versjon
 TitleExampleForMajorRelease=Eksempel på melding du kan bruke for å annonsere større oppdateringer (du kan bruke denne på dine websider)
@@ -1780,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=Bunnmarg på PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Sett til ja hvis denne gruppen er en beregning av andre grupper
 EnterCalculationRuleIfPreviousFieldIsYes=Oppgi beregningsregel hvis tidligere felt ble satt til Ja (for eksempel 'CODEGRP1 + CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Oppsett av Ressursmodulen
 UseSearchToSelectResource=Bruk et søkeskjema for å velge en ressurs (i stedet for en nedtrekksliste).
diff --git a/htdocs/langs/nb_NO/bills.lang b/htdocs/langs/nb_NO/bills.lang
index db3cddef6f5..9c9b198d117 100644
--- a/htdocs/langs/nb_NO/bills.lang
+++ b/htdocs/langs/nb_NO/bills.lang
@@ -109,7 +109,7 @@ CancelBill=Kanseller en faktura
 SendRemindByMail=E-postpåminnelse
 DoPayment=Legg inn betaling
 DoPaymentBack=Legg inn tilbakebetaling
-ConvertToReduc=Konverter til framtidig rabatt
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Konverterer for mye innbetalt til fremtidig rabatt
 ConvertExcessPaidToReduc=Konverter overbetaling til fremtidig rabatt
 EnterPaymentReceivedFromCustomer=Legg inn betaling mottatt fra kunde
@@ -120,7 +120,7 @@ BillStatus=Fakturastatus
 StatusOfGeneratedInvoices=Status for genererte fakturaer
 BillStatusDraft=Kladd (må valideres)
 BillStatusPaid=Betalt
-BillStatusPaidBackOrConverted=Kreditnota refusjon eller konvertert til rabatt
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Betalt (klar til forbruk i endelig faktura)
 BillStatusCanceled=Tapsført
 BillStatusValidated=Validert (må betales)
@@ -296,10 +296,10 @@ DiscountType=Rabatttype
 NoteReason=Notat/Årsak
 ReasonDiscount=Årsak
 DiscountOfferedBy=Innrømmet av
-DiscountStillRemaining=Rabatter tilgjengelig
-DiscountAlreadyCounted=Rabatter allerede gitt
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Kunderabatter
-SupplierDiscounts=Leverandørrabatter
+SupplierDiscounts=Vendors discounts
 BillAddress=Fakturaadresse
 HelpEscompte=Denne rabatten er gitt fordi kunden betalte før forfall.
 HelpAbandonBadCustomer=Dette beløpet er tapsført (dårlig kunde) og betraktes som tap.
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Tillat betaling av fakturaer for ulike tredjeparter
 PaymentNote=Betalingsnotat
 ListOfPreviousSituationInvoices=Liste over tidligere delfakturaer
 ListOfNextSituationInvoices=Liste over kommende delfakturaer
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Hver %s dag
 FrequencyPer_m=Hver %s måned
 FrequencyPer_y=Hver %s år
@@ -505,9 +511,14 @@ SituationAmount=Delfaktura-beløp (eks. MVA)
 SituationDeduction=Situasjonsfradrag
 ModifyAllLines=Endre alle linjer
 CreateNextSituationInvoice=Opprett neste situasjon
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=Denne fakturaen er ikke den siste i serien og må ikke endres.
 DisabledBecauseNotLastInCycle=Neste delfaktura er allerede opprettet
 DisabledBecauseFinal=Dette er siste delfaktura
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=S
 CantBeLessThanMinPercent=Progresjonen kan ikke ha lavere verdi enn forrige delfaktura
 NoSituations=Ingen  åpne situasjoner
 InvoiceSituationLast=Siste delfaktura
@@ -532,3 +543,4 @@ AutoFillDateFrom=Angi startdato for tjenestelinje med faktura dato
 AutoFillDateFromShort=Angi startdato
 AutoFillDateTo=Angi sluttdato for tjenestelinje med neste faktura dato
 AutoFillDateToShort=Angi sluttdato
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/nb_NO/categories.lang b/htdocs/langs/nb_NO/categories.lang
index 0c69ba93c1f..9518cfc2379 100644
--- a/htdocs/langs/nb_NO/categories.lang
+++ b/htdocs/langs/nb_NO/categories.lang
@@ -85,3 +85,4 @@ CategorieRecursivHelp=Hvis aktivert, vil varen også knyttes til overordnet kate
 AddProductServiceIntoCategory=Legg til følgende vare/tjeneste
 ShowCategory=Vis merke/kategori
 ByDefaultInList=Som standard i liste
+ChooseCategory=Choose category
diff --git a/htdocs/langs/nb_NO/commercial.lang b/htdocs/langs/nb_NO/commercial.lang
index 1e84cf37b8a..ab81008845e 100644
--- a/htdocs/langs/nb_NO/commercial.lang
+++ b/htdocs/langs/nb_NO/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=Lukk
 ActionAC_EMAILING=Send e-postutsendelse (masse-epost)
 ActionAC_COM=Send ordre i posten
 ActionAC_SHIP=Send levering i posten
-ActionAC_SUP_ORD=Send leverandørordre i posten
-ActionAC_SUP_INV=Send leverandørfaktura i posten
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=Andre
 ActionAC_OTH_AUTO=Automatisk satte hendelser
 ActionAC_MANUAL=Manuelt satte hendelser
diff --git a/htdocs/langs/nb_NO/companies.lang b/htdocs/langs/nb_NO/companies.lang
index d37336a49fd..70f1dd4f3fb 100644
--- a/htdocs/langs/nb_NO/companies.lang
+++ b/htdocs/langs/nb_NO/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Er du sikker på at du vil slette denne kontakten og all ti
 MenuNewThirdParty=Ny tredjepart
 MenuNewCustomer=Ny kunde
 MenuNewProspect=Nytt prospekt
-MenuNewSupplier=Ny leverandør
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=Ny privatperson
-NewCompany=Ny bedrift (prospekt, kunde, leverandør)
-NewThirdParty=Ny tredjepart (prospekt, kunde, lever.)
-CreateDolibarrThirdPartySupplier=Lag en tredjepart (leverandør)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=Opprett tredjepart
 CreateThirdPartyAndContact=Opprett en tredjepart med underkontakt
 ProspectionArea=Prospektområde
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=Prospekter
 ThirdPartyCustomers=Kunder
 ThirdPartyCustomersStats=Kunder
 ThirdPartyCustomersWithIdProf12=Kunder med %s eller %s
-ThirdPartySuppliers=Leverandører
+ThirdPartySuppliers=Vendors
 ThirdPartyType=Type tredjepart
 Individual=Privatperson
 ToCreateContactWithSameName=Vil opprette en kontakt/adresse med samme informasjon som tredjeparten, under tredjeparten, automatisk. I de fleste tilfeller, selv om tredjeparten er en privatperson, vil det være nok å opprette en tredjepart
@@ -77,11 +77,11 @@ Web=Web
 Poste= Posisjon
 DefaultLang=Standardspråk
 VATIsUsed=Salgsavgift er brukt
-VATIsUsedWhenSelling=Dette definerer om denne tredjepart inkluderer en salgsavgift eller ikke, når den fakturerer sine egne kunder
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Salgsavgift er ikke brukt
 CopyAddressFromSoc=Fyll inn adressen med tredjepartsadressen
-ThirdpartyNotCustomerNotSupplierSoNoRef=Tredjeparts verken kunde eller leverandør, ingen tilgjengelige henvisende objekter
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Bankkonto betaling
 OverAllProposals=Tilbud
 OverAllOrders=Ordre
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=RE Type
 TypeLocaltax2ES=IRPF Type
 WrongCustomerCode=Ugyldig kundekode
-WrongSupplierCode=Ugyldig leverandørkode
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Mal kundekode
-SupplierCodeModel=Mal leverandørkode
+SupplierCodeModel=Vendor code model
 Gencod=Strekkode
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
@@ -267,7 +267,7 @@ Prospect=Prospekt
 CustomerCard=Kundekort
 Customer=Kunde
 CustomerRelativeDiscount=Relativ kunderabatt
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=Relativ rabatt
 CustomerAbsoluteDiscountShort=Absolutt rabatt
 CompanyHasRelativeDiscount=Denne kunden har en rabatt på <b>%s%%</b>
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this suppl
 CompanyHasNoAbsoluteDiscount=Denne kunden har ingen rabatt tilgjengelig
 CustomerAbsoluteDiscountAllUsers=Absolutte kunderabatter (gitt av alle brukere)
 CustomerAbsoluteDiscountMy=Absolutte kunderabatter (gitt av deg selv)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=Ingen
 Supplier=Leverandør
 AddContact=Opprett kontakt
@@ -304,13 +304,13 @@ DeleteACompany=Slett et firma
 PersonalInformations=Personlig informasjon
 AccountancyCode=Regnskapskonto
 CustomerCode=Kundekode
-SupplierCode=Leverandørkode
+SupplierCode=Vendor code
 CustomerCodeShort=Kundekode
-SupplierCodeShort=Leverandørkode
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=Kundekode, unik for alle kunder
-SupplierCodeDesc=Leverandørkode, unik for alle leverandører
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=Påkrevet hvis tredjeparten er kunde eller prospekt
-RequiredIfSupplier=Påkrevet hvis tredjeparten er leveandør
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=Gyldighet kontrollert av modulen
 ThisIsModuleRules=Dette er reglene for denne modulen
 ProspectToContact=Prospekt til kontakt
@@ -338,7 +338,7 @@ MyContacts=Mine kontaktpersoner
 Capital=Aksjekapital
 CapitalOf=Aksjekapital på %s
 EditCompany=Rediger firma
-ThisUserIsNot=Denne brukeren er hverken prospekt, kunde eller leverandør
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=Sjekk
 VATIntraCheckDesc=Lenken <b>%s</b> slår opp i den europeiske kontrolltjenesten for MVA (gjelder ikke norske foretak). Serveren må ha ekstern internettilgang for at denne funksjonen skal virke.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -396,7 +396,7 @@ ImportDataset_company_4=Tredjeparter/Salgsrepresentanter (Tilordne salgsrepresen
 PriceLevel=Prisnivå
 DeliveryAddress=Leveringsadresse
 AddAddress=Legg til adresse
-SupplierCategory=Leverandørkategori
+SupplierCategory=Vendor category
 JuridicalStatus200=Uavhengig
 DeleteFile=Slett fil
 ConfirmDeleteFile=Er du sikker på at du vil slette denne filen?
@@ -406,7 +406,7 @@ FiscalYearInformation=Informasjon om regnskapsåret
 FiscalMonthStart=Første måned i regnskapsåret
 YouMustAssignUserMailFirst=Du må opprette e-postadresse for denne brukeren først for være i stand til å legge til e-postvarslinger for ham.
 YouMustCreateContactFirst=For å kunne legge til e-postvarsler, må du først definere kontakter med gyldige e-postadresser hos tredjepart
-ListSuppliersShort=Liste over leverandører
+ListSuppliersShort=List of vendors
 ListProspectsShort=Liste over prospekter
 ListCustomersShort=Liste over kunder
 ThirdPartiesArea=Tredjepart og kontaktområde
@@ -420,7 +420,7 @@ CurrentOutstandingBill=Gjeldende utestående regning
 OutstandingBill=Max. utestående beløp
 OutstandingBillReached=Maksimun utestående beløp nådd
 OrderMinAmount=Minimumsbeløp for bestilling
-MonkeyNumRefModelDesc=Returnerer nummer med format %syymm-nnnn for kundekode og %syymm-nnnn for leverandørkode, der åå er året, er mm måned og nnnn er et løpenummer som starter på 0+1.
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=Fri kode. Denne koden kan endres når som helst.
 ManagingDirectors=(E) navn (CEO, direktør, president ...)
 MergeOriginThirdparty=Dupliser tredjepart (tredjepart du vil slette)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Innlogging for salgsrepresentant
 SaleRepresentativeFirstname=Selgers fornavn
 SaleRepresentativeLastname=Selgers etternavn
 ErrorThirdpartiesMerge=Det oppsto en feil ved sletting av tredjepart. Vennligst sjekk loggen. Endringer er blitt tilbakestilt.
-NewCustomerSupplierCodeProposed=Ny kunde eller leverandørkode foreslått med duplisert kode
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/nb_NO/compta.lang b/htdocs/langs/nb_NO/compta.lang
index 0608409a03b..2e6d9ab9670 100644
--- a/htdocs/langs/nb_NO/compta.lang
+++ b/htdocs/langs/nb_NO/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=Netto betalt
 VATToPay=Tax sales
 VATReceived=Skatt mottatt
 VATToCollect=Skattkjøp
-VATSummary=Skattebalanse
+VATSummary=Tax monthly
+VATBalance=Skattebalanse
 VATPaid=Skatt betalt
 LT1Summary=Skatt 2 oppsummering
 LT2Summary=Skatt 3 oppsummering
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=Regnskap/kapital-område
 NewPayment=Ny betaling
 Payments=Betalinger
 PaymentCustomerInvoice=Kundefaktura-betaling
-PaymentSupplierInvoice=Leverandørfaktura-betaling
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Skatter- og avgiftsbetaling
 PaymentVat=MVA betaling
 ListPayment=Liste over betalinger
 ListOfCustomerPayments=Liste over kundebetalinger
-ListOfSupplierPayments=Liste over leverandørbetalinger
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Startdato
 DateEndPeriod=Sluttdato
 newLT1Payment=Ny MVA 2 betaling
@@ -110,7 +111,7 @@ ShowVatPayment=Vis MVA betaling
 TotalToPay=Sum å betale
 BalanceVisibilityDependsOnSortAndFilters=Balanse er synlig i denne listen bare hvis tabellen er sortert stigende etter %s og filtrert for en bankkonto
 CustomerAccountancyCode=Kunde-regnskapskode
-SupplierAccountancyCode=Leverandør regnskapskode
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Kundens regnskapskode
 SupplierAccountancyCodeShort=Leverandørens regnskapskode
 AccountNumber=Kontonummer
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=Rapport etter tredjepart RE
 LT2ReportByCustomersES=Rapport over tredjepart IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Rapport over innhentet og betalt MVA etter kunde
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Kontomodeller
 Pcg_type=Kontoplan type
 Pcg_subtype=Kontoplan undertype
 InvoiceLinesToDispatch=Fakturalinjer for utsendelse
-ByProductsAndServices=Etter varer og tjenester
+ByProductsAndServices=By product and service
 RefExt=Ekstern referanse
 ToCreateAPredefinedInvoice=For å lage en fakturamal, lag først en standardfaktura uten å validere den, klikk på "%s".|
 LinkedOrder=Lenke til ordre
@@ -215,7 +218,8 @@ Mode1=Metode 1
 Mode2=Metode 2
 CalculationRuleDesc=For å beregne total MVA, er det to metoder:<br>Metode 1 er avrunding på hver linje, og deretter summere dem.<br>Metode 2 er å summere alle på hver linje, og deretter avrunde resultatet.<br>Endelig resultat kan variere noen få kroner. Standardmodusen er modusen <b>%s</b>.
 CalculationRuleDescSupplier=Velg utregningsmetode som gir leverandør forventet resultat
-TurnoverPerProductInCommitmentAccountingNotRelevant=Omsetningsrapport pr. produkt, er ikke relevant når du bruker en <b>kontantregnskap</b>-modus. Denne rapporten er bare tilgjengelig når du bruker <b>engasjement regnskap</b> modus (se oppsett av regnskap modul).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Kalkuleringsmodus
 AccountancyJournal=Regnskapskode journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Standard regnskapskonto for MVA.betaling
 ACCOUNTING_ACCOUNT_CUSTOMER=Regnskapskonto brukt til kunde-tredjepart
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Den dedikerte regnskapskontoen som er definert på tredjepartskort, vil kun bli brukt til subledger. Denne vil bli brukt til hovedboken og som standardverdi av Subledger-regnskap hvis dedikert kundekonto på tredjepart ikke er definert.
-ACCOUNTING_ACCOUNT_SUPPLIER=Regnskapskonto brukt til leverandør-tredjepart
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Den dedikerte regnskapskonto som er definert på tredjepartskort, vil kun bli brukt til subledger. Denne vil bli brukt til hovedboken og som standardverdi for Subledger-regnskap hvis dedikert leverandørkonto på tredjepart ikke er definert.
 CloneTax=Klon skatt/avgift
 ConfirmCloneTax=Bekreft kloning av skatt/avgiftsbetaling
@@ -242,3 +246,10 @@ FiscalPeriod=Regnskapsperiode
 ListSocialContributionAssociatedProject=Liste over sosiale bidrag knyttet til prosjektet
 DeleteFromCat=Fjern fra regnskapsgruppe
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/nb_NO/dict.lang b/htdocs/langs/nb_NO/dict.lang
index c8f7a000a71..9166039bfc3 100644
--- a/htdocs/langs/nb_NO/dict.lang
+++ b/htdocs/langs/nb_NO/dict.lang
@@ -5,6 +5,7 @@ CountryIT=Italia
 CountryES=Spania
 CountryDE=Tyskland
 CountryCH=Sveits
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
 CountryGB=Storbritannia
 CountryUK=Storbritannia
 CountryIE=Irland
diff --git a/htdocs/langs/nb_NO/ecm.lang b/htdocs/langs/nb_NO/ecm.lang
index 22be4d06b43..f41f468f106 100644
--- a/htdocs/langs/nb_NO/ecm.lang
+++ b/htdocs/langs/nb_NO/ecm.lang
@@ -39,9 +39,10 @@ ShowECMSection=Vis mappe
 DeleteSection=Fjern mappe
 ConfirmDeleteSection=Kan du bekrefte at du vil slette mappen <b>%s</b>?
 ECMDirectoryForFiles=Relativ mappe for filer
-CannotRemoveDirectoryContainsFiles=Kunne ikke fjerne mappen, da den inneholder filer
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=Filbehandler
-ECMSelectASection=Velg en mappe fra treet til venstre...
+ECMSelectASection=Velg en mappe i treet ...
 DirNotSynchronizedSyncFirst=Denne mappen ser ut til å være opprettet eller endret utenfor ECM-modulen. Du må klikke på "Resync" -knappen først for å synkronisere disk og database for å få innhold i denne katalogen.
 ReSyncListOfDir=Resync liste over kataloger
 HashOfFileContent=Hash av filinnhold
diff --git a/htdocs/langs/nb_NO/errors.lang b/htdocs/langs/nb_NO/errors.lang
index bed4f0d3623..9ccb0276763 100644
--- a/htdocs/langs/nb_NO/errors.lang
+++ b/htdocs/langs/nb_NO/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Strekkode påkrevet
 ErrorCustomerCodeAlreadyUsed=Kundekoden er allerede benyttet
 ErrorBarCodeAlreadyUsed=Strekkode allerede brukt
 ErrorPrefixRequired=Prefiks påkrevet
-ErrorBadSupplierCodeSyntax=Ugyldig syntaks for leverandørkode
-ErrorSupplierCodeRequired=Leverandørkode påkrevet
-ErrorSupplierCodeAlreadyUsed=Leverandørkode allerede brukt
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Ugyldige parametere
 ErrorBadValueForParameter=Feil verdi '%s' for parameter '%s'
 ErrorBadImageFormat=Bildeformatet støttes ikke (Din PHP støtter ikke konvertering av dette formatet)
@@ -87,7 +87,7 @@ ErrorsOnXLines=Feil på <b>%s</b> kildelinje(r)
 ErrorFileIsInfectedWithAVirus=Antivirus-programmet var ikke i stand til å validere filen (filen kan være infisert av et virus)
 ErrorSpecialCharNotAllowedForField=Spesialtegn er ikke tillatt for feltet "%s"
 ErrorNumRefModel=En referanse finnes i databasen (%s), og er ikke kompatibel med denne nummereringsregelen. Fjern posten eller omdøp referansen for å aktivere denne modulen.
-ErrorQtyTooLowForThisSupplier=Kvantum er for lavt eller pris ikke satt på denne varen for denne leverandøren
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Oppsett av modulen ser ikke ut til å være komplett. Gå til Hjem - Oppsett - Moduler for å fullføre.
 ErrorBadMask=Feil på maske
 ErrorBadMaskFailedToLocatePosOfSequence=Feil! Maske uten sekvensnummer
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
 ErrorSavingChanges=En feil oppsto under lagring av endringer
 ErrorWarehouseRequiredIntoShipmentLine=Lager er obligatorisk for å kunne levere
 ErrorFileMustHaveFormat=Filen må ha formatet %s
-ErrorSupplierCountryIsNotDefined=Land for denne leverandøren er ikke valgt. Korriger dette først.
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Klarte ikke å flette de to postene. Forespørsel ble avbrutt.
 ErrorStockIsNotEnoughToAddProductOnOrder=Lagernivå er for lavt for å legge %s til i en ny ordre
 ErrorStockIsNotEnoughToAddProductOnInvoice=Lagernivå er for lavt for å legge %s til i en ny faktura
diff --git a/htdocs/langs/nb_NO/install.lang b/htdocs/langs/nb_NO/install.lang
index 6cbe5ee9160..ca77ddb7b84 100644
--- a/htdocs/langs/nb_NO/install.lang
+++ b/htdocs/langs/nb_NO/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=Konfigurasjonsfil <b>%s</b> eksisterer
 ConfFileCouldBeCreated=Konfigurasjonsfil <b>%s</b> kunne lages.
 ConfFileIsNotWritable=Konfigurasjonsfil <b>%s</b> er ikke skrivbar. Sjekk tillatelser. For første gangs installasjon, må webserveren få innvilget å kunne skrive til denne filen under konfigureringen ("chmod 666" for eksempel på et Unix-OS).
 ConfFileIsWritable=Konfigurasjonsfil <b>%s</b> er skrivbar.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Last inn all informasjon fra konfigurasjonsfilen igjen.
 PHPSupportSessions=Denne PHP støtter sesjoner.
 PHPSupportPOSTGETOk=Dette PHP støtter variablene POST og GET.
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Klarte ikke å opprette Dolibarr administratorkonto
 WarningRemoveInstallDir=Advarsel, av sikkerhetshensyn, når installasjonen eller oppgraderingen er fullført, bør du fjerne <b>mappen "install" eller endre navnet til install.lock for å unngå skadelig bruk.</b>
 FunctionNotAvailableInThisPHP=Ikke tilgjengelig på denne PHP
 ChoosedMigrateScript=Velg migrasjonscript
-DataMigration=Datamigrering
-DatabaseMigration=Struktur databasemigrasjon
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Scriptbehandling
 ChooseYourSetupMode=Velg din oppsettmodus og klikk på "Start" ...
 FreshInstall=Ny installasjon
@@ -146,7 +147,7 @@ NothingToDo=Ingenting å gjøre
 # upgrade
 MigrationFixData=Reparasjon av ødelagte data
 MigrationOrder=Datamigrering for kundeordre
-MigrationSupplierOrder=Datamigrering for leverandørordre
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Datamigrering for tilbud
 MigrationInvoice=Datamigrering for kundefakturaer
 MigrationContract=Datamigrering for kontrakter
@@ -196,6 +197,8 @@ MigrationEvents=Overføring av hendelser for å legge hendelseseier inn i oppdra
 MigrationEventsContact=Overføring av hendelser for å legge til hendelseskontakt i oppdragstabell
 MigrationRemiseEntity=Oppdater verdien i enhetsfeltet llx_societe_remise
 MigrationRemiseExceptEntity=Oppdater verdien i enhetsfeltet llx_societe_remise_except
+MigrationUserRightsEntity=Oppdater enhetens feltverdi av llx_user_rights
+MigrationUserGroupRightsEntity=Oppdater enhetens feltverdi av llx_usergroup_rights
 MigrationReloadModule=Last inn modulen %s på nytt
 MigrationResetBlockedLog=Tilbakestill modul BlockedLog for v7 algoritme
 ShowNotAvailableOptions=Vis utilgjengelige opsjoner
diff --git a/htdocs/langs/nb_NO/ldap.lang b/htdocs/langs/nb_NO/ldap.lang
index 92819747f8d..6184f5b8f46 100644
--- a/htdocs/langs/nb_NO/ldap.lang
+++ b/htdocs/langs/nb_NO/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Passord til domene
 YouMustChangePassNextLogon=Passordet for bruker <b>%s</b> i domenet <b>%s</b> må endres.
 UserMustChangePassNextLogon=Brukeren må endre passord i domenet %s
 LDAPInformationsForThisContact=Informasjon i LDAP-databasen for denne kontakten
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Medlemstype synkronisert
 ContactSynchronized=Kontakt synkronisert
 ForceSynchronize=Tving synkronisering Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Kunne ikke lese LDAP-databasen. Sjekk LDAP-modulens innstillinger og databasetilgjengelighet.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/nb_NO/loan.lang b/htdocs/langs/nb_NO/loan.lang
index 5f423b8db6f..f236bcf893e 100644
--- a/htdocs/langs/nb_NO/loan.lang
+++ b/htdocs/langs/nb_NO/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=Kapital
 Insurance=Forsikring
 Interest=Rente
 Nbterms=Antall terminer
+Term=Term
 LoanAccountancyCapitalCode=Regnskapskonto kapital
 LoanAccountancyInsuranceCode=Regnskapskonto forsikring
 LoanAccountancyInterestCode=Regnskapskonto rente
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=Bekreft sletting av dette lånet
 LoanDeleted=Lånet ble slettet
 ConfirmPayLoan=Bekreft at dette lånet er klassifisert som betalt
 LoanPaid=Lån nedbetalt
-# Calc
-LoanCalc=Lånekalkulator
-PurchaseFinanceInfo=Kjøps- og finansieringsinformasjon
-SalePriceOfAsset=Aktiva salgspris
-PercentageDown=Prosentvis ned
-LengthOfMortgage=Lånevarighet
-AnnualInterestRate=Årlig rente
-ExplainCalculations=Forklar utregninger
-ShowMeCalculationsAndAmortization=Vis utregninger og amortisering
-MortgagePaymentInformation=Nedbetalingsinformasjon
-DownPayment=Avdrag
-DownPaymentDesc= <b>Nedbetaling</b> = Lånebeløp * prosent ned / 100 (For 5% ned får man 5/100 eller 0.05)
-InterestRateDesc=<b>Rentefot</b> = Årsrente/100
-MonthlyFactorDesc=<b>Månedsfaktor</b> = Resultatet av følgende formel:
-MonthlyInterestRateDesc=<b>Månedlig rentefot</b> = Årlig rentefot / 12 (mnd)
-MonthTermDesc=<b>Månedsterminer</b> = Låneperiode i år * 12
-MonthlyPaymentDesc=Månedlige nedbetalinger er regnet ut med følgende formel:
-AmortizationPaymentDesc=<a href="#amortization">amortisering</a> bryter ned hvor mye av den månedlige betalingen går til rentebetaling, og hvor mye som går til nedbetaling på lånet ditt.
-AmountFinanced=Finansieringsbeløp
-AmortizationMonthlyPaymentOverYears=Amortisering for månedlige avdrag: <b>%s</b> over %s år
-Totalsforyear=Totalt for året
-MonthlyPayment=Månedlig avdrag
-LoanCalcDesc=Denne <b>boliglånskalkulatoren</b> kan brukes til å finne ut månedlige betalinger av et lån, basert på lånebeløp, antall terminer og rente. <br> Denne kalkulatoren inneholder også PMI (Private Mortgage Insurance) for lån hvor mindre enn 20% er satt som nedbetaling . Også tatt i betraktning er eiendomsskatt, og dens effekt på den totale månedlige boliglåns-betalingen. <br>
-GoToInterest=%s vil gå mot INTEREST
-GoToPrincipal=%s vil gå mot PRINCIPAL
-YouWillSpend=Du kommer til å bruke %s i år %s
 ListLoanAssociatedProject=Liste over lån tilknyttet prosjektet
 AddLoan=Opprett lån
+FinancialCommitment=Finansiell forpliktelse
+InterestAmount=Rente
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=Oppset av lån-modulen
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Standard regnskapskonto kapital
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Standard regnskapskonto  rente
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Standard regnskapskonto forsikring
-FinancialCommitment=Finansiell forpliktelse
 CreateCalcSchedule=Rediger økonomisk forpliktelse
-InterestAmount=Rentebeløp
diff --git a/htdocs/langs/nb_NO/mails.lang b/htdocs/langs/nb_NO/mails.lang
index f6b7b341e29..2bc438fd165 100644
--- a/htdocs/langs/nb_NO/mails.lang
+++ b/htdocs/langs/nb_NO/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Avsender
 MailErrorsTo=Feilmeldinger til
 MailReply=Svar til
 MailTo=Mottaker(e)
+MailToUsers=To user(s)
 MailCC=Kopi til
+MailToCCUsers=Copy to users(s)
 MailCCC=Cached kopi til
 MailTopic=E-postemne
 MailText=Meldingstekst
@@ -164,4 +166,4 @@ InGoingEmailSetup=Oppsett for innkommende epost
 OutGoingEmailSetupForEmailing=Oppsett av utgående e-post (for masse-e-post)
 DefaultOutgoingEmailSetup=Standard utgående e-postoppsett
 Information=Informasjon
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang
index c9c55064ba6..1deb9576c13 100644
--- a/htdocs/langs/nb_NO/main.lang
+++ b/htdocs/langs/nb_NO/main.lang
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarrs godkjenningsmodus er sat
 Administrator=Administrator
 Undefined=Udefinert
 PasswordForgotten=Glemt passordet?
+NoAccount=No account?
 SeeAbove=Se ovenfor
 HomeArea=Hjemmeområde
 LastConnexion=Siste forbindelse
@@ -231,7 +232,7 @@ Limit=Grense
 Limits=Grenser
 Logout=Logg ut
 NoLogoutProcessWithAuthMode=Ingen anvendbar frakoblingsfunksjon med godkjenningsmodus <b>%s</b>
-Connection=Tilkobling
+Connection=Logg inn
 Setup=Innstillinger
 Alert=Varsel
 MenuWarnings=Varsler
@@ -402,6 +403,7 @@ DefaultTaxRate=Standard avgiftssats
 Average=Gjennomsnitt
 Sum=Sum
 Delta=Delta
+RemainToPay=Remain to pay
 Module=Modul/Applikasjon
 Modules=Moduler/Applikasjoner
 Option=Opsjon
@@ -414,7 +416,7 @@ Favorite=Favoritt
 ShortInfo=Info.
 Ref=Ref.
 ExternalRef=Ekstern ref.
-RefSupplier=Ref. leverandør
+RefSupplier=Ref. vendor
 RefPayment=Ref. betaling
 CommercialProposalsShort=Tilbud
 Comment=Kommentar
@@ -493,7 +495,7 @@ Received=Mottatt
 Paid=Betalt
 Topic=Subjekt
 ByCompanies=Etter tredjeparter
-ByUsers=Etter brukere
+ByUsers=By user
 Links=Lenker
 Link=Lenke
 Rejects=Avvisninger
@@ -619,9 +621,9 @@ BuildDoc=Lag Doc
 Entity=Miljø
 Entities=Enheter
 CustomerPreview=Forhåndsvisning kunder
-SupplierPreview=Forhåndsvisning av leverandør
+SupplierPreview=Vendor preview
 ShowCustomerPreview=Vis kundeforhåndsvisning
-ShowSupplierPreview=Vis leverandørforhåndsvisning
+ShowSupplierPreview=Show vendor preview
 RefCustomer=Kundereferanse
 Currency=Valuta
 InfoAdmin=Informasjon for administratorer
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=Varer eller tjenester
 SearchIntoProjects=Prosjekter
 SearchIntoTasks=Oppgaver
 SearchIntoCustomerInvoices=Kundefakturaer
-SearchIntoSupplierInvoices=Leverandørfakturaer
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Kundeordre
-SearchIntoSupplierOrders=Leverandørordre
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=Kundetilbud
-SearchIntoSupplierProposals=Leverandørtilbud
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Intervensjoner
 SearchIntoContracts=Kontrakter
 SearchIntoCustomerShipments=Kundeforsendelser
@@ -941,3 +943,5 @@ Remote=Ekstern
 LocalAndRemote=Lokal og ekstern
 KeyboardShortcut=Tastatursnarvei
 AssignedTo=Tildelt
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/nb_NO/margins.lang b/htdocs/langs/nb_NO/margins.lang
index 1cbd2a130dc..4181ed2f4fe 100644
--- a/htdocs/langs/nb_NO/margins.lang
+++ b/htdocs/langs/nb_NO/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=Som tjeneste
 UseDiscountOnTotal=Subtota
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defineres om en global rabatt skal gjelde for et vare, en tjeneste, eller bare som en subtotal for margin-kalkulasjon
 MARGIN_TYPE=Foreslått innkjøps-/kostpris for utregning av margin
-MargeType1=Margin på beste leverandørpris
+MargeType1=Margin on Best vendor price
 MargeType2=Margin på gjennomsnittspris (Weighted Average Price - WAP)
 MargeType3=Marginer på kostpris
-MarginTypeDesc=* Margin på beste kjøpskurs = Salgspris - Beste leverandørpris definert på varekortet<br> * Margin på vektet gjennomsnittlig pris (WAP) = Salgspris - Vektet gjennomsnittspris (WAP) eller beste leverandør pris hvis WAP ennå ikke er definert <br> * Margin på kostpris = Salgspris - Kostpris definert på varekortet, eller WAP hvis kostpris ikke er definert, eller beste leverandør pris hvis WAP ikke er definert
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Kostpris
 UnitCharges=Enhets-avgifter
 Charges=Avgifter
diff --git a/htdocs/langs/nb_NO/members.lang b/htdocs/langs/nb_NO/members.lang
index 088609dae87..58b70d8c314 100644
--- a/htdocs/langs/nb_NO/members.lang
+++ b/htdocs/langs/nb_NO/members.lang
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
diff --git a/htdocs/langs/nb_NO/opensurvey.lang b/htdocs/langs/nb_NO/opensurvey.lang
index 9a7fd90bb5a..5214f5d58a1 100644
--- a/htdocs/langs/nb_NO/opensurvey.lang
+++ b/htdocs/langs/nb_NO/opensurvey.lang
@@ -58,3 +58,4 @@ MoreChoices=Legg til flere valg for stemmeavgivere
 SurveyExpiredInfo=Avstemningen er blitt stengt eller utløpt
 EmailSomeoneVoted=%s har fylt ut en linje\nDu kan finne undersøkelsen din med lenken:\n%s
 ShowSurvey=Vis undersøkelse
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/nb_NO/orders.lang b/htdocs/langs/nb_NO/orders.lang
index 5057b3d604b..56d25cbf90a 100644
--- a/htdocs/langs/nb_NO/orders.lang
+++ b/htdocs/langs/nb_NO/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Område for kundeordre
-SuppliersOrdersArea=Område for leverandørordre
+SuppliersOrdersArea=Purchase orders area
 OrderCard=Ordrekort
 OrderId=Ordre-ID
 Order=Ordre
@@ -13,9 +13,9 @@ OrderToProcess=Ordre til behandling
 NewOrder=Ny ordre
 ToOrder=Lag ordre
 MakeOrder=Opprett ordre
-SupplierOrder=Leverandørordre
-SuppliersOrders=Leverandørordre
-SuppliersOrdersRunning=Aktuelle leverandørordre
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=Kundeordre
 CustomersOrders=Kundeordre
 CustomersOrdersRunning=Gjeldende kundeordre
@@ -24,7 +24,7 @@ OrdersDeliveredToBill=Fakturerbare leverte kundeordre
 OrdersToBill=Kundeordre levert
 OrdersInProcess=Kundeordre til behandling
 OrdersToProcess=Kundeordre til behandling
-SuppliersOrdersToProcess=Leverandørordre til behandling
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=Kansellert
 StatusOrderDraftShort=Kladd
 StatusOrderValidatedShort=Validert
@@ -75,15 +75,15 @@ ShowOrder=Vis ordre
 OrdersOpened=Ordre å behandle
 NoDraftOrders=Ingen ordreutkast
 NoOrder=Ingen ordre
-NoSupplierOrder=Ingen leverandørordre
+NoSupplierOrder=No purchase order
 LastOrders=Siste %s kundeordre
 LastCustomerOrders=Siste %s kundeordre
-LastSupplierOrders=Siste %s leverandørordre
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=Siste %s endrede ordre
 AllOrders=Alle ordre
 NbOfOrders=Antall ordre
 OrdersStatistics=Ordrestatistikk
-OrdersStatisticsSuppliers=Statistikk leverandørordre
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Antall ordre pr måned
 AmountOfOrdersByMonthHT=Sum bestillinger etter måned (eks. MVA)
 ListOfOrders=Ordreliste
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Er du sikker på at du vil bekrefte at du opprettet denne ordre
 GenerateBill=Opprett faktura
 ClassifyShipped=Klassifiser levert
 DraftOrders=Ordrekladder
-DraftSuppliersOrders=Leverandørordre-kladder
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=Ordre i behandling
 RefOrder=Ref. ordre
 RefCustomerOrder=Kundens ordrereferanse
-RefOrderSupplier=Leverandørens ordrereferanse
-RefOrderSupplierShort=Leverandørs ordreref.
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=Send ordre med post
 ActionsOnOrder=Handlinger ifm. ordre
 NoArticleOfTypeProduct=Der er ingen varer av typen 'vare' på ordren, så det er ingen varer å sende
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Er du sikker på at du vil klone denne ordren <b>%s</b>?
 DispatchSupplierOrder=Motta leverandørordre %s
 FirstApprovalAlreadyDone=Første godkjenning allerede utført
 SecondApprovalAlreadyDone=Andre gangs godkjenning allerede utført
-SupplierOrderReceivedInDolibarr=Leverandørordre %s mottatt %s
-SupplierOrderSubmitedInDolibarr=Leverandørordre %s sendt
-SupplierOrderClassifiedBilled=Leverandørordre %s satt fakturert
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Andre ordre
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representant for oppfølging av kundeordre
@@ -125,11 +125,11 @@ TypeContact_commande_internal_SHIPPING=Representant for oppfølging av levering
 TypeContact_commande_external_BILLING=Kundens fakturakontakt
 TypeContact_commande_external_SHIPPING=Kundens leveransekontakt
 TypeContact_commande_external_CUSTOMER=Kundens ordreoppfølger
-TypeContact_order_supplier_internal_SALESREPFOLL=Representant for oppfølging av leverandørordre
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Representant for oppfølging av levering
-TypeContact_order_supplier_external_BILLING=Leverandørens fakturakontakt
-TypeContact_order_supplier_external_SHIPPING=Leverandørens leveransekontakt
-TypeContact_order_supplier_external_CUSTOMER=Leverandørens ordreoppfølger
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Konstant COMMANDE_SUPPLIER_ADDON er ikke definert
 Error_COMMANDE_ADDON_NotDefined=Konstant COMMANDE_ADDON er ikke definert
 Error_OrderNotChecked=Ingen ordre til fakturering er valgt
diff --git a/htdocs/langs/nb_NO/other.lang b/htdocs/langs/nb_NO/other.lang
index 26a03eb3bdc..9bbc407d1b2 100644
--- a/htdocs/langs/nb_NO/other.lang
+++ b/htdocs/langs/nb_NO/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hei)__\nDette er en testmelding sendt til __EMAIL__.\nDe t
 PredefinedMailTestHtml=__(Hei)__\nDette er en <b> test </b> e-post (ordtesten må være i fet skrift). De to linjene skilles med et linjeskift.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hei)__\n\nHer finner du faktura __REF__\n\nDette er koblingen for å kunne betale online hvis fakturaen ikke allerede er betalt:\n__ONLINE_PAYMENT_URL__\n\n__(Vennlig hilsen)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hei)__\n\nVi kan ikke se at faktura __REF__ er betalt. Vedlagt kopi av faktura.\n\nDette er koblingen for å foreta online betaling:\n__ONLINE_PAYMENT_URL__\n\n__(Vennlig hilsen)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hei)__\n\nVedlagt tilbud som avtalt __PREF__\n\n\n__(Vennlig hilsen)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hei)__\n\nVedlagt tilbud som avtalt __REF__\n\n\n__(Vennlig hilsen)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hei)__\n\nVedlagt ordre __REF__\n\n\n__(Vennlig hilsen)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hei)__\n\nVedlagt vår bestilling __REF__\n\n\n__(Vennlig hilsen)__\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=Filene er for store
 PleaseBePatient=Vent et øyeblikk eller to...
 NewPassword=Nytt passord
 ResetPassword=Tilbakestill passord
-RequestToResetPasswordReceived=Forespørsel om å endre Dolibarr-passordet ditt er blitt mottatt
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=Dette er din nye innloggingsnøkkel
 NewKeyWillBe=Ny nøkkel for innlogging er
 ClickHereToGoTo=Klikk her for å gå til %s
@@ -233,6 +233,8 @@ PermissionsDelete=Tillatelser fjernet
 YourPasswordMustHaveAtLeastXChars=Passordet ditt må ha minst <strong> %s </strong> tegn
 YourPasswordHasBeenReset=Ditt passord er tilbakestilt
 ApplicantIpAddress=IP-adresse til søkeren
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=Eksportområde
 AvailableFormats=Tilgjengelige formater
diff --git a/htdocs/langs/nb_NO/productbatch.lang b/htdocs/langs/nb_NO/productbatch.lang
index 1baf42031a4..bf4cc11d07a 100644
--- a/htdocs/langs/nb_NO/productbatch.lang
+++ b/htdocs/langs/nb_NO/productbatch.lang
@@ -16,7 +16,7 @@ printEatby=Siste forbruksdato: %s
 printSellby=Siste salgsdato: %s
 printQty=Ant: %d
 AddDispatchBatchLine=Legg til en linje for holdbarhetsdato
-WhenProductBatchModuleOnOptionAreForced=Når modulen Lot/Serie er aktivert, er automatisk øk/reduser lagermodus tvunget til fraktvalidering og manuell ekspedering av mottak og kan ikke redigeres. Andre alternativer kan defineres som du vil.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=Denne varen har ikke lot/serienummer
 ProductLotSetup=Oppsett av model Lot/serienmmer
 ShowCurrentStockOfLot=Vis gjeldende beholdning for vare/lot
diff --git a/htdocs/langs/nb_NO/products.lang b/htdocs/langs/nb_NO/products.lang
index 5e968cd4032..b1c10339fb3 100644
--- a/htdocs/langs/nb_NO/products.lang
+++ b/htdocs/langs/nb_NO/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Mengde solgt
 PurchasedAmount=Mengde kjøpt
 NewPrice=Ny pris
 MinPrice=Minste utsalgspris
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=Salgsprisen kan ikke være lavere enn minste tillatte for denne varen (%s uten avgifter)
 ContractStatusClosed=Lukket
 ErrorProductAlreadyExists=En vare med varenummere %s eksisterer allerede.
@@ -155,7 +156,7 @@ BuyingPrices=Innkjøpspris
 CustomerPrices=Kundepriser
 SuppliersPrices=Leverandørpriser
 SuppliersPricesOfProductsOrServices=Leverandørpriser (varer og tjenester)
-CustomCode=Toll-/vare-/HS-kode
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=Opprinnelsesland
 Nature=Natur
 ShortLabel=Kort etikett
diff --git a/htdocs/langs/nb_NO/projects.lang b/htdocs/langs/nb_NO/projects.lang
index 4283e597398..f67184f793c 100644
--- a/htdocs/langs/nb_NO/projects.lang
+++ b/htdocs/langs/nb_NO/projects.lang
@@ -77,6 +77,7 @@ Time=Tid
 ListOfTasks=Oppgaveliste
 GoToListOfTimeConsumed=Gå til liste for tidsbruk
 GoToListOfTasks=Gå til oppgaveliste
+GoToGanttView=Go to Gantt view
 GanttView=Gantt visning
 ListProposalsAssociatedProject=Oversikt over tilbud relatert til dette prosjektet
 ListOrdersAssociatedProject=Liste over kundeordre tilknyttet prosjektet
@@ -226,4 +227,4 @@ AllowCommentOnProject=Tillat brukerkommentarer på prosjekter
 DontHavePermissionForCloseProject=Du har ikke tillatelse til å lukke prosjektet %s
 DontHaveTheValidateStatus=Prosjektet %s må være åpent for å kunne lukkes
 RecordsClosed=%s prosjekt(er) lukket
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/nb_NO/stocks.lang b/htdocs/langs/nb_NO/stocks.lang
index 20df6dce77c..f118cc003c7 100644
--- a/htdocs/langs/nb_NO/stocks.lang
+++ b/htdocs/langs/nb_NO/stocks.lang
@@ -203,3 +203,4 @@ RegulateStock=Reguler lager
 ListInventory=Liste
 StockSupportServices=Lageradministrasjon støtter tjenester
 StockSupportServicesDesc=Som standard kan du bare lagerføre "vare". Hvis på, og hvis modultjenesten er på, kan du også lagerføre "tjeneste"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/nb_NO/stripe.lang b/htdocs/langs/nb_NO/stripe.lang
index 7cf1d959c96..61b8834ac5e 100644
--- a/htdocs/langs/nb_NO/stripe.lang
+++ b/htdocs/langs/nb_NO/stripe.lang
@@ -58,8 +58,8 @@ NameOnCard=Name on card
 CardNumber=Card Number
 ExpiryDate=Expiry Date
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/nb_NO/supplier_proposal.lang b/htdocs/langs/nb_NO/supplier_proposal.lang
index 8e2b4d58fea..925f96566bb 100644
--- a/htdocs/langs/nb_NO/supplier_proposal.lang
+++ b/htdocs/langs/nb_NO/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Leverandørtilbud
-supplier_proposalDESC=Håndter prisforespørsler til leverandører
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
 SupplierProposalNew=Ny prisforspørsel
 CommRequest=Prisforespørsel
 CommRequests=Prisforespørsel
 SearchRequest=Finn en forspørsel
 DraftRequests=Forespørsel-kladder
-SupplierProposalsDraft=Leverandørtilbud-maler
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=Siste %s endrede prisforespørsler
 RequestsOpened=Åpne prisforespørsler
-SupplierProposalArea=Område for leverandørtilbud
-SupplierProposalShort=Leverandørtilbud
-SupplierProposals=Leverandørtilbud
-SupplierProposalsShort=Leverandørtilbud
+SupplierProposalArea=Vendor proposals area
+SupplierProposalShort=Vendor proposal
+SupplierProposals=Vendor proposals
+SupplierProposalsShort=Vendor proposals
 NewAskPrice=Ny prisforspørsel
 ShowSupplierProposal=Vis prisforespørsel
 AddSupplierProposal=Opprett en prisforespørsel
-SupplierProposalRefFourn=Leverandør ref.
+SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=Leveringsdato
 SupplierProposalRefFournNotice=Før du lukker til "Akseptert", husk å notere leverandørreferanse
 ConfirmValidateAsk=Er du sikker på at du vil validere prisforespørsel <b>%s</b>?
@@ -47,9 +47,9 @@ CommercialAsk=Prisforespørsel
 DefaultModelSupplierProposalCreate=Standardmodell for opprettelse
 DefaultModelSupplierProposalToBill=Standardmal når prisforespørsel lukkes (akkseptert)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (avvist)
-ListOfSupplierProposals=Liste over prisforespørsler hos leverandører
-ListSupplierProposalsAssociatedProject=Liste over leverandørtilbud tilknyttet prosjekt
-SupplierProposalsToClose=Leverandørtilbud for lukking
-SupplierProposalsToProcess=Leverandørtilbud til gjennomføring
+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=Siste %s prisforespørsler
 AllPriceRequests=Alle forespørsler
diff --git a/htdocs/langs/nb_NO/suppliers.lang b/htdocs/langs/nb_NO/suppliers.lang
index 3d8191775d1..4ad099b6ea5 100644
--- a/htdocs/langs/nb_NO/suppliers.lang
+++ b/htdocs/langs/nb_NO/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Leverandører
-SuppliersInvoice=Leverandørfaktura
-ShowSupplierInvoice=Vis leverandørfaktura
-NewSupplier=Ny leverandør
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=Historikk
-ListOfSuppliers=Leverandøroversikt
-ShowSupplier=Vis leverandør
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=Bestillingsdato
 BuyingPriceMin=Beste innkjøpspris
 BuyingPriceMinShort=Beste innkjøpspris
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Total over sub-varers utsalgsspriser
 SomeSubProductHaveNoPrices=Noen sub-varer har ingen pris definert
 AddSupplierPrice=Legg til innkjøpspris
 ChangeSupplierPrice=Endre innkjøpspris
-SupplierPrices=Leverandørpriser
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Denne leverandørreferansen er allerede tilknyttet en referanse: %s
-NoRecordedSuppliers=Ingen leverandører registrert
-SupplierPayment=Leverandørbetaling
-SuppliersArea=Leverandørområde
-RefSupplierShort=Ref. leverandør
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=Tilgjengelighet
-ExportDataset_fournisseur_1=Oversikt over leverandørfakturaer og varelinjer
-ExportDataset_fournisseur_2=Leverandørfakturaer og betalinger
-ExportDataset_fournisseur_3=Leverandør ordrer og ordrelinjer
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=Godkjenn denne innkjøpsordren
 ConfirmApproveThisOrder=Er du sikker på at du vil godkjenne ordre <b>%s</b>?
 DenyingThisOrder=Avvis denne ordren
 ConfirmDenyingThisOrder=Er du sikker på at du vil avvise ordre <b>%s</b>?
 ConfirmCancelThisOrder=Er du sikker på at du vil kansellere ordre <b>%s</b>?
-AddSupplierOrder=Opprett innkjøpsordre
-AddSupplierInvoice=Opprett leverandørfaktura
-ListOfSupplierProductForSupplier=Oversikt over varer og priser for leverandøren <b>%s</b>
-SentToSuppliers=Sendt til leverandører
-ListOfSupplierOrders=Liste over leverandørordre
-MenuOrdersSupplierToBill=Leverandørordre til faktura
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Leveringsforsinkelse i dager
 DescNbDaysToDelivery=Største leveringsforsinkelse av varer fra denne ordren
-SupplierReputation=Leverandør-rykte
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Ikke bestill
 NotTheGoodQualitySupplier=Feil kvalitet
 ReputationForThisProduct=Rykte
 BuyerName=Kjøpernavn
 AllProductServicePrices=Alle vare-/tjenestepriser
 AllProductReferencesOfSupplier=Alle vare-/tjenestereferanser til leverandør
-BuyingPriceNumShort=Leverandørpriser
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/nb_NO/website.lang b/htdocs/langs/nb_NO/website.lang
index 549042c7251..1b7a7a8aa23 100644
--- a/htdocs/langs/nb_NO/website.lang
+++ b/htdocs/langs/nb_NO/website.lang
@@ -73,7 +73,7 @@ AnotherContainer=En annen container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Aktiver nettstedkontotabellen
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Aktiver tabellen for å lagre nettstedkontoer (innlogging/pass) for hvert nettsted/tredjepart
 YouMustDefineTheHomePage=Du må først definere standard startside
-OnlyEditionOfSourceForGrabbedContentFuture=Merk: Bare utgaven av HTML-kilden vil være mulig når et sideinnhold er initiert ved å hente det fra en ekstern side (WYSIWYG editor vil ikke være tilgjengelig)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Kun HTML-kilde er mulig når innholdet ble tatt fra et eksternt nettsted
 GrabImagesInto=Hent bilder som er funnet i css og side også.
 ImagesShouldBeSavedInto=Bilder bør lagres i katalogen
diff --git a/htdocs/langs/nb_NO/workflow.lang b/htdocs/langs/nb_NO/workflow.lang
index ad131a1041c..e5078a71804 100644
--- a/htdocs/langs/nb_NO/workflow.lang
+++ b/htdocs/langs/nb_NO/workflow.lang
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Klassifiser koblede kilde-kund
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Klassifiser koblede kilde-kundeordre som fakturert(t) når faktura er satt til betalt (og hvis fakturabeløpet er det samme som totalbeløpet av koblede ordrer)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Klassifiser koblet kilde-kundeordre til sendt når en forsendelse er validert (og hvis kvantitet som sendes av alle forsendelser, er det samme som i bestillingen som skal oppdateres)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Klassifiser kildeleverandørens tilbud til fakturert når leverandørfakturaen er validert (og hvis fakturabeløpet er det samme som totalbeløpet av koblede tilbud)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Klassifiser kildeleverandørens ordre(er) til fakturert når leverandørfakturaen er validert (og hvis fakturabeløp er det samme som totalbeløpet av koblede ordrer)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=Automatisk opprettelse
 AutomaticClassification=Automatisk klassifisering
diff --git a/htdocs/langs/nl_BE/admin.lang b/htdocs/langs/nl_BE/admin.lang
index 3a9ceb934d0..6c77a913633 100644
--- a/htdocs/langs/nl_BE/admin.lang
+++ b/htdocs/langs/nl_BE/admin.lang
@@ -40,5 +40,11 @@ ModuleFamilyHr=Personeelszaken (HR)
 HideDetailsOnPDF=Verberg product-detaillijnen op gemaakte PDF
 ExtrafieldPassword=Paswoord
 LibraryToBuildPDF=Bibliotheek om PDF bestanden te genereren.
+Module1780Name=Labels/Categorien
+Permission1004=Bekijk voorraadmutaties
+Permission1005=Creëren / wijzigen voorraadmutaties
 SalariesSetup=Setup van module salarissen
+MailToSendProposal=Klant voorstellen
+MailToSendOrder=Klant bestellingen
+MailToSendInvoice=Klantfacturen
 AddBoxes=Widgets toevoegen
diff --git a/htdocs/langs/nl_BE/agenda.lang b/htdocs/langs/nl_BE/agenda.lang
index 26c641c4863..099cda7490d 100644
--- a/htdocs/langs/nl_BE/agenda.lang
+++ b/htdocs/langs/nl_BE/agenda.lang
@@ -8,6 +8,9 @@ NewCompanyToDolibarr=Derde %s aangemaakt
 ContractValidatedInDolibarr=Contract %s goedgekeurd
 MemberModifiedInDolibarr=Lid %s werd aangepast
 MemberResiliatedInDolibarr=Lid %s verwijderd
+MemberSubscriptionAddedInDolibarr=Abonnement %s voor lid %s toegevoegd
+MemberSubscriptionModifiedInDolibarr=Abonnement %s voor lid %s aangepast
+MemberSubscriptionDeletedInDolibarr=Abonnement %s voor lid %s verwijderd
 ShipmentValidatedInDolibarr=Shipment %s goedgekeurd
 ShipmentClassifyClosedInDolibarr=Verzending %s werd geclassificeerd als gefactureerd
 ShipmentUnClassifyCloseddInDolibarr=Verzending %s werd geclassificieerd als opnieuw geopend
@@ -23,6 +26,9 @@ PROJECT_MODIFYInDolibarr=Project %s gewijzigd
 AgendaModelModule=Document sjablonen voor een gebeurtenis
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> om de uitvoer van acties te beperken die niet werden toegewezen aan de gebruiker <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> om de uitvoer van acties te beperken die aan de gebruiker <b>%s</b> is toegewezen. (eigenaar en anderen).
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> om de uitvoer te beperken tot acties die zijn gekoppeld aan project <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> om automatische gebeurtenis uit te sluiten.
 AgendaShowBirthdayEvents=Toon verjaardagen van contacten
 AgendaHideBirthdayEvents=Verberg verjaardagen van contacten
+AgendaExtNb=Kalender nr. %s
 ConfirmCloneEvent=Weet u zeker als u event <b>%s</b> wilt klonen?
diff --git a/htdocs/langs/nl_BE/bills.lang b/htdocs/langs/nl_BE/bills.lang
index bb2b8d1d5d5..e4058d901d9 100644
--- a/htdocs/langs/nl_BE/bills.lang
+++ b/htdocs/langs/nl_BE/bills.lang
@@ -14,6 +14,7 @@ DoPaymentBack=Doe een terugbetaling
 StatusOfGeneratedInvoices=Lijst van genereerde facturen
 BillStatusDraft=Conceptfactuur (moet worden gevalideerd)
 BillShortStatusClosedUnpaid=Afgesloten
+LastCustomersBills=Laatste %s klantfacturen
 AmountOfBillsByMonthHT=Factuurbedrag per maand (ex BTW)
 ShowInvoiceSituation=Toon situatie factuur
 RemainderToBill=Nog te factureren
diff --git a/htdocs/langs/nl_BE/boxes.lang b/htdocs/langs/nl_BE/boxes.lang
index dd0e6d18c9f..dd78dae4639 100644
--- a/htdocs/langs/nl_BE/boxes.lang
+++ b/htdocs/langs/nl_BE/boxes.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxLoginInformation=Login Informatie
 BoxProductsAlertStock=Alarm producten voorraad
 BoxLastProductsInContract=Laatste %s producten/diensten met contract.
 BoxLastCustomerBills=Laatste klantenfacturen
@@ -11,4 +12,32 @@ BoxLastSuppliers=Laatste aangapaste leveranciers
 BoxLastContacts=Laatste contacten/adressen
 BoxFicheInter=Laatste interventie
 BoxTitleLastRssInfos=Laatste %s nieuws van %s
+BoxTitleLastProducts=Laatste %s aangepaste producten / services
+BoxTitleLastSuppliers=Laatste %s geregistreerde leveranciers
+BoxTitleLastModifiedCustomers=Laatste %s gewijzigde klanten
+BoxTitleLastCustomersOrProspects=Laatste %s klanten of prospects
+BoxTitleLastCustomerBills=Laatste %s klantfacturen
+BoxTitleLastModifiedProspects=Laatste %s aangepaste prospects
+BoxTitleLastModifiedMembers=Laatste %s leden
+BoxTitleLastFicheInter=Laatste %s gemodificeerde interventies
+BoxTitleLastModifiedContacts=Laatste %s gewijzigde contacten / adressen
+BoxMyLastBookmarks=Mijn laatste %s bladwijzers
+BoxLastExpiredServices=Laatste %s oudste contacten met actieve verlopen services
+BoxTitleLastActionsToDo=Laatste %s acties om te doen
+BoxTitleLastContracts=Laatste %s gewijzigde contracten
+BoxTitleLastModifiedDonations=Laatste %s gewijzigde donaties
+BoxTitleLastModifiedExpenses=Laatste gewijzigde %s onkostenmeldingen
+BoxTitleGoodCustomers=%s Goede klanten
+FailedToRefreshDataInfoNotUpToDate=Vernieuwen van RSS-flux is mislukt. Laatste succesvolle vernieuwingsdatum: %s
+LastRefreshDate=Laatste vernieuwingsdatum
+NoRecordedOrders=Geen opgenomen klantbestellingen
+NoRecordedInvoices=Geen geregistreerde klantfacturen
+NoUnpaidCustomerBills=Geen onbetaalde klantfacturen
+NoModifiedSupplierBills=Geen opgenomen leveranciersfacturen
+BoxTitleLastModifiedSupplierBills=Laatste %s gewijzigde leveranciersrekeningen
+BoxTitleLatestModifiedSupplierOrders=Laatste %s gewijzigde leveranciersbestellingen
+BoxTitleLastModifiedCustomerBills=Laatste %s gewijzigde klantrekeningen
 BoxTitleLastModifiedPropals=Laatste %s gewijzigde offertes
+LastXMonthRolling=De laatste %s maand rollen
+ChooseBoxToAdd=Widget toevoegen aan uw dashbord
+BoxAdded=Widget is toegevoegd in je dashbord
diff --git a/htdocs/langs/nl_BE/categories.lang b/htdocs/langs/nl_BE/categories.lang
index d7a7d0b59a1..02743f2348b 100644
--- a/htdocs/langs/nl_BE/categories.lang
+++ b/htdocs/langs/nl_BE/categories.lang
@@ -6,6 +6,8 @@ categories=tags/categorieën
 NoCategoryYet=Geen tag/categorie van dit type gemaakt
 AddIn=Toevoegen in
 CategoriesArea=Tags/Categorieën omgeving
+ProductsCategoriesArea=Producten/Diensten  tags/categorieën omgeving
+SuppliersCategoriesArea=Leveranciers tags/categorieën omgeving
 CustomersCategoriesArea=Klanten tags/categorieën omgeving
 MembersCategoriesArea=Leden tags/categorieën omgeving
 ContactsCategoriesArea=Contacten tags/categorieën omgeving
@@ -52,6 +54,7 @@ ThisCategoryHasNoAccount=Deze categorie bevat geen account.
 ThisCategoryHasNoProject=Deze categorie bevat geen project.
 CategId=Tag/categorie id
 CatSupList=Lijst van leverancier tags/categorieën
+CatCusList=Lijst van de klant/prospect tags/categorieën
 CatProdList=Lijst van producten tags/categorieën
 CatMemberList=Lijst van leden tags/categorieën
 CatContactList=Lijst van contact tags/categorieën
@@ -63,3 +66,4 @@ DeleteFromCat=Verwijderen uit tags/categorie
 CategoriesSetup=Tags/categorieën instellingen
 CategorieRecursiv=Automatische koppeling met bovenliggende tag/categorie
 CategorieRecursivHelp=Indien geactiveerd zal het product ook gekoppeld worden met de bovenliggende categorie wanneer een subcategorie toegevoegd wordt.
+ShowCategory=Toon tag / categorie
diff --git a/htdocs/langs/nl_BE/commercial.lang b/htdocs/langs/nl_BE/commercial.lang
index 12d460f06bc..a5fe3c70889 100644
--- a/htdocs/langs/nl_BE/commercial.lang
+++ b/htdocs/langs/nl_BE/commercial.lang
@@ -1,7 +1,5 @@
 # Dolibarr language file - Source file is en_US - commercial
 ConfirmDeleteAction=Bent u zeker dat u dit event wil verwijderen?
-ActionOnCompany=Gerelateerd bedrijf
-ActionOnContact=Gerelateerd contact
 ThirdPartiesOfSaleRepresentative=Derden met vertegenwoordiger
 SaleRepresentativesOfThirdParty=Vertegenwoordigers van derden
 LastDoneTasks=Laatste %s gedane acties
diff --git a/htdocs/langs/nl_BE/companies.lang b/htdocs/langs/nl_BE/companies.lang
index 1d08f7b2dd1..2c4af927a47 100644
--- a/htdocs/langs/nl_BE/companies.lang
+++ b/htdocs/langs/nl_BE/companies.lang
@@ -7,7 +7,6 @@ StateShort=Staat
 PhoneShort=Telefoonnummer
 No_Email=Geen globale e-mailings sturen
 CopyAddressFromSoc=Vul derde partij adres in
-ThirdpartyNotCustomerNotSupplierSoNoRef=Derde partij noch klant noch leverancier, geen beschikbare verwijzende objecten
 LocalTax1IsUsed=Gebruik tweede BTW
 LocalTax2IsUsed=Gebruik derde BTW
 LocalTax2ES=Personenbelasting
@@ -28,7 +27,6 @@ CompanyHasAbsoluteDiscount=Deze afnemer heeft nog een kortingstegoed van <b> %s
 CompanyHasCreditNote=Deze afnemer heeft nog creditnota's of eerdere stortingen voor <b> %s %s</b>
 FromContactName=Naam:
 CustomerCodeShort=Klant code
-SupplierCodeShort=Leverancier code
 ContactForOrders=Contactpersoon opdrachten
 ContactForOrdersOrShipments=Contactpersoon voor orders of zendingen
 ContactForProposals=Contactpersoon offertes
@@ -41,7 +39,6 @@ StatusProspect2=Contact lopende
 ChangeToContact=Status veranderen naar 'Contact opnemen'
 ExportDataset_company_1=Derde partijen (Bedrijf/stichting/fysieke personen) en eigenschappen
 ImportDataset_company_1=Derde partijen (Bedrijven/stichtingen/fysieke mensen) en eigenschappen
-JuridicalStatus200=Onafhankelijk
 AllocateCommercial=Toegewezen aan de verkoopsverantwoordelijke
 YouMustCreateContactFirst=U dient voor de Klant eerst contactpersonen met een e-mailadres in te stellen, voordat u kennisgevingen per e-mail kunt sturen.
 LastModifiedThirdParties=Laatste %s bewerkte derde partijen
diff --git a/htdocs/langs/nl_BE/compta.lang b/htdocs/langs/nl_BE/compta.lang
index 98193bdebf7..3397ac039ad 100644
--- a/htdocs/langs/nl_BE/compta.lang
+++ b/htdocs/langs/nl_BE/compta.lang
@@ -30,6 +30,8 @@ RulesResultDue=- Dit omvat openstaande facturen, uitgaven, BTW, donaties, zowel
 RulesResultInOut=- Dit omvat alle betalingen van facturen, uitgaven, BTW en lonen. <br>- Dit is gebaseerd op de betalingsdata van de facturen, uitgaven, BTW en lonen. De donatiedatum voor donaties.
 RulesCADue=- Dit omvat de verschuldigde afnemersfacturen, betaald of niet. <br>- Dit is gebaseerd op de validatiedata van deze facturen.<br>
 RulesCAIn=- Dit omvat alle effectieve betalingen van afnemersfacturen.<br>- Het is gebaseerd op de betaaldatum van deze facturen<br>
+PurchasesJournal=Inkoopdagboek
+DescPurchasesJournal=Inkoopdagboek
 CloneTax=Kopieer een sociale bijdrage/belasting
 ConfirmCloneTax=Bevestig kopie van betaling sociale bijdrage/belasting
 SimpleReport=Eenvoudig rapport
diff --git a/htdocs/langs/nl_BE/cron.lang b/htdocs/langs/nl_BE/cron.lang
index 6c363fa5735..87a857a0f78 100644
--- a/htdocs/langs/nl_BE/cron.lang
+++ b/htdocs/langs/nl_BE/cron.lang
@@ -1,5 +1,3 @@
 # Dolibarr language file - Source file is en_US - cron
 EnabledAndDisabled=Geactiveerd en gedeactiveerd
-CronDtStart=Niet voor
-CronDtEnd=Niet na
 CronMethod=Methode
diff --git a/htdocs/langs/nl_BE/interventions.lang b/htdocs/langs/nl_BE/interventions.lang
index 776fbd58a1a..2251b0d6e6d 100644
--- a/htdocs/langs/nl_BE/interventions.lang
+++ b/htdocs/langs/nl_BE/interventions.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - interventions
 InterventionsArea=Interventieruimte
 DraftFichinter=Concept interventie
+LastModifiedInterventions=Laatste %s gemodificeerde interventies
 InterventionStatistics=Statistieken van de interventies
 NbOfinterventions=Nr van de interventiekaarten
 NumberOfInterventionsByMonth=Nr van de interventiekaarten per maand (datum van goedkeuring)
diff --git a/htdocs/langs/nl_BE/main.lang b/htdocs/langs/nl_BE/main.lang
index fd434be2fcd..a0479f97a11 100644
--- a/htdocs/langs/nl_BE/main.lang
+++ b/htdocs/langs/nl_BE/main.lang
@@ -33,8 +33,13 @@ DateReference=Referentie datum
 DateStart=Start datum
 DateEnd=Eind datum
 DateCreationShort=Aanmaak datum
+DateApprove2=Goedkeurings datum (tweede goedkeuring)
+ActionRunningShort=Bezig
+Running=Bezig
+Categories=Tags / categorieën
+Category=Tag / categorie
+ApprovedBy2=Goedgekeurd door (tweede goedkeuring)
 YouCanSetDefaultValueInModuleSetup=Je kan de standaard waarde gebruiken wanneer je een nieuw record plaatst in de module setup
-MenuAccountancy=Boekhouding
 SetLinkToAnotherThirdParty=Link naar een derde partij
 SelectAction=Selecteer actie
 Deny=Weigeren
@@ -50,8 +55,6 @@ Select2LoadingMoreResults=Laden van meer resultaten...
 Select2SearchInProgress=Zoeken is aan de gang...
 SearchIntoProductsOrServices=Producten of diensten
 SearchIntoCustomerInvoices=Klant facturen
-SearchIntoSupplierInvoices=Leverancier facturen
 SearchIntoCustomerOrders=Klant bestellingen
 SearchIntoCustomerProposals=Klant voorstellen
-SearchIntoSupplierProposals=Leverancier voorstellen
 SearchIntoExpenseReports=Uitgaven rapporten
diff --git a/htdocs/langs/nl_BE/margins.lang b/htdocs/langs/nl_BE/margins.lang
index 099b7f5037c..329a0adf015 100644
--- a/htdocs/langs/nl_BE/margins.lang
+++ b/htdocs/langs/nl_BE/margins.lang
@@ -4,6 +4,5 @@ ForceBuyingPriceIfNull=Gebruik de koop/kost prijs als verkoopsprijs indien niet
 ForceBuyingPriceIfNullDetails=Indien koop/kost prijs niet gedefinieerd is, en deze optie is "ON", dan zal de marge nul zijn op deze lijn (koop/kost prijs = verkoopsprijs), anderzijds ("OFF"), marge zal gelijk zijn aan het gesuggereerde voorstel.
 UseDiscountAsProduct=Als een product
 MargeType3=Marge op kostprijs
-MarginTypeDesc=* Marge op de beste koop prijs = Verkoopsprijs - Beste gedefinieerde leveranciersprijs op productkaart<br>* Marge op de gewogen gemiddelde prijs (WAP) = Verkoopsprijs - Gewogen gemiddelde prijs van het product (WAP) of de beste leveranciersprijs indien WAP nog niet gedefinieerd werd<br>* Marge op kost prijs = Verkoopsprijs - kost prijs gedefinieerd op product kaart of WAP indien kost prijs niet gedefinieerd was, of beste leveranciersprijs indien WAP nog niet gedefinieerd is
 AgentContactType=Contacttype van commercieel medewerker
 CheckMargins=Marges detail
diff --git a/htdocs/langs/nl_BE/orders.lang b/htdocs/langs/nl_BE/orders.lang
index 06646b9a678..70690238f88 100644
--- a/htdocs/langs/nl_BE/orders.lang
+++ b/htdocs/langs/nl_BE/orders.lang
@@ -2,21 +2,15 @@
 OrderToProcess=Te verwerken bestelling
 NewOrder=Nieuwe bestelling
 MakeOrder=Bestelling ingeven
-CustomerOrder=Klantenbestelling
-CustomersOrders=Klantenbestellingen
 CustomersOrdersRunning=Lopende klantenbestellingen
 CustomersOrdersAndOrdersLines=Klantenbestellingen en bestellijnen
 OrdersToBill=Afgeleverde bestellingen
 OrdersInProcess=Bestellingen in uitvoering
 OrdersToProcess=Nog te verwerken klantenbestellingen
-SuppliersOrdersToProcess=Nog te verwerken leveranciersbestellingen
 StatusOrderDraftShort=Ontwerp bestelling
 StatusOrderSentShort=In uitvoering
 StatusOrderDelivered=Geleverd
 StatusOrderDeliveredShort=Geleverd
 UnvalidateOrder=Maak validatie bestelling ongedaan
 OrderReopened=Bestelling %s heropend
-NoOrder=Geen order
-NoSupplierOrder=Geen aankooporder
-DraftSuppliersOrders=Voorlopige Leveranciersorder
 SecondApprovalAlreadyDone=Tweede controle reeds uitgevoerd
diff --git a/htdocs/langs/nl_BE/products.lang b/htdocs/langs/nl_BE/products.lang
index f1b2a5d1cda..697d8bb94ff 100644
--- a/htdocs/langs/nl_BE/products.lang
+++ b/htdocs/langs/nl_BE/products.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - products
 Reference=Artikelcode
+LastModifiedProductsAndServices=Laatste %s aangepaste producten / services
 OnSell=Te koop
 OnBuy=Te koop
 NotOnSell=Niet meer beschikbaar
diff --git a/htdocs/langs/nl_BE/sendings.lang b/htdocs/langs/nl_BE/sendings.lang
index 9057b72a087..f6f409a5866 100644
--- a/htdocs/langs/nl_BE/sendings.lang
+++ b/htdocs/langs/nl_BE/sendings.lang
@@ -7,7 +7,6 @@ QtyInOtherShipments=Aantal in andere verzendingen
 SendingsAndReceivingForSameOrder=Verzendingen en ontvangstbevestigingen van deze bestelling
 ConfirmDeleteSending=Weet u zeker dat u deze verzending wilt verwijderen?
 ConfirmValidateSending=Weet u zeker dat u deze verzending met referentie <b>%s</b> wilt valideren?
-ConfirmCancelSending=Weet u zeker dat u deze verzending wilt annuleren?
 DateDeliveryPlanned=Verwachte leveringsdatum
 RefDeliveryReceipt=Referentie ontvangstbevestiging
 StatusReceipt=Status ontvangstbevestiging
diff --git a/htdocs/langs/nl_BE/stocks.lang b/htdocs/langs/nl_BE/stocks.lang
index 2606eb29f32..f61acb5d25d 100644
--- a/htdocs/langs/nl_BE/stocks.lang
+++ b/htdocs/langs/nl_BE/stocks.lang
@@ -1,4 +1,7 @@
 # Dolibarr language file - Source file is en_US - stocks
+Movements=Mutaties
+ListOfStockMovements=Voorraadmutatielijst
+SelectProductInAndOutWareHouse=Kies een product, een aantal, een van-magazijn, een naar-magazijn, en klik "%s".  Als alle nodige bewegingen zijn aangeduid, klik op "%s".
 inventoryDraft=Actief
 inventoryConfirmCreate=Aanmaken
 inventoryDeleteLine=Verwijder lijn
diff --git a/htdocs/langs/nl_BE/supplier_proposal.lang b/htdocs/langs/nl_BE/supplier_proposal.lang
index 042e7535652..d2625cb465d 100644
--- a/htdocs/langs/nl_BE/supplier_proposal.lang
+++ b/htdocs/langs/nl_BE/supplier_proposal.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposals=Leverancier voorstellen
-SupplierProposalsShort=Leverancier voorstellen
 SupplierProposalStatusDraft=Conceptfactuur (moet worden gevalideerd)
 SupplierProposalStatusClosed=Afgesloten
 SupplierProposalStatusDraftShort=Concept
diff --git a/htdocs/langs/nl_NL/accountancy.lang b/htdocs/langs/nl_NL/accountancy.lang
index 5fe398d8a32..1f6442f712a 100644
--- a/htdocs/langs/nl_NL/accountancy.lang
+++ b/htdocs/langs/nl_NL/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Boekhouding
 ACCOUNTING_EXPORT_SEPARATORCSV=Kolom separator voor export bestand
 ACCOUNTING_EXPORT_DATE=Datumnotatie voor exportbestand
 ACCOUNTING_EXPORT_PIECE=Export the number of piece
@@ -8,7 +9,7 @@ ACCOUNTING_EXPORT_AMOUNT=Export bedrag
 ACCOUNTING_EXPORT_DEVISE=Export valuta
 Selectformat=Selecteer het formaat van het bestand
 ACCOUNTING_EXPORT_FORMAT=Selecteer het formaat van het bestand
-ACCOUNTING_EXPORT_ENDLINE=Select the carriage return type
+ACCOUNTING_EXPORT_ENDLINE=Selecteer nieuwe regel type
 ACCOUNTING_EXPORT_PREFIX_SPEC=Specificeer de prefix voor de bestandsnaam
 ThisService=Deze dienst
 ThisProduct=Dit product
@@ -25,25 +26,25 @@ Chartofaccounts=Rekeningschema
 CurrentDedicatedAccountingAccount=Huidige toegewezen grootboekrekening
 AssignDedicatedAccountingAccount=Nieuwe grootboekrekening toewijzen
 InvoiceLabel=Factuur 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
+OverviewOfAmountOfLinesNotBound=Overzicht van aantal regels welke nog niet zijn gekoppeld aan een grootboekrekening
+OverviewOfAmountOfLinesBound=Overzicht van aantal regels welke zijn gekoppeld aan een grootboekrekening
 OtherInfo=Overige informatie
 DeleteCptCategory=Verwijder grootboekrekening uit groep
-ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group ?
+ConfirmDeleteCptCategory=Weet u zeker dat u deze grootboekrekening wilt verwijderen uit de grootboekrekening-groep?
 JournalizationInLedgerStatus=Journaal-status
 AlreadyInGeneralLedger=Reeds doorgeboekt
 NotYetInGeneralLedger=Nog niet doorgeboekt
-GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
+GroupIsEmptyCheckSetup=Groep is leeg. Controleer instellingen bij gepersonaliseerde rekeninggroep
 DetailByAccount=Details grootboekrekening
-AccountWithNonZeroValues=Accounts with non zero values
+AccountWithNonZeroValues=Grootboekrekeningen met boekingen
 ListOfAccounts=Overzicht grootboekrekeningen
 
-MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers not defined in setup
-MainAccountForUsersNotDefined=Main accounting account for users not defined in setup
+MainAccountForCustomersNotDefined=De standaard grootboekrekening voor klanten is niet vastgelegd bij de instellingen
+MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
+MainAccountForUsersNotDefined=De standaard grootboekrekening voor gebruikers is niet vastgelegd bij de instellingen
 MainAccountForVatPaymentNotDefined=Standaard grootboekrekening voor betaalde BTW is niet vastgelegd bij instellingen
 
-AccountancyArea=Boekhoud omgeving
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Het gebruiken van de boekhoudmodule gaat met verschillende stappen
 AccountancyAreaDescActionOnce=De volgende werkzaamheden worden maar één keer uitgevoerd of jaarlijks
 AccountancyAreaDescActionOnceBis=De volgende stappen kunnen in de toekomst een tijdsbesparing opleveren bij het aanmaken van journaalposten (bij het schrijven van de journaalposten in de boekhouding)
@@ -75,7 +76,7 @@ ChangeAndLoad=Wijzigen en inlezen
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
-SubledgerAccount=Subledger Account
+SubledgerAccount=Subgrootboekrekening
 ShowAccountingAccount=Toon grootboekrekening
 ShowAccountingJournal=Toon dagboek
 AccountAccountingSuggest=Voorgestelde rekening
@@ -83,22 +84,22 @@ MenuDefaultAccounts=Standaard GB-rekeningen
 MenuBankAccounts=Bankrekeningen
 MenuVatAccounts=BTW rekeningen
 MenuTaxAccounts=GB-rek. belastingen
-MenuExpenseReportAccounts=Resultaatrekeningen kosten
+MenuExpenseReportAccounts=Definiëren kostenposten
 MenuLoanAccounts=Grootboekrekeningen lonen
 MenuProductsAccounts=Grootboekrekeningen producten
 ProductsBinding=Grootboekrekeningen producten
 Ventilation=Koppelen aan grootboekrekening
 CustomersVentilation=Koppeling verkoopfacturen klant
-SuppliersVentilation=Koppeling inkoopfacturen leverancier
-ExpenseReportsVentilation=Koppelen aan kostenrekening
+SuppliersVentilation=Vendor invoice binding
+ExpenseReportsVentilation=Declaraties koppelen aan rekening
 CreateMvts=Nieuwe boeking
 UpdateMvts=Aanpassing boeking
 ValidTransaction=Transacties valideren
 WriteBookKeeping=Doorboeken in boekhouding
 Bookkeeping=Grootboek
 AccountBalance=Saldo
-ObjectsRef=Source object ref
-CAHTF=Totaal inkoop exclusief BTW
+ObjectsRef=Ref. bron-object 
+CAHTF=Totaal inkoop leverancier excl. belasting
 TotalExpenseReport=Totaal resultaatrekening kosten
 InvoiceLines=Te koppelen factuurregels
 InvoiceLinesDone=Gekoppelde factuurregels
@@ -108,7 +109,7 @@ IntoAccount=Koppel regel aan grootboekrekening
 
 
 Ventilate=Koppelen
-LineId=Id line
+LineId=regel ID
 Processing=verwerken
 EndProcessing=Proces afgebroken
 SelectedLines=Geselecteerde lijnen
@@ -128,14 +129,15 @@ ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listing
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
 ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
 ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
-ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
-BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
+ACCOUNTING_MANAGE_ZERO=Sta toe om het aantal nullen aan het einde van een account te beheren. Dit is nodig in sommige landen (zoals Zwitserland). Bij optie uit (standaard), kunt u de volgende 2 parameters instellen om te vragen of de applicatie virtuele nul toevoegt.
+BANK_DISABLE_DIRECT_INPUT=Rechtstreeks boeken van transactie in bankboek uitzetten
 
 ACCOUNTING_SELL_JOURNAL=Verkoopboek
 ACCOUNTING_PURCHASE_JOURNAL=Inkoopboek
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Grootboekrekening kruisposten
 ACCOUNTING_ACCOUNT_SUSPENSE=Grootboekrekening kruisposten (dagboeken)
@@ -153,14 +155,14 @@ LabelAccount=Label account
 LabelOperation=Label operation
 Sens=Sens
 Codejournal=Journaal
-NumPiece=Piece number
+NumPiece=Boekingstuk
 TransactionNumShort=Transactienummer
 AccountingCategory=Gepersonaliseerde groepen
 GroupByAccountAccounting=Groeperen per grootboekrekening
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
 ByAccounts=Op grootboekrekening
-ByPredefinedAccountGroups=By predefined groups
-ByPersonalizedAccountGroups=By personalized groups
+ByPredefinedAccountGroups=Op voorgedefinieerde groepen
+ByPersonalizedAccountGroups=Op gepersonaliseerde groepen
 ByYear=Per jaar
 NotMatch=Niet ingesteld
 DeleteMvt=Verwijder boekingsregels
@@ -173,7 +175,7 @@ ExpenseReportsJournal=Overzicht resultaatrekening
 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 Ledger.
 VATAccountNotDefined=BTW rekeningen niet gedefinieerd
-ThirdpartyAccountNotDefined=Account for third party not defined
+ThirdpartyAccountNotDefined=Grootboekrekening van relatie niet gedefinieerd
 ProductAccountNotDefined=Grootboekrekening producten niet gedefinieerd
 FeeAccountNotDefined=Groetboekrekening vergoedingen niet vastgelegd
 BankAccountNotDefined=Grootboekrekening bank niet gedefinieerd
@@ -181,15 +183,16 @@ CustomerInvoicePayment=Payment of invoice customer
 ThirdPartyAccount=Tegenrekening relatie
 NewAccountingMvt=Nieuwe boeking
 NumMvts=Boeknummer
-ListeMvts=List of movements
+ListeMvts=Omzet
 ErrorDebitCredit=Debet en Credit mogen niet gelijktijdig worden opgegeven.
 AddCompteFromBK=Grootboekrekeningen aan groep toevoegen
 ReportThirdParty=Relatie grootboeknummers
-DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=List of the accounting accounts
-UnknownAccountForThirdparty=Unknown third party account. We will use %s
-UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
+UnknownAccountForThirdparty=Onbekende relatie grootboekrekening. Gebruikt wordt %s
+UnknownAccountForThirdpartyBlocking=Blokkeringsfout. Onbekende relatierekening. 
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Rekening hoofdgroep
 Pcgsubtype=Rekening subgroep
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Koppel factuurregels welke nog niet verbonden zijn met een product grootboekrekening
 ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Hier kunt u een lijst van leveranciersfacturen raadplegen waarvan de factuurregels wel of niet gekoppeld zijn aan een product-grootboekrekening
-DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Koppel kosten-boekregels aan grootboekrekeningen welke nog niet zijn vastgelegd
 DescVentilExpenseReport=Hier kunt u de lijst raadplegen van kostenregels om te koppelen aan een grootboekrekening (of niet).
 DescVentilExpenseReportMore=Als er bij de instellingen bij de kostenposten een grootboekrekening is toegekend, zal het programma deze met een enkele muisklik <strong>"%s"</strong> kunnen koppelen. Als dit niet is gebeurt en u moet regels koppelen, dan zal dit handmatig moeten gebeuren via menu "<strong>%s</strong>".
@@ -215,12 +218,12 @@ ValidateHistory=Automatisch boeken
 AutomaticBindingDone=Automatisch koppelen voltooid
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Koppelen card
 GeneralLedgerIsWritten=Grootboek transacties
 GeneralLedgerSomeRecordWasNotRecorded=Sommige transacties konden niet worden doorgeboekt. Als er geen andere foutmelding is, komt dit waarschijnlijk omdat ze reeds zijn doorgeboekt.
 NoNewRecordSaved=Geen posten door te boeken
-ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ListOfProductsWithoutAccountingAccount=Overzicht van producten welke nog niet zijn gekoppeld aan een grootboekrekening
 ChangeBinding=Wijzig koppeling
 Accounted=Geboekt in grootboek
 NotYetAccounted=Nog niet doorgeboekt in boekhouding
@@ -234,15 +237,15 @@ AccountingJournal=Dagboek
 NewAccountingJournal=Nieuw dagboek
 ShowAccoutingJournal=Toon dagboek
 Nature=Natuur
-AccountingJournalType1=Miscellaneous operations
+AccountingJournalType1=Overige bewerkingen
 AccountingJournalType2=Verkopen
 AccountingJournalType3=Aankopen
 AccountingJournalType4=Bank
 AccountingJournalType5=Kostenoverzicht
 AccountingJournalType8=Voorraad
-AccountingJournalType9=Has-new
+AccountingJournalType9=HAS-nieuw
 ErrorAccountingJournalIsAlreadyUse=Dit dagboek is al in gebruik
-AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
+AccountingAccountForSalesTaxAreDefinedInto=Opmerking: Grootboekrekeningen voor BTW worden vastgelegd in menukeuze <b>%s</b>-<b>%s</b>
 
 ## Export
 ExportDraftJournal=Journaal exporteren
@@ -256,7 +259,7 @@ Modelcsv_ciel=Exporteren naar Sage Ciel Compta of Compta Evolution
 Modelcsv_quadratus=Exporteren naar Quadratus QuadraCompta
 Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
-Modelcsv_agiris=Export towards Agiris
+Modelcsv_agiris=Exporteren naar Agiris
 Modelcsv_configurable=Export Configurable
 ChartofaccountsId=Rekeningschema Id
 
@@ -269,7 +272,7 @@ OptionModeProductSell=Instellingen verkopen
 OptionModeProductBuy=Instellingen inkopen
 OptionModeProductSellDesc=Omzet grootboekrekening bij producten
 OptionModeProductBuyDesc=Inkoop grootboekrekening bij producten
-CleanFixHistory=Remove accounting code from lines that not exists into charts of account
+CleanFixHistory=Verwijder tegenrekening van regels welke niet voorkomen in het rekeningschema
 CleanHistory=Verwijder alle koppelingen van gekozen boekjaar,
 PredefinedGroups=Voorgedefinieerde groepen
 WithoutValidAccount=Zonder geldig toegewezen grootboekrekening
@@ -287,10 +290,15 @@ ErrorNoAccountingCategoryForThisCountry=No accounting account group available fo
 ErrorInvoiceContainsLinesNotYetBounded=U probeert regels van factuur <strong>%s</strong> door te boeken, maar er zijn regels die nog niet verbonden zijn aan een grootboekrekening. Het doorboeken is daarom geannuleerd.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
 ExportNotSupported=The export format setuped is not supported into this page
-BookeppingLineAlreayExists=Lines already existing into bookeeping
+BookeppingLineAlreayExists=Regels al aanwezig in de boekhouding
 NoJournalDefined=Geen dagboek ingesteld
 Binded=Geboekte regels
 ToBind=Te boeken regels
-UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
+UseMenuToSetBindindManualy=Autodetectie niet mogelijk., gebruik menukeuze <a href="%s">%s</a> om koppeling handmatig te maken.
+
+## Import
+ImportAccountingEntries=Accounting entries
 
 WarningReportNotReliable=Pas op. Dit overzicht is niet afkomstig vanuit de boekhouding. Hierdoor bevat deze geen modificaties verricht in de boekhouding. Als het doorboeken up-to-date is, geeft de boekhouding een beter overzicht.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
index d1b662023af..ffcb3b76c1d 100644
--- a/htdocs/langs/nl_NL/admin.lang
+++ b/htdocs/langs/nl_NL/admin.lang
@@ -15,7 +15,7 @@ FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly confor
 FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
 FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
 GlobalChecksum=Global checksum
-MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+MakeIntegrityAnalysisFrom=Maak integriteitsanalyse van toepassingsbestanden van
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Ontbrekende bestanden
@@ -213,7 +213,7 @@ GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area
 DoliStoreDesc=DoliStore, de officiële markt voor externe Dolibarr ERP / CRM modules.
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Websiteaanbieders waarop u naar meer modules kunt zoeken
-DevelopYourModuleDesc=Some solutions to develop your own module...
+DevelopYourModuleDesc=Enkele oplossingen om uw eigen module te ontwikkelen ...
 URL=Link
 BoxesAvailable=Beschikbare widgets
 BoxesActivated=Widgets geactiveerd
@@ -235,7 +235,7 @@ Feature=Functionaliteit
 DolibarrLicense=Licentie
 Developpers=Ontwikkelaars / mensen die bijgedragen hebben
 OfficialWebSite=Officiële internationale Dolibarr website
-OfficialWebSiteLocal=Local web site (%s)
+OfficialWebSiteLocal=Lokale website (%s)
 OfficialWiki=Documentatie op de Wiki pagina's van Dolibarr
 OfficialDemo=Online demonstratie van Dolibarr
 OfficialMarketPlace=Officiële markt voor externe modules / addons
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=SMTP / SMTPS Host (standaard in php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP / SMTPS-poort (niet gedefinieerd in PHP op Unix-achtige systemen)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPS-host (Niet gedefinieerd in PHP op Unix-achtige systemen)
 MAIN_MAIL_EMAIL_FROM=E-mail afzender voor automatische e-mails (Standaard in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=E-mail gebruikt als 'Fout-Tot' veld in verzonden e-mail
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= Stuur systematisch een verborgen zogenoemde 'Carbon-Copy' van alle verzonden e-mails naar
 MAIN_DISABLE_ALL_MAILS=Schakel het versturen van alle e-mails uit (voor testdoeleinden of demonstraties)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=Te gebruiken methode om e-mails te verzenden
 MAIN_MAIL_SMTPS_ID=SMTP-gebruikersnaam indien verificatie vereist
 MAIN_MAIL_SMTPS_PW=SMTP-wachtwoord indien verificatie vereist
@@ -291,7 +292,7 @@ ModuleSetup=Module-instellingen
 ModulesSetup=Instellingen van modules & applicatie
 ModuleFamilyBase=Systeem
 ModuleFamilyCrm=Customer Relation Management (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projecten / Samenwerkingen
@@ -300,8 +301,8 @@ ModuleFamilyTechnic=Hulpmiddelen voor multi-modules
 ModuleFamilyExperimental=Experimentele modules
 ModuleFamilyFinancial=Financiële Modules (Boekhouding / Bedrijfsfinanciën)
 ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
-ModuleFamilyInterface=Interfaces with external systems
+ModuleFamilyPortal=Websites en andere frontale applicaties
+ModuleFamilyInterface=Interfaces met externe systemen
 MenuHandlers=Menuverwerkers
 MenuAdmin=Menu wijzigen
 DoNotUseInProduction=Niet in productie gebruiken
@@ -315,7 +316,7 @@ UnpackPackageInModulesRoot=To deploy/install an external module, unpack the pack
 SetupIsReadyForUse=Module geïnstalleerd. U moet deze nog wel activeren en instellen: <a href="%s">%s</a>.
 NotExistsDirect=De alternatieve hoofdmap is niet gedefinieerd in een bestaande map.<br>
 InfDirAlt=Vanaf versie 3 is het mogelijk om een alternatieve root directory te definiëren.  Dit stelt je in staat om op dezelfde plaats zowel plug-ins als eigen templates te bewaren. <br>Maak gewoon een directory op het niveau van de root van Dolibarr (bv met de naam: aanpassing).<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 are commented with "#", to enable them, just uncomment by removing the "#" character.
+InfDirExample=<br>Leg dit vast in het bestand <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>Als deze lijnen zijn inactief gemaakt met een "#" teken, verwijder dit teken dan om ze te activeren.
 YouCanSubmitFile=Voor deze stap kunt u een .zip bestand of module pakket hier verzenden :
 CurrentVersion=Huidige versie van Dolibarr
 CallUpdatePage=Ga naar de pagina die de databasestructuur en gegevens bijwerkt: %s.
@@ -326,9 +327,9 @@ LastActivationIP=Latest activation IP
 UpdateServerOffline=Updateserver offline
 WithCounter=Manage a counter
 GenericMaskCodes=U kunt elk gewenst maskernummer invoeren. In dit masker, kunnen de volgende tags worden gebruikt:<br><b>{000000}</b> correspondeert met een nummer welke vermeerderd zal worden op elke %s. Voer zoveel nullen in als de gewenste lengte van de teller. De teller wordt aangevuld met nullen vanaf links zodat er zoveel nullen zijn als in het masker.<br><b>{000000+000}</b> hetzelfde als voorgaand maar een offset corresponderend met het nummer aan de rechterkant van het + teken is toegevoegd startend op de eerste %s. <br><b>{000000@x}</b> hetzelfde als voorgaande maar de teller wordt gereset naar nul, wanneer maand x is bereikt (x tussen 1 en 12). Als deze optie is gebruikt en x is 2 of hoger, dan is de volgorde {yy}{mm} of {yyyy}{mm} ook vereist. <br><b>{dd}</b> dag (01 t/m 31).<br><b>{mm}</b> maand (01 t/m 12).<br><b>{yy}</b>, <b>{yyyy}</b> of <b>{y}</b> jaat over 2, 4 of 1 nummer(s). <br>
-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 for customer. This counter dedicated to customer is reset at same time than 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>
+GenericMaskCodes2=<b>{cccc}</b>de clientcode op n tekens<br> <b>{cccc000}</b> de cliëntcode op n tekens wordt gevolgd door een teller die is toegewezen aan de klant. Deze teller voor de klant wordt op hetzelfde moment gereset als de globale teller.<br><b> {tttt}</b> De code van het type van derden op n tekens (zie menu Home - Setup - Woordenboek - Soorten derden) . Als u deze label toevoegt, is de teller anders voor elk type derde partij.<br>
 GenericMaskCodes3=Alle andere karakters in het masker zullen intact blijven.<br>Spaties zijn niet toegestaan.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
+GenericMaskCodes4a=<u>Voorbeeld op de 99e %s van relaties TheCompany, met datum 2007-01-31: </u><br>
 GenericMaskCodes4b=<u>Voorbeeld van een Klant gecreëerd op 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Voorbeeld op product gemaakt op 2007-03-01:</u><br>
 GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> geeft <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> geeft <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> geeft <b>IN0701-0099-A</b> als het soort bedrijf is 'Responsable Inscripto' met de codesoort 'A_RI'
@@ -373,7 +374,8 @@ NoSmsEngine=Geen SMS afzender manager beschikbaar. SMS afzender manager zijn nie
 PDF=PDF
 PDFDesc=U kunt elke globale opties met betrekking tot de PDF-generatie
 PDFAddressForging=Regels aan te pakken dozen te smeden
-HideAnyVATInformationOnPDF=Verberg alle informatie met betrekking tot de BTW op gegenereerde PDF
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=Verberg productbeschrijving op gemaakte PDF
@@ -413,10 +415,10 @@ ExtrafieldLink=Link naar een object
 ComputedFormula=Berekend veld
 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, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties 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>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->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->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
 ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
-ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
+ExtrafieldParamHelpselect=Lijst met waarden moet regels zijn met een indelingssleutel, waarde (waarbij de sleutel niet '0' kan zijn) <br> <br> bijvoorbeeld: <br> 1, waarde1 <br>2, waarde2 <br>code3, waarde3 <br> ...  <br> <br>Om de lijst te laten afhangen van een andere aanvullende attributenlijst:  <br>1, value1 | options_ <i> parent_list_code</i>: parent_key  <br>2, value2 | options_ <i> parent_list_code </i>: parent_key  <br> <br>Om de lijst afhankelijk te maken van een andere lijst: <br> 1, value1 |<i> parent_list_code </i>: parent_key <br> 2, value2 | <i> parent_list_code</i>: parent_key
 ExtrafieldParamHelpcheckbox=Lijst van parameters moet telkens bestaan uit sleutel,waarde (waarbij de sleutel geen '0' kan zijn)<br><br>bv:<br>1,waarde<br>2,waarde2<br>3,waarde3<br>...
 ExtrafieldParamHelpradio=Lijst van parameters moet telkens bestaan uit sleutel,waarde<br><br>bv:<br>1,waarde<br>2,waarde2<br>3,waarde3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=Lijst met waarden komt uit een tabel <br> Syntaxis: table_name: label_field: id_field :: filter <br> Voorbeeld: c_typent: libelle: id :: filter <br> <br> - idfilter is noodzakelijkerwijs een primaire int-sleutel <br> - filter kan een eenvoudige test zijn (bv. actief = 1) om alleen actieve waarde weer te geven <br> U kunt ook $ ID $ in filter gebruiken dat is het huidige id van huidig ​​object <br> Om een ​​SELECT in filter te doen, gebruik $ SEL $ <br> als u op extra velden wilt filteren, gebruikt u de syntaxis extra.fieldcode = ... (waarbij veldcode de code van extrafield is) <br> <br> Om de lijst afhankelijk te maken van een andere aanvullende attributenlijst: <br> c_typent: libelle: id: options_ <i> parent_list_code</i>| parent_column: filter  <br> <br>Om de lijst te laten afhangen van een andere lijst: <br>c_typent: libelle: id: <i> parent_list_code</i> | parent_column: filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=Gebruikte library voor generen PDF
@@ -445,7 +447,8 @@ DisplayCompanyInfo=Geen adresgegevens bedrijf weer
 DisplayCompanyManagers=Display manager names
 DisplayCompanyInfoAndManagers=Geef adresgegevens en namen manager weer
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party 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.
@@ -456,10 +459,10 @@ ClickToShowDescription=Klik voor omschrijving
 DependsOn=Deze module heeft de volgende module(s) nodig
 RequiredBy=Deze module is vereist bij module(s)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. This need to have technical knowledges to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter here the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
+PageUrlForDefaultValues=U moet hier de relatieve URL van de pagina invoeren. Als u parameters opneemt in URL, zijn de standaardwaarden effectief als alle parameters op dezelfde waarde zijn ingesteld. Voorbeelden:
 PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-EnableDefaultValues=Enable usage of personalized default values
+EnableDefaultValues=Schakel het gebruik van gepersonaliseerde standaardwaarden in
 EnableOverwriteTranslation=Enable usage of overwrote translation
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
 WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Zet dit op 1 als u het hoofddocument als standaard aan e-
 FilesAttachedToEmail=Voeg een bestand toe
 SendEmailsReminders=Stuur agendaherinneringen per e-mail
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=Gebruikers & groepen
 Module0Desc=Groepenbeheer gebruikers/werknemers
@@ -479,7 +485,7 @@ Module1Desc=Beheer van derde partijen (klanten, leveranciers en contactpersonen)
 Module2Name=Commercieel
 Module2Desc=Commercieel beheer
 Module10Name=Boekhouding
-Module10Desc=Eenvoudig boekhoudkundig beheer (Verzending van facturen en betalingen)
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=Zakelijke voorstellen / Offertes
 Module20Desc=Beheer van offertes
 Module22Name=EMailings
@@ -493,7 +499,7 @@ Module30Desc=Factuur- en creditnotabeheer voor klanten. Factuurbeheer voor lever
 Module40Name=Leveranciers
 Module40Desc=Leveranciersbeheer (inkoopopdrachten en -facturen)
 Module42Name=Debug logs
-Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module42Desc=Mogelijkheden voor een log (file,syslog, ...). Deze log-files zijn voor technische/debug ondersteuning.
 Module49Name=Editors
 Module49Desc=Editorbeheer
 Module50Name=Producten
@@ -543,17 +549,17 @@ Module320Desc=Voeg een RSS feed toe in de informatieschermen van Dolibarr
 Module330Name=Weblinks (Favouriete internetpagina's in het menu weergeven)
 Module330Desc=Internetfavorietenbeheer
 Module400Name=Projecten/Kansen/Leads
-Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
+Module400Desc=Beheer van projecten, kansen / leads en / of taken. U kunt ook elk element (factuur, bestelling, voorstel, interventie, ...) toewijzen aan een project en een transversaal beeld krijgen van de projectweergave.
 Module410Name=Webkalender
 Module410Desc=Integratie van een webkalender
-Module500Name=Speciale uitgaven
-Module500Desc=Beheer van bijzondere uitgaven (BTW, sociale of fiscale lasten, dividenden)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Payment of employee wages
 Module510Desc=Record and follow payment of your employee wages
 Module520Name=Lening
 Module520Desc=Het beheer van de leningen
 Module600Name=Notificaties van bedrijfs-evenementen
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), to third-party contacts (setup defined on each third party) or to fixed emails
+Module600Desc=Stuur e-mailmeldingen (geactiveerd door sommige zakelijke evenementen) naar gebruikers (instelling gedefinieerd op elke gebruiker), naar externe contactpersonen (set-up gedefinieerd op elke externe partij) of naar vaste e-mails
 Module600Long=Note that this module is dedicated to send real time emails when a dedicated business event occurs. If you are looking for a feature to send reminders by email of your agenda events, go into setup of module Agenda.
 Module610Name=Product Variants
 Module610Desc=Allows creation of products variant based on attributes (color, size, ...)
@@ -561,14 +567,14 @@ Module700Name=Giften
 Module700Desc=Donatiebeheer
 Module770Name=Onkostennota's 
 Module770Desc=Management en vordering onkostennota's (vervoer, maaltijden, ...)
-Module1120Name=Leverancier commerciële voorstel
-Module1120Desc=Leverancier verzoek commerciële voorstel en prijzen
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Mantis integratie
 Module1520Name=Documenten genereren
 Module1520Desc=Massa mail document generen
-Module1780Name=Labels/Categorien
-Module1780Desc=Label/categorie maken (producten, klanten, leveranciers, contacten of leden)
+Module1780Name=Kenmerk/Categorieën
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=Fckeditor
 Module2000Desc=Toestaan aanpassen tekst met behulp de uitgebreide editor( Gebaseerd op de CKEditor)
 Module2200Name=Dynamische prijzen
@@ -576,7 +582,7 @@ Module2200Desc=Het gebruik van wiskundige uitdrukkingen voor prijzen mogelijk te
 Module2300Name=Geplande taken
 Module2300Desc=Taakplanning (ook wel cron of chrono tabel)
 Module2400Name=Gebeurtenissen/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Document Management System / Electronic Content Management. Geautomatiseerde organisatie van gemaakte en opgeslagen documenten. Deel deze indien gewenst.
 Module2600Name=API/Web services (SOAP server)
@@ -607,13 +613,13 @@ Module20000Desc=Bevestig en volg verlofverzoeken van medewerkers
 Module39000Name=Products lots
 Module39000Desc=Lot of serienummer, vervaldatum en de uiterste verkoopdatum beheer van producten
 Module50000Name=Paybox
-Module50000Desc=Module to offer an online payment page accepting payments with Credit/Debit card via PayBox. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+Module50000Desc=Module om een ​​online betaalpagina aan te bieden die betalingen met een creditcard / betaalpas accepteert via PayBox. Dit kan worden gebruikt om uw klanten toe te staan ​​om gratis betalingen te doen of om een ​​betaling uit te voeren voor een bepaald Dolibarr-object (factuur, bestelling, ...)
 Module50100Name=Verkooppunt
 Module50100Desc=Point of sales module (POS).
 Module50200Name=Paypal
-Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
+Module50200Desc=Module om een ​​online betalingspagina aan te bieden die betalingen met PayPal accepteert (creditcard of PayPal-tegoed). Dit kan worden gebruikt om uw klanten toe te staan ​​om gratis betalingen te doen of om een ​​betaling uit te voeren voor een bepaald Dolibarr-object (factuur, bestelling, ...)
 Module50400Name=Boekhouding
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (zonder het openen van de documenten) met behulp van Cups IPP-interface (Printer moet zichtbaar zijn vanaf de server zijn, en CUPS moet geinstalleerd zijn op de server).
 Module55000Name=Poll, Onderzoek of Stemmen
@@ -624,7 +630,7 @@ Module60000Name=Commissies
 Module60000Desc=Module om commissies te beheren
 Module62000Name=Incoterm
 Module62000Desc=Onderdelen toevoegen voor Incoterms
-Module63000Name=Resources
+Module63000Name=Bronnen
 Module63000Desc=Bronnen beheren (printers, auto's kamers, ...) zodat u deze kunt delen met evenementen
 Permission11=Bekijk afnemersfacturen
 Permission12=Creëer / wijzigen afnemersfacturen
@@ -646,7 +652,7 @@ Permission34=Verwijderen producten / diensten
 Permission36=Exporteer producten / diensten
 Permission38=Export producten
 Permission41=Inlezen projecten en taken (gedeeld project en project waarbij ik decontactpersoon ben). Kan ook de gebruikte tijd invoeren op toegewezen taken (rooster).
-Permission42=Create/modify projects (shared project and projects i'm contact for). Can also create tasks and assign users to project and tasks
+Permission42=Maak / wijzig projecten (gedeeld project en projecten waarvan ik contactpersoon ben). Kan ook taken aanmaken en gebruikers toewijzen aan deze projecten en taken
 Permission44=Verwijder projecten (Gedeelde projecten en projecten waarvoor ik de contactpersoon ben)
 Permission45=Exporteer projecten
 Permission61=Bekijk interventies
@@ -696,7 +702,7 @@ Permission147=Bekijk statistieken
 Permission151=Inlezen incasso-opdracht
 Permission152=Aanmaken/aanpassen incasso-opdracht
 Permission153=Versturen/verzenden incasso-opdrachten
-Permission154=Record Credits/Rejects of direct debit payment orders
+Permission154=Overzicht crediteringen/afkeuringen incasso opdrachten
 Permission161=Lees contracten/abonnementen
 Permission162=Creëren/aanpassen contracten/abonnementen
 Permission163=Een dienst/abonnement van een contract activeren
@@ -749,7 +755,7 @@ PermissionAdvanced253=Creëer / wijzig de rechten van internet / externe gebruik
 Permission254=Verwijderen of uitschakelen van andere gebruikers
 Permission255=Creëren / wijzigen eigen gebruikersgegevens
 Permission256=Wijzigen eigen wachtwoord
-Permission262=Extend access to all third parties (not only third parties that user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc).<br>Not effective for projects (only rules on project permissions, visibility and assignement matters).
+Permission262=Verleng de toegang tot alle relaties (niet alleen relaties waarvan de gebruiker een verkoopvertegenwoordiger is). <br> Niet effectief voor externe gebruikers (altijd beperkt tot offertes, bestellingen, facturen, contracten, enz.). <br>Niet effectief voor projecten (alleen regels over projectrechten, zichtbaarheid en toewijzing zijn van belang).
 Permission271=Lees CA
 Permission272=Facturen inzien
 Permission273=Facturen uitgeven
@@ -781,9 +787,9 @@ Permission401=Bekijk kortingen
 Permission402=Creëren / wijzigen kortingen
 Permission403=Kortingen valideren
 Permission404=Kortingen verwijderen
-Permission501=Read employee contracts/salaries
+Permission501=Lees werknemerscontracten/salarissen
 Permission502=Create/modify employee contracts/salaries
-Permission511=Read payment of salaries
+Permission511=Betaling van salarissen
 Permission512=Create/modify payment of salaries
 Permission514=Verwijder salarissen
 Permission517=Export salarissen
@@ -800,7 +806,7 @@ Permission538=Diensten exporteren
 Permission701=Bekijk donaties
 Permission702=Creëren / wijzigen donaties
 Permission703=Verwijderen donaties
-Permission771=Read expense reports (yours and your subordinates)
+Permission771=Declaraties (eigen en ondergeschikten)
 Permission772=Creëer / wijzigen onkostennota's 
 Permission773=Verwijderen onkostennota's 
 Permission774=Lees alle onkostennota's (ook voor de gebruiker niet ondergeschikten)
@@ -810,8 +816,8 @@ Permission779=Export onkostennota's
 Permission1001=Bekijk voorraden
 Permission1002=Toevoegen/wijzigen van een magazijn
 Permission1003=Verwijder magazijnen
-Permission1004=Bekijk voorraadmutaties
-Permission1005=Creëren / wijzigen voorraadmutaties
+Permission1004=Bekijk voorraad-verplaatsingen
+Permission1005=Creëren / wijzigen voorraad-verplaatsing
 Permission1101=Bekijk levering opdrachten
 Permission1102=Creëren / wijzigen opdrachtenlevering
 Permission1104=Valideer opdrachtenlevering
@@ -836,12 +842,12 @@ Permission1236=Exporteer leveranciersfacturen, attributen en betalingen
 Permission1237=Exporteer Leverancier opdrachten en hun details
 Permission1251=Voer massale invoer van externe gegevens in de database uit (data load)
 Permission1321=Exporteer afnemersfacturen, attributen en betalingen
-Permission1322=Reopen a paid bill
+Permission1322=Open een betaalde factuur
 Permission1421=Exporteer afnemersfacturen en attributen
 Permission20001=Read leave requests (your leaves and the one of your subordinates)
 Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
-Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even of user not subordinates)
+Permission20003=Verlofaanvragen verwijderen
+Permission20004=Alle verlofaanvragen (zelfs van gebruiker, niet ondergeschikten)
 Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
 Permission20006=Admin leave requests (setup and update balance)
 Permission23001=Lees geplande taak
@@ -870,7 +876,7 @@ Permission55002=Maak / wijzig polls
 Permission59001=Lees commerciële marges
 Permission59002=Definieer commerciële marges
 Permission59003=Read every user margin
-Permission63001=Read resources
+Permission63001=Bronnen lezen
 Permission63002=Create/modify resources
 Permission63003=Verwijder resources
 Permission63004=Link resources to agenda events
@@ -899,7 +905,7 @@ DictionaryStaff=Personeel
 DictionaryAvailability=Leverings vertraging
 DictionaryOrderMethods=Bestel methodes
 DictionarySource=Oorsprong van offertes / bestellingen
-DictionaryAccountancyCategory=Personalized groups for reports
+DictionaryAccountancyCategory=Gepersonaliseerde groepen voor rapporten
 DictionaryAccountancysystem=Modellen voor rekeningschema
 DictionaryAccountancyJournal=Daboeken
 DictionaryEMailTemplates=Email documentensjablonen
@@ -908,7 +914,7 @@ DictionaryProspectStatus=Status prospect
 DictionaryHolidayTypes=Soort vergoeding
 DictionaryOpportunityStatus=Opportunity status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
-DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryExpenseTaxRange=Onkostenoverzicht - bereik per transportcategorie
 SetupSaved=Instellingen opgeslagen
 SetupNotSaved=Installatie niet opgeslagen
 BackToModuleList=Terug naar moduleoverzicht
@@ -917,8 +923,8 @@ TypeOfRevenueStamp=Type of revenue stamp
 VATManagement=BTW-beheer
 VATIsUsedDesc=Het standaard BTW-tarief bij het aanmaken van prospecten, facturen, orders etc volgt de actieve standaard regel:<br>Als de verkoper onderworpen is aan BTW, dan wordt BTW standaard op 0 gezet. Einde van de regel.<br>Als het 'land van de verkoper' = 'het land van de koper' dan wordt de BTW standaard ingesteld op de BTW van het product in het verkopende land. Einde van de regel.<br>Als verkoper en koper zich in de Europese Gemeenschap bevinden en het betreft een nieuw vervoersmiddel (auto, boot, vliegtuig), dan wordt de BTW standaard ingesteld op 0 (De BTW moet worden betaald door koper in het grenskantoor van zijn land en niet door de verkoper). Einde van de regel.<br>Als verkoper en koper zich in de Europese Unie bevinden en de koper is een persoon of bedrijf zonder BTW-registratienummer = BTW-standaard van het verkochte product. Einde van de regel.<br>Als verkoper en koper zich in de Europese Gemeenschap bevinden en de koper geen bedrijf is, dan wordt de BTW standaard ingesteld op de BTW van het verkochte product. Einde van de regel<br><br>In alle andere gevallen wordt de BTW standaard ingesteld op 0. Einde van de regel.<br>
 VATIsNotUsedDesc=Standaard is de voorgestelde BTW 0. Dit kan gebruikt worden in situaties zoals verenigingen, particulieren of kleine bedrijven.
-VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
+VATIsUsedExampleFR=In Frankrijk betekent dit dat bedrijven of organisaties een echt fiscaal systeem hebben (Vereenvoudigd echt of normaal echt). Een systeem waarin btw wordt aangegeven.
+VATIsNotUsedExampleFR=In Frankrijk betekent dit verenigingen zonder BTW-aangifte of bedrijven, organisaties of vrije beroepen die voor het fiscale systeem voor micro-ondernemingen (btw in franchise) hebben gekozen en een franchisebetaling zonder BTW-aangifte hebben betaald. Deze keuze zal de referentie "Niet van toepassing zijnde BTW - art-293B van CGI" op facturen weergeven.
 ##### Local Taxes #####
 LTRate=Tarief
 LocalTax1IsNotUsed=Gebruik geen tweede belasting
@@ -954,7 +960,7 @@ LabelUsedByDefault=Standaard te gebruiken label indien er geen vertaling kan wor
 LabelOnDocuments=Etiket op documenten
 NbOfDays=Aantal dagen
 AtEndOfMonth=Aan het einde van de maand
-CurrentNext=Current/Next
+CurrentNext=Huidige/volgende
 Offset=Offset (afstand)
 AlwaysActive=Altijd actief
 Upgrade=Bijwerken
@@ -1018,7 +1024,7 @@ Alerts=Kennisgevingen
 DelaysOfToleranceBeforeWarning=Getolereerde vertraging voor kennisgeving
 DelaysOfToleranceDesc=In dit scherm kunt u de getolereerde vertraging voordat een kennisgeving wordt gemeld op het scherm met een icoontje %s voor elk te laat element.
 Delays_MAIN_DELAY_ACTIONS_TODO=Getolereerde vertraging (in dagen) voor geplande evenementen (agenda) nog niet voltooid
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Delay tolerance (in days) before alert on project not closed in time
+Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Vertragingstolerantie (in dagen) vóór melding bij project niet tijdig afgesloten
 Delays_MAIN_DELAY_TASKS_TODO=Getolereerde vertraging (in dagen) voor geplande taken (project-taken) nog niet voltooid
 Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Getolereerde vertraging (in dagen) voor een kennisgeving, op nog niet uitgevoerde orders.
 Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Vertragingstolerantie (in dagen) voor kennisgeving van nog niet verwerkte leveranciersopdrachten.
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=Getolereerde vertraging (in dagen) voor een kennisgevi
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Getolereerde vertraging (in dagen) voor de kennisgeving voor nog te doen cheques aanbetaling
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=Bij Instellingen kunt u de onderdelen instellen voordat u begint Dolibarr.
-SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=Andere menu-items beheren / optionele instellingen.
 LogEvents=Veiligheidsauditgebeurtenissen
 Audit=Audit
@@ -1054,8 +1060,9 @@ LogEventDesc=Hier kunt u de de gewenste veiligheidslogs in- of uitschakelen. Beh
 AreaForAdminOnly=Setup functies kunnen alleen door <b>Administrator gebruikers</b> worden ingesteld
 SystemInfoDesc=Systeeminformatie is technische informatie welke u in alleen-lezen modus krijgt en alleen door beheerders is in te zien.
 SystemAreaForAdminOnly=Dit scherm is alleen beschikbaar voor de beheerders. Andere Dolibarr gebruikers kunnen hier niets wijzigen.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=U kunt hier instellingen doen die het uiterlijk van Dolibarr instellen
 AvailableModules=Beschikbare app/modules
 ToActivateModule=Om modules te activeren, ga naar Home->Instellingen->Modules.
@@ -1068,8 +1075,8 @@ TriggerDisabledAsModuleDisabled=Initiatoren in dit bestand zijn uitgeschakeld al
 TriggerAlwaysActive=Initiatoren in dit bestand zijn altijd actief, ongeacht de geactiveerde modules in Dolibarr.
 TriggerActiveAsModuleActive=Initiatoren in dit bestand zijn actief als module <b>%s</b> is ingeschakeld.
 GeneratedPasswordDesc=Stel hier de regel in die u wilt gebruiken voor het genereren van een nieuwe wachtwoord als u vraagt om een automatisch gegenereerd wachtwoord
-DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting. For a list of options <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">check here</a>.
+DictionaryDesc=Voer alle referentiegegevens in. U kunt uw waarden toevoegen aan de standaardwaarde.
+ConstDesc=Op deze pagina kunt u alle andere parameters bewerken die niet beschikbaar zijn op de vorige pagina's. Dit zijn meestal gereserveerde parameters voor ontwikkelaars of geavanceerde probleemoplossing. Voor een lijst met opties <a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">kijk hier</a>,
 MiscellaneousDesc=Overige beveiliging gerelateerde instellingen worden hier vastgelegd.
 LimitsSetup=Limieten- en precisieinstellingen
 LimitsDesc=U kunt hier limieten en preciseringen die Dolibarr gebruikt instellen
@@ -1141,13 +1148,13 @@ PathToDocuments=Pad naar documenten
 PathDirectory=Map
 SendmailOptionMayHurtBuggedMTA=Feature om e-mails met behulp van methode "PHP mail direct" te sturen zal een e-mailbericht dat niet goed zou kunnen worden ontleed door sommige het ontvangen van e-mailservers. Resultaat is dat sommige mails niet kunnen worden gelezen door mensen gehost door thoose afgeluisterd platforms. Het is het geval voor sommige Internet providers (Ex: Orange in Frankrijk). Dit is geen probleem in Dolibarr noch in PHP, maar op het ontvangen van e-mailserver. U kunt de optie MAIN_FIX_FOR_BUGGED_MTA echter toe te voegen aan 1 in setup - andere om Dolibarr wijzigen om dit te voorkomen. Echter, kunnen er problemen met andere servers dat opzicht strikt de SMTP-standaard. De andere oplossing (aanbevolen) is het gebruik van de methode "SMTP-socket bibliotheek" dat er geen nadelen heeft.
 TranslationSetup=Vertaal instellingen
-TranslationKeySearch=Search a translation key or string
-TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationKeySearch=Zoek een vertaalsleutel of tekenreeks
+TranslationOverwriteKey=Vertaling vervangen
+TranslationDesc=De weergegeven taal voor de toepassing instellen:<br>* Voor gehele systeem: menu <strong>Startpagina - instellen - Weergeven</strong><br> * Per gebruiker: gebruik het tabblad <strong>Weergave gebruiker instellen</strong>op gebruikerskaart ( klik op gebruikersnaam bovenaan het scherm).
+TranslationOverwriteDesc=U kunt ook de teksten aanpassen door de volgende tabel in te vullen. Kies uw taal uit keuzelijst "%s", plaats de tekenreeks van de vertaling in "%s" en uw nieuwe vertaling in "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Vertaal regel
-CurrentTranslationString=Current translation string
+CurrentTranslationString=Huidige vertaling
 WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
 NewTranslationStringToShow=Weergeven nieuwe vertaal string
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
@@ -1156,7 +1163,7 @@ TotalNumberOfActivatedModules=Geactiveerde applicaties/modules: <b>%s</b> / <b>%
 YouMustEnableOneModule=Je moet minstens 1 module aktiveren
 ClassNotFoundIntoPathWarning=Classe %s niet gevonden in PHP pad
 YesInSummer=Ja in de zomer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users) and only if permissions were granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Let op, alleen de volgende modules worden geopend voor externe gebruikers (ongeacht hun rechten) en alleen als machtigingen zijn verleend:
 SuhosinSessionEncrypt=Sessie opslag geencrypteerd door Suhosin
 ConditionIsCurrently=Voorwaarde is momenteel %s
 YouUseBestDriver=U gebruikt driver %s die momenteel meest geschikt is.
@@ -1188,11 +1195,11 @@ UserMailRequired=E-mail verplicht om een nieuwe gebruiker creëren
 HRMSetup=Instellingen HRM module
 ##### Company setup #####
 CompanySetup=Derde partijenmoduleinstellingen
-CompanyCodeChecker=Module voor de generatie en toetsing van codes voor derde partijen (afnemer of leverancier)
-AccountCodeManager=Grootboeknummer inkoopboek
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
+NotificationsDesc=E-mailmeldingen stelt u in staat om automatische e-mail te verzenden voor sommige Dolibarr onderdelen. Doelen van meldingen kunnen worden gedefinieerd:
 NotificationsDescUser=*per gebruiker, één tegelijk.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
 ModelModules=Documentensjablonen
 DocumentModelOdt=Genereer documenten uit OpenDocuments sjablonen (. ODT of. ODS-bestanden voor OpenOffice, KOffice, TextEdit, ...)
@@ -1203,6 +1210,9 @@ MustBeUnique=Moet het uniek zijn?
 MustBeMandatory=Verplichting voor aanmaken derde partij?
 MustBeInvoiceMandatory=Verplichting om facturen te valideren?
 TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Een exportlink naar het <b>%s</b> formaat is beschikbaar onder de volgende link: %s
 ##### Invoices #####
@@ -1220,7 +1230,7 @@ FreeLegalTextOnInvoices=Vrije tekst op facturen
 WatermarkOnDraftInvoices=Watermerk op ontwerp-facturen (geen indien leeg)
 PaymentsNumberingModule=Payments numbering model
 SuppliersPayment=Leveranciersbetalingen
-SupplierPaymentSetup=Suppliers payments setup
+SupplierPaymentSetup=Instellingen leveranciers betalingen 
 ##### Proposals #####
 PropalSetup=Offertemoduleinstellingen
 ProposalsNumberingModules=Offertenummeringmodules
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=Vrije tekst op Offertes
 WatermarkOnDraftProposal=Watermerk op ontwerp offertes (geen indien leeg)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Vraag naar bankrekening bestemming van het voorstel
 ##### SupplierProposal #####
-SupplierProposalSetup=Prijsaanvragen leveranciers module instelling
-SupplierProposalNumberingModules=Prijsaanvragen leveranciers nummering modellen
-SupplierProposalPDFModules=Prijsaanvragen leveranciers documenten modellen
-FreeLegalTextOnSupplierProposal=Vrije tekst op leveranciers prijsaanvragen
-WatermarkOnDraftSupplierProposal=Watermerk op ontwerp leveranciers prijsaanvraag ​​(geen als leeg)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Vraag naar bankrekening bestemming van prijsaanvraag
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Vraag te gebruiken magazijn bij order
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=Opdrachtenbeheerinstellingen
 OrdersNumberingModules=Opdrachtennummeringmodules
@@ -1419,7 +1429,7 @@ CompressionOfResources=Compression of HTTP responses
 CompressionOfResourcesDesc=For exemple using the Apache directive "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=Automatische detectie niet mogelijk
 DefaultValuesDesc=You can define/force here the default value you want to get when your create a new record, and/or defaut filters or sort order when your list record.
-DefaultCreateForm=Default values (on forms to create)
+DefaultCreateForm=Standaardwaarden (voor nieuwe formulieren)
 DefaultSearchFilters=Standaard zoekfilters
 DefaultSortOrder=Standaard order-sortering
 DefaultFocus=Standaard velden voor focus
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=Verbinding met de server '%s' en database '%s' met gebruiker '%
 OSCommerceTestKo1=Verbinding met de server '%s' gelukt maar de database '%s' kon niet worden bereikt.
 OSCommerceTestKo2=Verbinding met server '%s' met gebruiker '%s' mislukt.
 ##### Stock #####
-StockSetup=Magazijnen instellingen
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=Als u de verkooppunt module (de standaard POS module of een andere externe module) gebruikt, kan deze setup worden genegeerd door uw verkooppunt  module. De meeste verkooppunt modules zijn ontworpen om onmiddellijk een factuur te creëren en het standaard verlagen van voorraad. Dus, als je ja of nee een voorraad daling nodig hebt om bij het registreren van een verkoop op uw verkooppunt, controleer ook uw POS-module instellingen.
 ##### Menu #####
 MenuDeleted=Menu verwijderd
@@ -1547,7 +1557,7 @@ FailedToInitializeMenu=Initialisatie van menu is mislukt
 ##### Tax #####
 TaxSetup=Moduleinstellingen voor belastingen, sociale bijdragen en dividenden
 OptionVatMode=BTW verplicht
-OptionVATDefault=Standard basis
+OptionVATDefault=Standaard basis
 OptionVATDebitOption=Transactiebasis
 OptionVatDefaultDesc=BTW is verplicht:<br>- op levering / betalingen van goederen (wij gebruiken de factuurdatum)<br>- op betalingen van diensten
 OptionVatDebitOptionDesc=BTW is verplicht:<br>- op levering / betalingen van goederen<br>- op factuur (debet) voor diensten
@@ -1563,7 +1573,7 @@ Buy=Kopen
 Sell=Verkopen
 InvoiceDateUsed=Factuurdatum gebruiken
 YourCompanyDoesNotUseVAT=Uw bedrijf is ingesteld als zijnde vrijgesteld van BTW (Home->Instellingen->Bedrijf /Stichting), er zijn dus geen BTW opties in te stellen.
-AccountancyCode=Accounting Code
+AccountancyCode=Grootboekrekening
 AccountancyCodeSell=Boekhoudkundige afnemerscode
 AccountancyCodeBuy=Boekhoudkundige leverancierscode
 ##### Agenda #####
@@ -1605,7 +1615,7 @@ NbOfBoomarkToShow=Maximaal aantal 'weblinks' die in het linker menu getoond word
 WebServicesSetup=Webdienstenmoduleinstellingen
 WebServicesDesc=Door het inschakelen van deze module, word Dolibarr een webdienstenserver voor het verrichten van diverse webdiensten.
 WSDLCanBeDownloadedHere='WSDL descriptor'-bestanden van de aangeboden diensten kunnen hier gedownload worden
-EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
+EndPointIs=SOAP-clients moeten hun verzoeken verzenden naar het Dolibarr-eindpunt dat beschikbaar is op URL
 ##### API ####
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
 MultiCompanySetup=Multi-Bedrijfmoduleinstellingen
 ##### Suppliers #####
 SuppliersSetup=Leveranciersmoduleinstellingen
-SuppliersCommandModel=Compleet levaranciersopdrachtsjabloon (logo)
-SuppliersInvoiceModel=Compleet leveranciersfacturensjabloon (logo)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Leveranciersfacturen nummering modellen
 IfSetToYesDontForgetPermission=Indien ingesteld op ja, vergeet dan niet om machtigingen te verlenen aan groepen of gebruikers ​​voor het toestaan van de tweede goedkeuring
 ##### GeoIPMaxmind #####
@@ -1647,14 +1657,14 @@ TaskModelModule=Taken rapporten documentmodel
 UseSearchToSelectProject=Wait you press a key before loading content of project combo list (This may increase performance if you have a large number of project, but it is less convenient)
 ##### ECM (GED) #####
 ##### Fiscal Year #####
-AccountingPeriods=Accounting periods
-AccountingPeriodCard=Accounting period
+AccountingPeriods=Boekingsperioden
+AccountingPeriodCard=Boekingsperiode
 NewFiscalYear=Nieuw boekjaar
 OpenFiscalYear=Open boekjaar
 CloseFiscalYear=Afsluiten boekjaar
 DeleteFiscalYear=Verwijder boekjaar
 ConfirmDeleteFiscalYear=Weet u zeker dat u dit boekjaar wilt verwijderen?
-ShowFiscalYear=Show accounting period
+ShowFiscalYear=Boekingsperiode weergeven
 AlwaysEditable=Kan altijd worden bewerkt
 MAIN_APPLICATION_TITLE=Forceer zichtbare naam van de toepassing (waarschuwing: het instellen van uw eigen naam hier kan het automatisch aanvullen van de inlog functie breken wanneer gebruik wordt van de mobiele applicatie DoliDroid)
 NbMajMin=Minimum aantal hoofdletters
@@ -1665,12 +1675,12 @@ NoAmbiCaracAutoGeneration=Voor het automatisch genereren, gebruik geen dubbelzin
 SalariesSetup=Setup salaris module
 SortOrder=Sorteervolgorde
 Format=Formaat
-TypePaymentDesc=0: Klant betalingswijze, 1: Leverancier betalingswijze 2: Zowel klanten en leveranciers betaalwijze
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Include path (gedefinieerd in de variabele %s)
 ExpenseReportsSetup=Setup van module onkostennota's
 TemplatePDFExpenseReports=Document sjablonen om onkostennota's document te genereren
 ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
-ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
+ExpenseReportsRulesSetup=Opzetten van module onkostendeclaraties - regels
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=Geen module in staat om automatische voorraad toename beheren is geactiveerd. Stock verhoging zal worden gedaan via handmatige invoer.
 YouMayFindNotificationsFeaturesIntoModuleNotification=U kunt opties voor e-mailberichten door het inschakelen en configureren van de module "Meldingen " te vinden.
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Installeren van externe module van toe
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
-TextTitleColor=Kleur pagina-titel
+TextTitleColor=Text color of Page title
 LinkColor=Link-kleur
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=Background color for Top menu
 TopMenuDisableImages=Verberg afbeeldingen in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1714,31 +1725,31 @@ TemplateIsVisibleByOwnerOnly=Template alleen zichtbaar voor eigenaar
 VisibleEverywhere=Overal zichtbaar
 VisibleNowhere=Visible nowhere
 FixTZ=TimeZone fix
-FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
-ExpectedChecksum=Expected Checksum
-CurrentChecksum=Current Checksum
+FillFixTZOnlyIfRequired=Voorbeeld: +2 (alleen invullen bij problemen)
+ExpectedChecksum=Verwachte checksum
+CurrentChecksum=Huidige controlesom
 ForcedConstants=Required constant values
-MailToSendProposal=Te versturen offerte aan klant.
-MailToSendOrder=Te versturen order aan  klant
-MailToSendInvoice=Te versturen factuur aan klant
-MailToSendShipment=Te versturen verzending
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=Contract versturen
-MailToThirdparty=To send email from third party page
-MailToMember=Om e-mail van lid pagina te verzenden
-MailToUser=To send email from user page
-MailToProject= To send email from project page
-ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the latest stable version
+MailToSendProposal=Klantenoffertes
+MailToSendOrder=Klantenbestelling
+MailToSendInvoice=Klantenfactuur
+MailToSendShipment=Verzendingen
+MailToSendIntervention=Interventies
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Contracten
+MailToThirdparty=Klant
+MailToMember=Leden
+MailToUser=Gebruikers
+MailToProject=Projects page
+ByDefaultInList=Standaard weergeven in de lijstweergave
+YouUseLastStableVersion=U gebruikt de nieuwste stabiele versie
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
-ModelModulesProduct=Templates for product documents
+ModelModulesProduct=Sjablonen voor productdocumenten
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
 SeeChangeLog=Zie ChangeLog bestand (alleen in het Engels)
@@ -1767,7 +1778,7 @@ CommandIsNotInsideAllowedCommands=The command you try to run is not inside list
 LandingPage=Startpagina
 SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
 ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users or groups manually if necessary.
-UserHasNoPermissions=This user has no permission defined
+UserHasNoPermissions=Deze gebruiker heeft geen toestemming gedefinieerd
 TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
 BaseCurrency=Reference currency of the company (go into setup of company to change this)
 WarningNoteModuleInvoiceForFrenchLaw=This module %s is compliant with french laws (Loi Finance 2016).
@@ -1780,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Verwijder speciale tekens
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=AVG contactpersoon
+GDPRContactDesc=Als u gegevens over Europese bedrijven / burgers opslaat, kunt u hier de contactpersoon opslaan welke verantwoordelijk is voor de Algemene Verordening Gegevensbescherming
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/nl_NL/banks.lang b/htdocs/langs/nl_NL/banks.lang
index 18739b6139d..5d0dc4f19ee 100644
--- a/htdocs/langs/nl_NL/banks.lang
+++ b/htdocs/langs/nl_NL/banks.lang
@@ -1,12 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Bank
 MenuBankCash=Bank / Kas
-MenuVariousPayment=Miscellaneous payments
-MenuNewVariousPayment=New Miscellaneous payment
+MenuVariousPayment=Diverse betalingen
+MenuNewVariousPayment=Nieuwe diverse betaling
 BankName=Banknaam
 FinancialAccount=Rekening
 BankAccount=Bankrekening
 BankAccounts=Bankrekeningen
+BankAccountsAndGateways=Bank accounts | Gateways
 ShowAccount=Toon rekening
 AccountRef=Financiële rekening referentie
 AccountLabel=Financiële rekening label
@@ -30,10 +31,10 @@ Reconciliation=Overeenstemming
 RIB=Bankrekeningnummer
 IBAN=IBAN-nummer
 BIC=BIC- / SWIFT-nummer
-SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
-IbanValid=BAN valid
-IbanNotValid=BAN not valid
+SwiftValid=BIC / SWIFT geldig
+SwiftVNotalid=BIC / SWIFT is niet geldig
+IbanValid=IBAN geldig
+IbanNotValid=IBAN is niet geldig
 StandingOrders=Incasso-opdrachten
 StandingOrder=Incasso-opdracht
 AccountStatement=Rekeningafschrift
@@ -62,7 +63,7 @@ DeleteAccount=Rekening verwijderen
 ConfirmDeleteAccount=Weet u deze dat u dit account wilt verwijderen?
 Account=Rekening
 BankTransactionByCategories=Bankregels op categorie
-BankTransactionForCategory=Bank entries for category <b>%s</b>
+BankTransactionForCategory=Bankboekingen voor categorie <b>%s</b>
 RemoveFromRubrique=Verwijder link met categorie
 RemoveFromRubriqueConfirm=Weet u zeker dat u de link tussen het item en de categorie wilt wissen?
 ListBankTransactions=Lijst bankmutaties
@@ -89,12 +90,12 @@ AccountIdShort=Aantal
 LineRecord=Transactie
 AddBankRecord=Item toevoegen
 AddBankRecordLong=Item handmatig toevoegen
-Conciliated=Reconciled
+Conciliated=Afgestemd
 ConciliatedBy=Afgestemd door
 DateConciliating=Afgestemd op
 BankLineConciliated=Item afgestemd
-Reconciled=Reconciled
-NotReconciled=Not reconciled
+Reconciled=Afgestemd
+NotReconciled=Niet afgestemd
 CustomerInvoicePayment=Afnemersbetaling
 SupplierInvoicePayment=Leveranciersbetaling
 SubscriptionPayment=Betaling van abonnement
@@ -108,26 +109,26 @@ TransferFrom=Van
 TransferTo=Aan
 TransferFromToDone=Een overboeking van <b>%s</b> naar <b>%s</b> van <b>%s</b> is geregistreerd.
 CheckTransmitter=Overboeker
-ValidateCheckReceipt=Validate this check receipt?
-ConfirmValidateCheckReceipt=Are you sure you want to validate this check receipt, no change will be possible once this is done?
-DeleteCheckReceipt=Delete this check receipt?
-ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
+ValidateCheckReceipt=Betaling met cheque goedkeuren?
+ConfirmValidateCheckReceipt=Weet u zeker dat u deze cheque wilt valideren? Hierna is het niet meer mogelijk dit te wijzigen.
+DeleteCheckReceipt=Dit chequebewijs verwijderen?
+ConfirmDeleteCheckReceipt=Weet u zeker dat u deze betaling via cheque wilt verwijderen?
 BankChecks=Bankcheque
-BankChecksToReceipt=Checks awaiting deposit
+BankChecksToReceipt=Cheques in afwachting van storting
 ShowCheckReceipt=Toon controleren stortingsbewijs
 NumberOfCheques=Aantal cheques
-DeleteTransaction=Delete entry
-ConfirmDeleteTransaction=Are you sure you want to delete this entry?
-ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
-BankMovements=Mutaties
-PlannedTransactions=Planned entries
+DeleteTransaction=Ingave verwijderen
+ConfirmDeleteTransaction=Weet u zeker dat u deze boeking wilt verwijderen?
+ThisWillAlsoDeleteBankRecord=Hiermee wordt ook de boeking in de bank verwijderd
+BankMovements=Verplaatsingen
+PlannedTransactions=Nog te verwerken
 Graph=Grafiek
-ExportDataset_banque_1=Bank entries and account statement
+ExportDataset_banque_1=Bankboekingen en rekeningafschriften
 ExportDataset_banque_2=Stortingsbewijs
 TransactionOnTheOtherAccount=Overboeking op de andere rekening
-PaymentNumberUpdateSucceeded=Payment number updated successfully
+PaymentNumberUpdateSucceeded=Betalingsnummer succesvol bijgewerkt
 PaymentNumberUpdateFailed=Betalingsnummer kon niet worden bijgewerkt
-PaymentDateUpdateSucceeded=Payment date updated successfully
+PaymentDateUpdateSucceeded=Betaaldatum succesvol bijgewerkt
 PaymentDateUpdateFailed=Betaaldatum kon niet worden bijgewerkt
 Transactions=Transacties
 BankTransactionLine=Bankmutatie
@@ -154,10 +155,10 @@ CheckRejectedAndInvoicesReopened=Cheque teruggekeerd en facturen heropend
 BankAccountModelModule=Document templates for bank accounts
 DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
-NewVariousPayment=New miscellaneous payments
-VariousPayment=Miscellaneous payments
-VariousPayments=Miscellaneous payments
-ShowVariousPayment=Show miscellaneous payments
-AddVariousPayment=Add miscellaneous payments
+NewVariousPayment=Nieuwe diverse betalingen
+VariousPayment=Diverse betalingen
+VariousPayments=Diverse betalingen
+ShowVariousPayment=Toon diverse betalingen
+AddVariousPayment=Voeg verschillende betalingen toe
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to
diff --git a/htdocs/langs/nl_NL/bills.lang b/htdocs/langs/nl_NL/bills.lang
index 9cd205da8e5..9689eb013a8 100644
--- a/htdocs/langs/nl_NL/bills.lang
+++ b/htdocs/langs/nl_NL/bills.lang
@@ -11,8 +11,8 @@ BillsSuppliersUnpaidForCompany=Onbetaalde leveranciers facturen voor %s
 BillsLate=Betalingsachterstand
 BillsStatistics=Statistieken afnemersfacturen
 BillsStatisticsSuppliers=Statistieken leveranciersfacturen
-DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping
-DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter.
+DisabledBecauseDispatchedInBookkeeping=Uitgeschakeld omdat de factuur werd verzonden naar de boekhouding
+DisabledBecauseNotLastInvoice=Uitgeschakeld omdat factuur niet kan worden gewist. Er zijn vervolg-facturen aangemaakt en hierdoor zullen gaten ontstaan in de factuurteller.
 DisabledBecauseNotErasable=Uitgeschakeld om dat het niet verwijderd kan worden
 InvoiceStandard=Standaardfactuur
 InvoiceStandardAsk=Standaardfactuur
@@ -109,7 +109,7 @@ CancelBill=Verwijder factuur
 SendRemindByMail=E-mail een herinnering
 DoPayment=Geef betaling in
 DoPaymentBack=Geef terugstorting in
-ConvertToReduc=Omzetten in een toekomstige korting
+ConvertToReduc=Markeren als tegoed beschikbaar
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Voer een ontvangen betaling van afnemer in
@@ -120,8 +120,8 @@ BillStatus=Factuurstatus
 StatusOfGeneratedInvoices=Status van gegenereerde facturen
 BillStatusDraft=Concept (moet worden gevalideerd)
 BillStatusPaid=Betaald
-BillStatusPaidBackOrConverted=Teruggestort of omgezet in korting
-BillStatusConverted=Paid (ready for consumption in final invoice)
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
+BillStatusConverted=Betaald (klaar voor verwerking in eindfactuur)
 BillStatusCanceled=Verlaten
 BillStatusValidated=Gevalideerd (moet worden betaald)
 BillStatusStarted=Gestart
@@ -154,19 +154,19 @@ ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or ano
 BillFrom=Van
 BillTo=Geadresseerd aan
 ActionsOnBill=Acties op factuur
-RecurringInvoiceTemplate=Template / Factuurherhaling
+RecurringInvoiceTemplate=Template / Herhaal factuur
 NoQualifiedRecurringInvoiceTemplateFound=Geen geschikte sjablonen gevonden voor terugkerende facturen
-FoundXQualifiedRecurringInvoiceTemplate=%s geschikte sjablonen gevonden voor terugkerende factu(u)r(en)
+FoundXQualifiedRecurringInvoiceTemplate=Gevonden: %s geschikte templates voor herhaal facturen
 NotARecurringInvoiceTemplate=Is geen template voor een herhalingsfactuur
 NewBill=Nieuwe factuur
 LastBills=Laatste %s facturen
-LatestTemplateInvoices=Latest %s template invoices
-LatestCustomerTemplateInvoices=Latest %s customer template invoices
-LatestSupplierTemplateInvoices=Latest %s supplier template invoices
+LatestTemplateInvoices=Laatste %s sjabloon facturen
+LatestCustomerTemplateInvoices=Laatste %s klant sjabloon facturen
+LatestSupplierTemplateInvoices=Laatste %s leverancier sjabloon facturen
 LastCustomersBills=Laatste %s klant facturen
 LastSuppliersBills=Laatste %s leveranciersfacturen
 AllBills=Alle facturen
-AllCustomerTemplateInvoices=All template invoices
+AllCustomerTemplateInvoices=Alle sjabloon facturen
 OtherBills=Andere facturen
 DraftBills=conceptfacturen
 CustomersDraftInvoices=Klant conceptfacturen
@@ -222,7 +222,7 @@ RemainderToPayBack=Resterende bedrag terug te storten
 Rest=Hangende
 AmountExpected=Gevorderde bedrag
 ExcessReceived=Overbetaling
-ExcessPaid=Excess paid
+ExcessPaid=Teveel betaald
 EscompteOffered=Korting aangeboden (betaling vóór termijn)
 EscompteOfferedShort=Korting
 SendBillRef=Stuur factuur %s
@@ -238,7 +238,7 @@ RemainderToBill=Rest naar factuur
 SendBillByMail=Stuur de factuur per e-mail
 SendReminderBillByMail=Stuur herinnering per e-mail
 RelatedCommercialProposals=Gerelateerde offertes
-RelatedRecurringCustomerInvoices=Related recurring customer invoices
+RelatedRecurringCustomerInvoices=Verwante herhalende klantfacturen
 MenuToValid=Valideer
 DateMaxPayment=Betaling vóór
 DateInvoice=Factuurdatum
@@ -286,8 +286,8 @@ Deposit=Deposito / Borgsom
 Deposits=Deposito's
 DiscountFromCreditNote=Korting van creditnota %s
 DiscountFromDeposit=Betalingen van depositofactuur %s
-DiscountFromExcessReceived=Payments in excess of invoice %s
-DiscountFromExcessPaid=Payments in excess of invoice %s
+DiscountFromExcessReceived=Betalingen boven factuur %s
+DiscountFromExcessPaid=Betalingen boven factuur %s
 AbsoluteDiscountUse=Dit soort krediet kan gebruikt worden op de factuur voorafgaande aan de validatie
 CreditNoteDepositUse=Om dit soort crediet te gebruiken moet deze factuur gevalideerd worden.
 NewGlobalDiscount=Nieuwe korting
@@ -296,10 +296,10 @@ DiscountType=Soort korting
 NoteReason=Notitie / Reden
 ReasonDiscount=Reden
 DiscountOfferedBy=Verleend door
-DiscountStillRemaining=Beschikbare kortingen
-DiscountAlreadyCounted=Reeds gebruikte kortingen
+DiscountStillRemaining=Beschikbare kortingen of tegoeden
+DiscountAlreadyCounted=Kortingen of tegoeden reeds verbruikt
 CustomerDiscounts=Klantkorting
-SupplierDiscounts=Leverancierskorting
+SupplierDiscounts=Leverancierskortingen
 BillAddress=Factuuradres
 HelpEscompte=Deze korting wordt toegekend aan de afnemer omdat de betaling werd gemaakt ruim voor de termijn.
 HelpAbandonBadCustomer=Dit bedrag is verlaten (afnemer beschouwt als slechte betaler) en wordt beschouwd als een buitengewoon verlies.
@@ -339,26 +339,32 @@ PaymentOnDifferentThirdBills=Betalingen toestaan van verschillende derden met he
 PaymentNote=Betalingsopmerking
 ListOfPreviousSituationInvoices=Lijst van vorige situatie facturen
 ListOfNextSituationInvoices=Lijst van volgende situatie facturen
+ListOfSituationInvoices=Lijst met situaties facturen
+CurrentSituationTotal=Totale huidige situatie
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Verwijder deze factuur uit de cyclus
+ConfirmRemoveSituationFromCycle=Verwijder factuur %s uit cyclus?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Elke %s dagen
 FrequencyPer_m=Elke %s maanden
 FrequencyPer_y=Elke %s jaar
-FrequencyUnit=Frequency unit
+FrequencyUnit=Frequentie eenheid
 toolTipFrequency=Voorbeeld: <br><b>Set 7, Dag</b>:Maak om de 7 dagen een nieuwe factuur <br><b>Set3, Dag</b>: Maak elke 3 maanden een nieuwe factuur
 NextDateToExecution=Datum voor aanmaak nieuwe factuur
-NextDateToExecutionShort=Date next gen.
+NextDateToExecutionShort=Datum volg. aanmaak
 DateLastGeneration=Aanmaakdatum laatste factuur
-DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max number of invoice generation
-NbOfGenerationDone=Number of invoice generation already done
-NbOfGenerationDoneShort=Number of generation done
-MaxGenerationReached=Maximum number of generations reached
+DateLastGenerationShort=Datum laatste aanmaak
+MaxPeriodNumber=Max aantal te genereren facturen
+NbOfGenerationDone=Aantal reeds aangemaakte facturen
+NbOfGenerationDoneShort=Aantal malen gegenereerd
+MaxGenerationReached=Maximum aantal aanmaken bereikt
 InvoiceAutoValidate=Valideer facturen automatisch
-GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
+GeneratedFromRecurringInvoice=Gegenereerd op basis van template herhaal-factuur %s
 DateIsNotEnough=Datum nog niet bereikt
-InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
-WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
-WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
-ViewAvailableGlobalDiscounts=View available discounts
+InvoiceGeneratedFromTemplate=Factuur %s aangemaakt met herhaal-factuur template %s
+WarningInvoiceDateInFuture=Waarschuwing, de factuurdatum ligt hoger dan de huidige datum
+WarningInvoiceDateTooFarInFuture=Waarschuwing, de factuurdatum ligt te ver van de huidige datum
+ViewAvailableGlobalDiscounts=Bekijk beschikbare kortingen
 # PaymentConditions
 Statut=Status
 PaymentConditionShortRECEP=Vervalt bij ontvangst
@@ -380,11 +386,11 @@ PaymentConditionPT_5050=50%% voorschot, 50%% bij levering
 PaymentConditionShort10D=10 dagen
 PaymentCondition10D=10 dagen
 PaymentConditionShort10DENDMONTH=Einde maand over 10 dagen
-PaymentCondition10DENDMONTH=Within 10 days following the end of the month
+PaymentCondition10DENDMONTH=Binnen 10 dagen na het einde maand
 PaymentConditionShort14D=14 dagen
 PaymentCondition14D=14 dagen
 PaymentConditionShort14DENDMONTH=Einde maand over 14 dagen
-PaymentCondition14DENDMONTH=Within 14 days following the end of the month
+PaymentCondition14DENDMONTH=Binnen 14 dagen na het einde van de maand
 FixAmount=Vast bedrag
 VarAmount=Variabel bedrag  (%% tot.)
 # PaymentType
@@ -398,7 +404,7 @@ PaymentTypeCB=CreditCard
 PaymentTypeShortCB=CreditCard
 PaymentTypeCHQ=Cheque
 PaymentTypeShortCHQ=Cheque
-PaymentTypeTIP=TIP (Documents against Payment)
+PaymentTypeTIP=TIP (Documenten tegen betaling)
 PaymentTypeShortTIP=Betaling fooi
 PaymentTypeVAD=Internetbetaling
 PaymentTypeShortVAD=Internetbetaling
@@ -505,9 +511,14 @@ SituationAmount=Situatie factuurbedrag (netto)
 SituationDeduction=Situatie vermindering
 ModifyAllLines=Wijzigen van alle lijnen
 CreateNextSituationInvoice=Maak de volgende situatie
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=Deze factuur in niet de nieuwste in de cyclus en kan niet worden gewijzigd
 DisabledBecauseNotLastInCycle=De volgende situatie bestaat al.
 DisabledBecauseFinal=Deze situatie is definitief.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=Zo
 CantBeLessThanMinPercent=De voortgang kan niet kleiner zijn dan de waarde in de voorgaande situatie.
 NoSituations=Geen open situaties
 InvoiceSituationLast=Finale en algemene factuur
@@ -518,17 +529,18 @@ PDFCrevetteSituationInvoiceLine=Situatie N°%s : Fact. N°%s op %s
 TotalSituationInvoice=Totaal situatie
 invoiceLineProgressError=Factuurregel voortgang mag niet groter zijn dan of gelijk zijn aan de volgende facturregel
 updatePriceNextInvoiceErrorUpdateline=Fout: verander de prijs op regel %s
-ToCreateARecurringInvoice=Als u een terugkerende factuur voor dit contract wilt maken, maakt u eerst deze conceptfactuur, converteert u deze naar een factuurtemplate en definieert u de frequentie voor het genereren van toekomstige facturen.
+ToCreateARecurringInvoice=Als u een herhaal factuur voor dit contract wilt maken, maakt u deze eerst aan in concept en converteert u deze naar een template. Tevens definieert u de frequentie voor het genereren van toekomstige facturen.
 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 you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
 DeleteRepeatableInvoice=Verwijder tijdelijke factuur
 ConfirmDeleteRepeatableInvoice=Weet u zeker dat u dit sjabloon factuur wilt verwijderen?
-CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per order)
+CreateOneBillByThird=Orders samentrekken tot één factuur aan per relatie (anders voor elke bestelling één factuur)
 BillCreated=%s rekening(en) gecreëerd
-StatusOfGeneratedDocuments=Status of document generation
-DoNotGenerateDoc=Do not generate document file
-AutogenerateDoc=Auto generate document file
+StatusOfGeneratedDocuments=Status aanmaken document
+DoNotGenerateDoc=Maak documentbestand niet aan
+AutogenerateDoc=Automatisch aanmaken documentbestand
 AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Vanaf datum
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Tot datum
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/nl_NL/categories.lang b/htdocs/langs/nl_NL/categories.lang
index 392199e53ca..04a3db72e5e 100644
--- a/htdocs/langs/nl_NL/categories.lang
+++ b/htdocs/langs/nl_NL/categories.lang
@@ -1,65 +1,65 @@
 # Dolibarr language file - Source file is en_US - categories
-Rubrique=Tag / Categorie
-Rubriques=Tags / Categorieën
-RubriquesTransactions=Tags/Categories of transactions
-categories=tags / categorieën
-NoCategoryYet=Geen tag / categorie van dit type gemaakt
+Rubrique=Label/Categorie
+Rubriques=Kenmerken / Categorieën
+RubriquesTransactions=Labels/categorieën transacties
+categories=kenmerken / categorieën
+NoCategoryYet=Geen label/categorie van dit type gemaakt
 In=In
 AddIn=Invoegen in categorie
 modify=wijzigen
 Classify=Classificeren
-CategoriesArea=Tags / Categorieën omgeving
-ProductsCategoriesArea=Producten/Diensten  tags/categorieën omgeving
-SuppliersCategoriesArea=Leveranciers tags/categorieën omgeving
-CustomersCategoriesArea=Klanten tags / categorieën omgeving
-MembersCategoriesArea=Leden tags / categorieën omgeving
-ContactsCategoriesArea=Contacten tags / categorieën omgeving
-AccountsCategoriesArea=Accounts tags/categories area
-ProjectsCategoriesArea=Projects tags/categories area
-SubCats=Subcategorieën
-CatList=Lijst van tags / categorieën
-NewCategory=Nieuw tag / categorie
-ModifCat=Wijzigen tag / categorie
-CatCreated=Tag / categorie gecreëerd
-CreateCat=Maak tag / categorie
-CreateThisCat=Maak deze tag / categorie
+CategoriesArea=Kenmerk / Categorieën omgeving
+ProductsCategoriesArea=Producten/Diensten kenmerk/categorieën omgeving
+SuppliersCategoriesArea=Leveranciers kenmerken/categorieën omgeving
+CustomersCategoriesArea=Klanten kenmerken/categorieën omgeving
+MembersCategoriesArea=Leden kenmerken/categorieën omgeving
+ContactsCategoriesArea=Contacten labels/categorieën omgeving
+AccountsCategoriesArea=Labels/categorieën rekeningen
+ProjectsCategoriesArea=Labels/categorieën projecten
+SubCats=Sub-categorieën
+CatList=Lijst van kenmerken/categorieën
+NewCategory=Nieuw label/categorie
+ModifCat=Wijzigen label/categorie
+CatCreated=Label/categorie gecreëerd
+CreateCat=Maak label/categorie
+CreateThisCat=Maak deze label/categorie
 NoSubCat=Geen subcategorie.
 SubCatOf=Subcategorie
-FoundCats=Gevonden tags / categorieën
-ImpossibleAddCat=Impossible to add the tag/category %s
+FoundCats=Gevonden kenmerken/categorieën
+ImpossibleAddCat=Onmogelijk om label/categorie %s toe te voegen
 WasAddedSuccessfully=<b>%s</b> is succesvol toegevoegd.
-ObjectAlreadyLinkedToCategory=Element is al verbonden met deze tag / categorie.
-ProductIsInCategories=Product/service is linked to following tags/categories
-CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
-MemberIsInCategories=This member is linked to following members tags/categories
-ContactIsInCategories=This contact is linked to following contacts tags/categories
-ProductHasNoCategory=Dit product / dienst staat niet in tags / categorieën
-CompanyHasNoCategory=This third party is not in any tags/categories
-MemberHasNoCategory=Dit lid staat in geen tags / categorieën
-ContactHasNoCategory=Dit contact staat in geen tags / categorieën
-ProjectHasNoCategory=This project is not in any tags/categories
-ClassifyInCategory=Add to tag/category
-NotCategorized=Zonder tag / categorie
+ObjectAlreadyLinkedToCategory=Element is al verbonden met deze label/categorie.
+ProductIsInCategories=Product/dienst is gekoppeld aan de volgende kenmerken/categorieën
+CompanyIsInCustomersCategories=Deze relatie behoort tot volgende klanten/prospects kenmerk/categorieën
+CompanyIsInSuppliersCategories=Deze relatie is gekoppeld aan de volgende leverancier kenmerken/categorieën 
+MemberIsInCategories=Dit lid is gekoppeld aan de volgende leden kenmerken/categorieën
+ContactIsInCategories=Deze contactpersoon is gekoppeld aan de volgende labels/categorieën voor contactpersonen
+ProductHasNoCategory=Product/dienst staat niet in kenmerken/categorieën
+CompanyHasNoCategory=Deze relatie heeft geen kenmerken/categorieën
+MemberHasNoCategory=Dit lid komt niet voor in kenmerken/categorieën
+ContactHasNoCategory=Dit contact staat in geen label/categorieën
+ProjectHasNoCategory=Dit project komt niet voor bij labels/categorieën
+ClassifyInCategory=Toevoegen aan label/categorie
+NotCategorized=Zonder label/categorie
 CategoryExistsAtSameLevel=Deze categorie bestaat al op hetzelfde niveau
 ContentsVisibleByAllShort=Inhoud zichtbaar voor iedereen
 ContentsNotVisibleByAllShort=Inhoud is niet zichtbaar voor iedereen
-DeleteCategory=Delete tag / categorie
-ConfirmDeleteCategory=Are you sure you want to delete this tag/category?
-NoCategoriesDefined=Geen tag / categorie gedefinieerd
-SuppliersCategoryShort=Suppliers tag/category
-CustomersCategoryShort=Customers tag/category
-ProductsCategoryShort=Products tag/category
-MembersCategoryShort=Members tag/category
-SuppliersCategoriesShort=Leveranciers tags / categorieën
-CustomersCategoriesShort=Klanten tags / categorieën
-ProspectsCategoriesShort=Prospects tags/categories
+DeleteCategory=Delete label/categorie
+ConfirmDeleteCategory=Weet u zeker dat u dit label / deze categorie wilt verwijderen?
+NoCategoriesDefined=Geen label/categorie gedefinieerd
+SuppliersCategoryShort=Kenmerk/categorie leveranciers
+CustomersCategoryShort=Klanten kenmerk/categorie
+ProductsCategoryShort=Label/categorie van producten
+MembersCategoryShort=Leden label/categorie
+SuppliersCategoriesShort=Leveranciers kenmerk/cat.
+CustomersCategoriesShort=Klanten kenmerk/categorieën
+ProspectsCategoriesShort=Prospects labels/categorieën
 CustomersProspectsCategoriesShort=Afnemers- / Prospectencategorie
-ProductsCategoriesShort=Producten tags / categorieën
-MembersCategoriesShort=Leden tags / categorieën
-ContactCategoriesShort=Contacten tags / categorieën
-AccountsCategoriesShort=Accounts tags/categories
-ProjectsCategoriesShort=Projects tags/categories
+ProductsCategoriesShort=Producten kenmerk/categorieën
+MembersCategoriesShort=Leden kenmerk/categorieën
+ContactCategoriesShort=Contacten labels/categorieën
+AccountsCategoriesShort=Labels/categorieën rekeningen
+ProjectsCategoriesShort=Labels/categorieën projecten
 ThisCategoryHasNoProduct=Deze categorie bevat geen producten.
 ThisCategoryHasNoSupplier=Deze categorie bevat geen enkele leverancier.
 ThisCategoryHasNoCustomer=Deze categorie bevat geen enkele afnemer.
@@ -67,21 +67,22 @@ ThisCategoryHasNoMember=Deze categorie bevat geen enkel lid.
 ThisCategoryHasNoContact=Deze categorie bevat geen enkel contact.
 ThisCategoryHasNoAccount=This category does not contain any account.
 ThisCategoryHasNoProject=This category does not contain any project.
-CategId=Tag / categorie id
-CatSupList=Lijst van leverancier tags / categorieën
-CatCusList=Lijst van de klant/prospect tags/categorieën
-CatProdList=Lijst van producten tags / categorieën
-CatMemberList=Lijst leden tags / categorieën
-CatContactList=List of contact tags/categories
-CatSupLinks=Koppelingen tussen leveranciers en tags / categorieën
-CatCusLinks=Koppelingen tussen klanten / prospects en tags / categorieën
-CatProdLinks=Koppelingen tussen producten / diensten en tags / categorieën
-CatProJectLinks=Links between projects and tags/categories
-DeleteFromCat=Verwijderen uit tags / categorie
+CategId=Label/categorie id
+CatSupList=Lijst van leverancier kenmerken/ categorieën
+CatCusList=Lijst van de klant/prospect kenmerken/categorieën
+CatProdList=Lijst van product kenmerken/categorieën
+CatMemberList=Lijst leden kenmerken/categorieën
+CatContactList=Lijst met contactpersoon labels/-categorieën
+CatSupLinks=Koppelingen tussen leveranciers en kenmerken/categorieën
+CatCusLinks=Koppelingen tussen klanten/prospects en labels/categorieën
+CatProdLinks=Koppelingen tussen producten/diensten en labels/categorieën
+CatProJectLinks=Koppelingen tussen projecten en labels/categorieën
+DeleteFromCat=Verwijderen uit labels/categorie
 ExtraFieldsCategories=Complementaire kenmerken
-CategoriesSetup=Tags / categorieën instelling
-CategorieRecursiv= Automatische koppeling met bovenliggende tag / categorie
+CategoriesSetup=Labels/categorieën instelling
+CategorieRecursiv= Automatische koppeling met bovenliggende label/categorie
 CategorieRecursivHelp=Indien geactiveerd zal het product ook gelinkt worden met de bovenliggende categorie wanneer een subcategorie toegevoegd wordt.
 AddProductServiceIntoCategory=Voeg het volgende product/dienst toe
-ShowCategory=Toon tag / categorie
-ByDefaultInList=By default in list
+ShowCategory=Toon label/categorie
+ByDefaultInList=Standaard in de lijst
+ChooseCategory=Choose category
diff --git a/htdocs/langs/nl_NL/commercial.lang b/htdocs/langs/nl_NL/commercial.lang
index d7a4058650a..572b3950eb7 100644
--- a/htdocs/langs/nl_NL/commercial.lang
+++ b/htdocs/langs/nl_NL/commercial.lang
@@ -10,10 +10,10 @@ NewAction=Nieuwe gebeurtenis
 AddAction=Maak gebeurtenis
 AddAnAction=Maak een gebeurtenis
 AddActionRendezVous=Creëer een afspraak
-ConfirmDeleteAction=Are you sure you want to delete this event?
+ConfirmDeleteAction=Weet je zeker dat je deze gebeurtenis wilt verwijderen?
 CardAction=Actiedetails
-ActionOnCompany=Related company
-ActionOnContact=Related contact
+ActionOnCompany=Gerelateerd bedrijf
+ActionOnContact=Gerelateerd contact
 TaskRDVWith=Vergadering met %s
 ShowTask=Toon taak
 ShowAction=Toon actie
@@ -29,8 +29,8 @@ ShowCustomer=Toon afnemer
 ShowProspect=Toon prospect
 ListOfProspects=Prospectenoverzicht
 ListOfCustomers=Afnemersoverzicht
-LastDoneTasks=Latest %s completed actions
-LastActionsToDo=Oldest %s not completed actions
+LastDoneTasks=laatste %s voltooide acties
+LastActionsToDo=Oudste %s niet voltooide acties
 DoneAndToDoActions=Agenda
 DoneActions=Voltooide acties
 ToDoActions=Onvolledige acties
@@ -60,20 +60,20 @@ ActionAC_CLO=Sluiten
 ActionAC_EMAILING=Stuur bulkmail
 ActionAC_COM=Verstuur order per mail
 ActionAC_SHIP=Stuur verzending per post
-ActionAC_SUP_ORD=Stuur leverancier bestellen via e-mail
-ActionAC_SUP_INV=Stuur factuur van de leverancier via e-mail
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=Ander
 ActionAC_OTH_AUTO=Automatisch ingevoegde gebeurtenissen
 ActionAC_MANUAL=Handmatig ingevoerde gebeurtenissen
 ActionAC_AUTO=Automatisch ingevoegde gebeurtenissen
-ActionAC_OTH_AUTOShort=Auto
+ActionAC_OTH_AUTOShort=Automatisch
 Stats=Verkoopstatistieken
 StatusProsp=Prospect-status
 DraftPropals=Ontwerp van commerciële voorstellen
 NoLimit=Geen limiet
-ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
-ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
-ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
-FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
+ToOfferALinkForOnlineSignature=Link online ondertekenen
+WelcomeOnOnlineSignaturePage=Welkom op deze pagina voor acceptatie prijsopgave/offerte van %s
+ThisScreenAllowsYouToSignDocFrom=Dit scherm geeft u de mogelijkheid voor acceptatie en ondertekening van de prijsopgave/offerte
+ThisIsInformationOnDocumentToSign=Informatie om te weigeren of te accepteren
+SignatureProposalRef=Handtekening prijsopgave/offerte %s
+FeatureOnlineSignDisabled=Online tekenen niet mogelijkheid of document is aangemaakt voordat dit was aangezet
diff --git a/htdocs/langs/nl_NL/companies.lang b/htdocs/langs/nl_NL/companies.lang
index a2c3e835c89..6a7705618f8 100644
--- a/htdocs/langs/nl_NL/companies.lang
+++ b/htdocs/langs/nl_NL/companies.lang
@@ -2,17 +2,17 @@
 ErrorCompanyNameAlreadyExists=De bedrijfsnaam %s bestaat al. kies een andere.
 ErrorSetACountryFirst=Stel eerst het land in
 SelectThirdParty=Selecteer een derde
-ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
+ConfirmDeleteCompany=Weet u zeker dat u dit bedrijf en alle overgenomen informatie wilt verwijderen?
 DeleteContact=Contactpersoon verwijderen
-ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
+ConfirmDeleteContact=Weet u zeker dat u deze contactpersoon en alle overgenomen informatie wilt verwijderen?
 MenuNewThirdParty=Nieuwe Klant
 MenuNewCustomer=Nieuwe afnemer
 MenuNewProspect=Nieuw prospect
 MenuNewSupplier=Nieuwe leverancier
 MenuNewPrivateIndividual=Nieuwe particulier
-NewCompany=Nieuwe bedrijf (prospect, afnemer, leverancier)
-NewThirdParty=Nieuwe Klant (prospect, afnemer, leverancier)
-CreateDolibarrThirdPartySupplier=Creëer een relatie (leverancier)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=Nieuwe relatie
 CreateThirdPartyAndContact=Creëer nieuwe klant + nieuw contact
 ProspectionArea=Prospectenoverzicht
@@ -37,14 +37,14 @@ ThirdPartyProspectsStats=Prospecten
 ThirdPartyCustomers=Afnemers
 ThirdPartyCustomersStats=Klanten
 ThirdPartyCustomersWithIdProf12=Afnemers met %s of %s
-ThirdPartySuppliers=Leveranciers
+ThirdPartySuppliers=Vendors
 ThirdPartyType=Type Klant
 Individual=Particulier
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Moedermaatschappij
 Subsidiaries=Dochterondernemingen
 ReportByMonth=Report by month
-ReportByCustomers=Report by customer
+ReportByCustomers=Overzicht op klant
 ReportByQuarter=Rapportage naar kwartaal
 CivilityCode=Aanspreekvorm
 RegisteredOffice=Statutaire zetel
@@ -69,24 +69,24 @@ Chat=Chat
 PhonePro=Telefoonnummer zakelijk
 PhonePerso=Telefoonnummer privé
 PhoneMobile=Telefoonnummer mobiel
-No_Email=Refuse mass e-mailings
+No_Email=Weigering van bulk e-mail
 Fax=Faxnummer
 Zip=Postcode
 Town=Plaats
 Web=Internetadres
 Poste= Functie
 DefaultLang=Standaard taal
-VATIsUsed=Sales tax is used
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
-VATIsNotUsed=Sales tax is not used
-CopyAddressFromSoc=Fill address with third party address
-ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
-PaymentBankAccount=Payment bank account
+VATIsUsed=BTW wordt gebruikt
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=BTW wordt niet gebruikt
+CopyAddressFromSoc=Vul het adres in van een relatie
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
+PaymentBankAccount=Bank voor te ontvangen betaling
 OverAllProposals=Zakelijke voorstellen / Offertes
 OverAllOrders=Orders
 OverAllInvoices=Facturen
-OverAllSupplierProposals=Price requests
+OverAllSupplierProposals=Prijs aanvragen
 ##### Local Taxes #####
 LocalTax1IsUsed=Gebruik tweede belasting
 LocalTax1IsUsedES= RE wordt gebruikt
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=RE Type
 TypeLocaltax2ES=IRPF Type
 WrongCustomerCode=Ongeldige afnemerscode
-WrongSupplierCode=Ongeldige leverancierscode
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Afnemersmodel
-SupplierCodeModel=Leverancierscodemodel
+SupplierCodeModel=Vendor code model
 Gencod=Streepjescode
 ##### Professional ID #####
 ProfId1Short=Prof id 1
@@ -210,7 +210,7 @@ ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (I.F.)
 ProfId4MA=Id prof. 4 (C.N.S.S.)
-ProfId5MA=Id. prof. 5 (I.C.E.)
+ProfId5MA=ID. prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (RFC).
 ProfId2MX=Prof Id 2 (R.. P. IMSS)
@@ -258,8 +258,8 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=Sales tax ID
-VATIntraShort=Tax ID
+VATIntra=BTW-nummer
+VATIntraShort=BTW nr.
 VATIntraSyntaxIsValid=Syntax is geldig
 VATReturn=VAT return
 ProspectCustomer=Prospect / afnemer
@@ -267,7 +267,7 @@ Prospect=Prospect
 CustomerCard=Afnemerskaart
 Customer=Afnemer
 CustomerRelativeDiscount=Kortingspercentage
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=Kortingspercentage
 CustomerAbsoluteDiscountShort=Kortingsbedrag
 CompanyHasRelativeDiscount=Voor deze afnemer geldt een kortingspercentage van <b>%s%%</b>
@@ -282,10 +282,10 @@ HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or d
 HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
 HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=Voor deze afnemer is geen kortingsbedrag ingesteld
-CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
-CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+CustomerAbsoluteDiscountAllUsers=Vastgelegde klant kortingen (toegekend door alle gebruikers)
+CustomerAbsoluteDiscountMy=Vastgelegde klant kortingen (toegekend door uzelf)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=Geen
 Supplier=Leverancier
 AddContact=Nieuwe contactpersoon
@@ -293,7 +293,7 @@ AddContactAddress=Nieuw contact/adres
 EditContact=Bewerk contact / adres
 EditContactAddress=Wijzig contact/adres
 Contact=Contactpersoon
-ContactId=Contact id
+ContactId=ID contactpersoon
 ContactsAddresses=Contacpersonen / adressen
 FromContactName=Name:
 NoContactDefinedForThirdParty=Geen contact opgegeven voor deze derde partij
@@ -304,13 +304,13 @@ DeleteACompany=Bedrijf verwijderen
 PersonalInformations=Persoonlijke gegevens
 AccountancyCode=Accounting account
 CustomerCode=Afnemerscode
-SupplierCode=Leverancierscode
+SupplierCode=Vendor code
 CustomerCodeShort=Klantcode
-SupplierCodeShort=Leverancierscode
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=Afnemerscode, uniek voor alle afnemers
-SupplierCodeDesc=Leverancierscode, uniek voor alle leveranciers
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=Vereist als Klant een afnemer of prospect is
-RequiredIfSupplier=Vereist als Klant een leverancier is
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=Geldigheid gecontroleerd door module
 ThisIsModuleRules=Dit zijn de regels voor deze module
 ProspectToContact=Prospect om contact mee op te nemen
@@ -318,7 +318,7 @@ CompanyDeleted=Bedrijf '%s' verwijderd uit de database.
 ListOfContacts=Contactpersonen- / adressenlijst
 ListOfContactsAddresses=Lijst van contacten/adressen
 ListOfThirdParties=Lijst van derde partijen
-ShowCompany=Show third party
+ShowCompany=Toon relatie
 ShowContact=Toon contactpersoon
 ContactsAllShort=Alle (Geen filter)
 ContactType=Type contactpersoon
@@ -338,7 +338,7 @@ MyContacts=Mijn contacten
 Capital=Kapitaal
 CapitalOf=Kapitaal van %s
 EditCompany=Bedrijf bewerken
-ThisUserIsNot=Deze gebruiker is geen prospect, afnemer of leverancier
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=Controleren
 VATIntraCheckDesc=De link <b>%s</b> maakt het mogelijk om de Europese BTW-controledienst te raadplegen. Voor deze dienst is een externe internettoegang vanaf de webserver vereist.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -373,12 +373,12 @@ TE_PRIVATE=Particulier
 TE_OTHER=Anderen
 StatusProspect-1=Geen contact opnemen
 StatusProspect0=Nooit contact gehad
-StatusProspect1=To be contacted
+StatusProspect1=Nog te contacteren
 StatusProspect2=Contact in proces
 StatusProspect3=Contact gemaakt
 ChangeDoNotContact=Status veranderen naar 'Geen contact opnemen'
 ChangeNeverContacted=Status veranderen naar 'Nooit contact gehad'
-ChangeToContact=Change status to 'To be contacted'
+ChangeToContact=Wijzig status in: 'Nog te contacteren'
 ChangeContactInProcess=Status veranderen naar 'Contact in proces'
 ChangeContactDone=Status veranderen naar 'Contact gemaakt'
 ProspectsByStatus=Prospecten per status
@@ -391,26 +391,26 @@ ExportDataset_company_1=Third parties (Companies / foundations / physical people
 ExportDataset_company_2=Contactpersonen en eigenschappen
 ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
-ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_3=Bankrekeningen van relaties
 ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=Prijsniveau
 DeliveryAddress=Afleveradres
 AddAddress=Adres toevoegen
-SupplierCategory=Leverancierscategorie
-JuridicalStatus200=Independent
+SupplierCategory=Vendor category
+JuridicalStatus200=Onafhankelijk
 DeleteFile=Bestand verwijderen
 ConfirmDeleteFile=Weet u zeker dat u dit bestand wilt verwijderen?
 AllocateCommercial=Toegekend aan vertegenwoordiger
 Organization=Organisatie
 FiscalYearInformation=Informatie over het fiscale jaar
 FiscalMonthStart=Startmaand van het fiscale jaar
-YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
+YouMustAssignUserMailFirst=U moet eerst een e-mail voor deze gebruiker maken om e-mailmeldingen voor hem te kunnen toevoegen.
 YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
-ListSuppliersShort=Leveranciersoverzicht
+ListSuppliersShort=Leverancierslijst
 ListProspectsShort=Prospectenoverzicht
 ListCustomersShort=Afnemersoverzicht
 ThirdPartiesArea=Relaties en contactpersonen
-LastModifiedThirdParties=Latest %s modified third parties
+LastModifiedThirdParties=Laatste %s gewijzigde relaties
 UniqueThirdParties=Totaal aantal unieke derde partijen
 InActivity=Open
 ActivityCeased=Gesloten
@@ -420,7 +420,7 @@ CurrentOutstandingBill=Huidige openstaande rekening
 OutstandingBill=Max. voor openstaande rekening
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Geeft een nummer als %syymm-nnnn voor afnemerscodes en %sjjmm-nnnn voor leverancierscodes waar jj het jaar is, mm de maand en nnnn een opeenvolgend nummer vanaf 0.
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=Afnemers- / leverancierscode is vrij. Deze code kan te allen tijde worden gewijzigd.
 ManagingDirectors=Manager(s) Naam (CEO, directeur, voorzitter ...)
 MergeOriginThirdparty=Dupliceren third party (third party die u wilt verwijderen)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=Vertegenwoordiger voornaam
 SaleRepresentativeLastname=Vertegenwoordiger achternaam
 ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/nl_NL/compta.lang b/htdocs/langs/nl_NL/compta.lang
index 36efa28dc7e..355187a9b72 100644
--- a/htdocs/langs/nl_NL/compta.lang
+++ b/htdocs/langs/nl_NL/compta.lang
@@ -13,12 +13,12 @@ LTReportBuildWithOptionDefinedInModule=Bedragen hier getoond worden berekend vol
 Param=Instellen
 RemainingAmountPayment=Bedrag betaling resteert:
 Account=Rekening
-Accountparent=Parent account
-Accountsparent=Parent accounts
+Accountparent=Hoofdrekening
+Accountsparent=Bovenliggende rekeningen
 Income=Inkomsten
 Outcome=Kosten
 MenuReportInOut=Opbrengsten / kosten
-ReportInOut=Balance of income and expenses
+ReportInOut=Saldo van baten en lasten
 ReportTurnover=Omzet
 PaymentsNotLinkedToInvoice=Betalingen niet gekoppeld aan een factuur, dus niet gekoppeld aan een derde partij
 PaymentsNotLinkedToUser=Betalingen niet gekoppeld aan een gebruiker
@@ -31,11 +31,12 @@ Credit=Credit
 Piece=Boekhouding Doc.
 AmountHTVATRealReceived=Netto ontvangen
 AmountHTVATRealPaid=Netto betaald
-VATToPay=Tax sales
-VATReceived=Tax received
-VATToCollect=Tax purchases
-VATSummary=Tax Balance
-VATPaid=Tax paid
+VATToPay=Belasting op verkopen
+VATReceived=Ontvangen Omzet-belasting
+VATToCollect=Belasting aankopen
+VATSummary=Tax monthly
+VATBalance=Saldo belasting
+VATPaid=Betaalde belasting
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
 LT1SummaryES=RE Balance
@@ -63,29 +64,29 @@ LT2SupplierIN=SGST purchases
 VATCollected=Geïnde  BTW
 ToPay=Te betalen
 SpecialExpensesArea=Ruimte voor alle bijzondere betalingen
-SocialContribution=Social or fiscal tax
-SocialContributions=Social or fiscal taxes
-SocialContributionsDeductibles=Deductible social or fiscal taxes
-SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+SocialContribution=Sociale of fiscale heffingen/belasting
+SocialContributions=Sociale of fiscale heffingen/belastingen
+SocialContributionsDeductibles=Aftrekbare sociale/fiscale lasten/belastingen
+SocialContributionsNondeductibles=Niet aftrekbare sociale/fiscale lasten/belastingen
 LabelContrib=Label contribution
 TypeContrib=Type contribution
 MenuSpecialExpenses=Speciale uitgaven
 MenuTaxAndDividends=Belastingen en dividenden
-MenuSocialContributions=Social/fiscal taxes
-MenuNewSocialContribution=New social/fiscal tax
-NewSocialContribution=New social/fiscal tax
+MenuSocialContributions=Sociale/fiscale heffingen/belastingen
+MenuNewSocialContribution=Nw soc./fiscale h/b.
+NewSocialContribution=Nw soc./fiscale h/b.
 AddSocialContribution=Add social/fiscal tax
-ContributionsToPay=Social/fiscal taxes to pay
+ContributionsToPay=Sociale- en fiscale lasten om te betalen
 AccountancyTreasuryArea=Treasury- (schatkist) / boekhoudingsoverzicht
 NewPayment=Nieuwe betaling
 Payments=Betalingen
 PaymentCustomerInvoice=Afnemersfactuur betaling
-PaymentSupplierInvoice=Leveranciersfactuur betaling
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Sociale/fiscale belastingbetaling
 PaymentVat=BTW betaling
 ListPayment=Betalingenlijst
 ListOfCustomerPayments=Afnemersbetalingenlijst
-ListOfSupplierPayments=Leveranciersbetalingenlijst
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Startdatum periode
 DateEndPeriod=Einddatum periode
 newLT1Payment=New tax 2 payment
@@ -100,19 +101,19 @@ LT1PaymentES=RE Betaling
 LT1PaymentsES=RE Betalingen
 LT2PaymentES=IRPF betaling
 LT2PaymentsES=IRPF Betalingen
-VATPayment=Sales tax payment
-VATPayments=Sales tax payments
-VATRefund=Sales tax refund
-NewVATPayment=New sales tax payment
-Refund=Refund
-SocialContributionsPayments=Social/fiscal taxes payments
+VATPayment=Betaling verkoop-belasting
+VATPayments=Betalingen verkoop-belasting
+VATRefund=BTW Terugbetaling
+NewVATPayment=Nieuwe betaling BTW
+Refund=Terugbetaling
+SocialContributionsPayments=Betaling Sociale/fiscale lasten
 ShowVatPayment=Toon BTW-betaling
 TotalToPay=Totaal te voldoen
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
-CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
-CustomerAccountancyCodeShort=Cust. account. code
-SupplierAccountancyCodeShort=Sup. account. code
+CustomerAccountancyCode=Debiteurenrekening
+SupplierAccountancyCode=Vendor accounting code
+CustomerAccountancyCodeShort=Klant account. code
+SupplierAccountancyCodeShort=Lev. account. code
 AccountNumber=Rekeningnummer
 NewAccountingAccount=Nieuwe rekening
 SalesTurnover=Omzet
@@ -122,23 +123,23 @@ ByThirdParties=Door derde partijen
 ByUserAuthorOfInvoice=Op factuurauteur
 CheckReceipt=Controleer stortingen
 CheckReceiptShort=Controleer stortingen
-LastCheckReceiptShort=Latest %s check receipts
+LastCheckReceiptShort=Laatste %s ontvangsten via cheques
 NewCheckReceipt=Nieuwe korting
 NewCheckDeposit=Nieuwe chequestorting
 NewCheckDepositOn=Creeer een kwitantie voor de storting op rekening: %s
-NoWaitingChecks=No checks awaiting deposit.
+NoWaitingChecks=Geen cheques om af te storten.
 DateChequeReceived=Ontvangstdatum cheque
 NbOfCheques=Aantal cheques
-PaySocialContribution=Pay a social/fiscal tax
+PaySocialContribution=Betaal een sociale/fiscale vordering
 ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
-DeleteSocialContribution=Delete a social or fiscal tax payment
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
-ExportDataset_tax_1=Social and fiscal taxes and payments
+DeleteSocialContribution=Verwijder een sociale/fiscale betaling
+ConfirmDeleteSocialContribution=Weet u zeker dat u deze sociale- of fiscale belasting-betaling wilt verwijderen?
+ExportDataset_tax_1=Sociale- en fiscale belastingen en betalingen
 CalcModeVATDebt=Mode <b>%sBTW op verbintenissenboekhouding %s.</b>
 CalcModeVATEngagement=Mode <b>%sBTW op de inkomens-uitgaven %s.</b>
 CalcModeDebt=Mode <b>%sClaims-Schulden%s</b> zei <b>verbintenis boekhouding.</b>
 CalcModeEngagement=Mode <b>%sIncomes-kosten%s</b> zei <b>kas boekhouding</b>
-CalcModeBookkeeping=Analysis of <b>data journalized in Bookkeeping Ledger table</b>
+CalcModeBookkeeping=Analyse van <b>boekingen in het grootboek</b>
 CalcModeLT1= <b>Modus %s RE op klant- leveranciers facturen %s</b>
 CalcModeLT1Debt=Mode <b>%sRE on customer invoices%s</b>
 CalcModeLT1Rec= Mode <b>%sRE on suppliers invoices%s</b>
@@ -163,17 +164,19 @@ RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accou
 RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
 RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
-DepositsAreNotIncluded=- Down payment invoices are nor included
-DepositsAreIncluded=- Down payment invoices are included
+DepositsAreNotIncluded=- Facturen met vooruitbetaling zijn niet inbegrepen
+DepositsAreIncluded=- Facturen met vooruitbetaling zijn inbegrepen
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Verslag van derden IRPF
-VATReport=Sale tax report
+VATReport=Verkoop belasting rapportage
 VATReportByPeriods=Sale tax report by period
-VATReportByCustomers=Sale tax report by customer
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
+VATReportByCustomers=BTW-overzicht per klant
 VATReportByCustomersInInputOutputMode=Bevestigd door de klant btw geïnd en betaald
-VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
+VATReportByQuartersInInputOutputMode=Rapportage per belasting tarief van belasting geïnd en betaald
 LT1ReportByQuarters=Report tax 2 by rate
 LT2ReportByQuarters=Report tax 3 by rate
 LT1ReportByQuartersES=Report by RE rate
@@ -196,18 +199,18 @@ Dispatched=Verzonden
 ToDispatch=Te verzenden
 ThirdPartyMustBeEditAsCustomer=Derde partij moet als afnemer worden gedefinieerd
 SellsJournal=Verkoopdagboek
-PurchasesJournal=Inkoopdagboek
+PurchasesJournal=Inkoopboek
 DescSellsJournal=Verkoopdagboek
-DescPurchasesJournal=Inkoopdagboek
+DescPurchasesJournal=Inkoopboek
 InvoiceRef=Factuur ref.
 CodeNotDef=Niet gedefinieerd
 WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=Betalingstermijn mag niet lager zijn dan de datum object.
-Pcg_version=Chart of accounts models
+Pcg_version=Lijst van rekeningschema's
 Pcg_type=Boekhouding soort
 Pcg_subtype=Boekhouding ondersoort
 InvoiceLinesToDispatch=Factuurregels te verzenden
-ByProductsAndServices=Volgens producten en diensten
+ByProductsAndServices=By product and service
 RefExt=Externe ref
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
 LinkedOrder=gekoppeld aan bestelling
@@ -215,7 +218,8 @@ Mode1=Methode 1
 Mode2=Methode 2
 CalculationRuleDesc=Om de totale BTW te berekenen, zij er twee methoden: <br> Methode 1 wordt afronding btw op elke lijn, dan bij elkaar op tellen. <br> Methode 2 is het optellen van alle btw op elke lijn, dan afronding resultaat. <br> Uiteindelijke resultaat kan een paar cent verschillen. Standaard modus is de <b>modus %s.</b>
 CalculationRuleDescSupplier=According to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Omzet rapport per product, bij gebruik van een <b>kas boukhoudings-modus</b> is dit niet relevant. Dit rapport is alleen beschikbaar bij gebruik van <b>betrokkenheid accountancy-modus</b> (zie setup van boukhoud module).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Berekeningswijze
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Standaard grootboekrekening BTW af te dragen
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
@@ -235,10 +239,17 @@ 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=Sociale/fiscale heffingen/belastingen
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
-FiscalPeriod=Accounting period
+FiscalPeriod=Boekingsperiode
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/nl_NL/cron.lang b/htdocs/langs/nl_NL/cron.lang
index 5d39d79b394..059e7cf2e3d 100644
--- a/htdocs/langs/nl_NL/cron.lang
+++ b/htdocs/langs/nl_NL/cron.lang
@@ -17,23 +17,23 @@ CronMethodDoesNotExists=Class %s does not contains any method %s
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
 CronJobProfiles=List of predefined cron job profiles
 # Menu
-EnabledAndDisabled=Enabled and disabled
+EnabledAndDisabled=Ingeschakeld en uitgeschakeld
 # Page list
-CronLastOutput=Latest run output
-CronLastResult=Latest result code
+CronLastOutput=Laatste run-output
+CronLastResult=Laatste resultaatcode
 CronCommand=Commando
 CronList=Geplande taken
-CronDelete=Delete scheduled jobs
+CronDelete=Verwijder geplande taken
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
-CronExecute=Launch scheduled job
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
+CronExecute=Start geplande taak
+CronConfirmExecute=Weet u zeker dat u deze geplande taken nu wilt uitvoeren?
 CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
 CronTask=Taak
 CronNone=Geen
-CronDtStart=Not before
-CronDtEnd=Not after
+CronDtStart=Niet voor
+CronDtEnd=Niet na
 CronDtNextLaunch=Volgende uitvoering
-CronDtLastLaunch=Start date of latest execution
+CronDtLastLaunch=Startdatum van de laatste uitvoering
 CronDtLastResult=End date of latest execution
 CronFrequency=Frequentie
 CronClass=Class
@@ -42,36 +42,36 @@ CronModule=Module
 CronNoJobs=Geen taken opgenomen
 CronPriority=Prioriteit
 CronLabel=Naam
-CronNbRun=Nb. launch
+CronNbRun=Aantal uitgevoerd
 CronMaxRun=Max number launch
 CronEach=Elke
 JobFinished=Taak gestart en be-eindigd
 #Page card
 CronAdd= Taak toevoegen
-CronEvery=Execute job each
+CronEvery=Alle taken uitvoeren
 CronObject=Instantie/Object om te creeren
 CronArgs=Instellingen
-CronSaveSucess=Save successfully
+CronSaveSucess=Bewaren gelukt
 CronNote=Reactie
-CronFieldMandatory=Fields %s is mandatory
-CronErrEndDateStartDt=End date cannot be before start date
+CronFieldMandatory=Velden %s zijn verplicht
+CronErrEndDateStartDt=Einddatum kan niet vóór startdatum liggen
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Activeren
 CronStatusInactiveBtn=Deactiveren
-CronTaskInactive=This job is disabled
+CronTaskInactive=Deze taak is uitgeschakeld
 CronId=Id
-CronClassFile=Filename with class
+CronClassFile=Bestandsnaam met class
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple 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>
 CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
 CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
 CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
 CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
-CronCommandHelp=The system command line to execute.
+CronCommandHelp=De te uitvoeren opdrachtregel.
 CronCreateJob=Aanmaken nieuwe geplande taak
 CronFrom=Van
 # Info
 # Common
-CronType=Job type
+CronType=Soort taak
 CronType_method=Call method of a PHP Class
 CronType_command=Shell commando
 CronCannotLoadClass=Cannot load class file %s (to use class %s)
diff --git a/htdocs/langs/nl_NL/dict.lang b/htdocs/langs/nl_NL/dict.lang
index 1153c7a03fd..20238fb1493 100644
--- a/htdocs/langs/nl_NL/dict.lang
+++ b/htdocs/langs/nl_NL/dict.lang
@@ -5,7 +5,8 @@ CountryIT=Italië
 CountryES=Spanje
 CountryDE=Duitsland
 CountryCH=Zwitserland
-CountryGB=Groot-Brittannië
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=Verenigd Koninkrijk
 CountryUK=Verenigd Koninkrijk
 CountryIE=Ierland
 CountryCN=China
@@ -326,9 +327,9 @@ PaperFormatCAP4=Grootte Canada P4
 PaperFormatCAP5=Grootte Canada P5
 PaperFormatCAP6=Grootte Canada P6
 #### Expense report categories ####
-ExpAutoCat=Car
+ExpAutoCat=Auto
 ExpCycloCat=Moped
-ExpMotoCat=Motorbike
+ExpMotoCat=Motorfiets
 ExpAuto3CV=3 CV
 ExpAuto4CV=4 CV
 ExpAuto5CV=5 CV
@@ -339,18 +340,18 @@ ExpAuto9CV=9 CV
 ExpAuto10CV=10 CV
 ExpAuto11CV=11 CV
 ExpAuto12CV=12 CV
-ExpAuto3PCV=3 CV and more
+ExpAuto3PCV=3 CV en meer
 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
+ExpAuto9PCV=9 CV en meer
 ExpAuto10PCV=10 CV and more
-ExpAuto11PCV=11 CV and more
-ExpAuto12PCV=12 CV and more
+ExpAuto11PCV=11 CV en meer
+ExpAuto12PCV=12 CV en meer
 ExpAuto13PCV=13 CV and more
 ExpCyclo=Capacity lower to 50cm3
-ExpMoto12CV=Motorbike 1 or 2 CV
-ExpMoto345CV=Motorbike 3, 4 or 5 CV
+ExpMoto12CV=Motorfiets 1 of 2 CV
+ExpMoto345CV=Motorfiets 3, 4 of 5 CV
 ExpMoto5PCV=Motorbike 5 CV and more
diff --git a/htdocs/langs/nl_NL/ecm.lang b/htdocs/langs/nl_NL/ecm.lang
index b687a2692a4..b2ce45ee11e 100644
--- a/htdocs/langs/nl_NL/ecm.lang
+++ b/htdocs/langs/nl_NL/ecm.lang
@@ -23,7 +23,7 @@ ECMSearchByKeywords=Zoeken op trefwoorden
 ECMSearchByEntity=Zoek op object
 ECMSectionOfDocuments=Mappen van documenten
 ECMTypeAuto=Automatisch
-ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
+ECMDocsBySocialContributions=Documenten gekoppeld aan sociale of fiscale heffingen/belastingen
 ECMDocsByThirdParties=Documenten gekoppeld aan derden
 ECMDocsByProposals=Documenten gekoppeld aan offertes / voorstellen
 ECMDocsByOrders=Documenten gekoppeld aan afnemersorders
@@ -39,10 +39,10 @@ ShowECMSection=Toon map
 DeleteSection=Verwijder map
 ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
 ECMDirectoryForFiles=Relatieve map voor bestanden
-CannotRemoveDirectoryContainsFilesOrDirs=Removed not possible because it contains some files or sub-directories
-CannotRemoveDirectoryContainsFiles=Verwijderen is niet mogelijk omdat het een aantal bestanden bevat
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=Bestandsbeheer
-ECMSelectASection=Select a directory in the tree...
+ECMSelectASection=Selecteer een map in de boomstructuur ...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
diff --git a/htdocs/langs/nl_NL/errors.lang b/htdocs/langs/nl_NL/errors.lang
index cc7f5b34966..3462750b63b 100644
--- a/htdocs/langs/nl_NL/errors.lang
+++ b/htdocs/langs/nl_NL/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Bar code nodig
 ErrorCustomerCodeAlreadyUsed=Afnemerscode al gebruikt
 ErrorBarCodeAlreadyUsed=Bar code al gebruikt
 ErrorPrefixRequired=Voorvoegsel vereist
-ErrorBadSupplierCodeSyntax=verkeerde syntaxis voor Leverancierscode
-ErrorSupplierCodeRequired=Leverancierscode vereist
-ErrorSupplierCodeAlreadyUsed=Leverancierscode al gebruikt
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Verkeerde parameters
 ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
 ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
@@ -42,7 +42,7 @@ ErrorBadDateFormat=Waarde %s heeft verkeerde datum formaat
 ErrorWrongDate=Datum is niet correct!
 ErrorFailedToWriteInDir=Schrijven in de map %s mislukt
 ErrorFoundBadEmailInFile=Onjuist e-mail syntax gevonden voor %s regels in het bestand (bijvoorbeeld regel %s met email=%s)
-ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
+ErrorUserCannotBeDelete=Gebruiker kan niet worden verwijderd. Mogelijk is het geassocieerd met andere Dolibarr-onderdelen.
 ErrorFieldsRequired=Enkele verplichte velden zijn niet ingevuld.
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Creëren van een map mislukt. Controleer of de Webservergebruiker toestemming heeft om te schrijven in Dolibarr documentenmap. Wanneer de parameter <b>safe_mode</b> is ingeschakeld in PHP, controleer dan dat de Dolibarr php bestanden eigendom zijn van de de webserve gebruiker (of groep).
@@ -74,7 +74,7 @@ ErrorLDAPMakeManualTest=Een .ldif bestand is gegenereerd in de map %s. Probeer h
 ErrorCantSaveADoneUserWithZeroPercentage=Kan een actie met de status "Nog niet gestart" niet opslaan als het veld "door" niet ook gevuld is.
 ErrorRefAlreadyExists=De referentie gebruikt voor het maken bestaat al
 ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
-ErrorRecordHasChildren=Failed to delete record since it has some childs.
+ErrorRecordHasChildren=Kan record niet verwijderen omdat er onderliggende data aanwezig is.
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Kan record niet verwijderen. Het wordt al gebruikt of opgenomen in een ander object.
 ErrorModuleRequireJavascript=Javascript dient niet uitgeschakeld te zijn voor deze functionaliteit. Om Javascript aan of uit te zetten gaat u naar het menu Home->instellingen->Scherm
@@ -87,13 +87,13 @@ ErrorsOnXLines=Fouten op bronregels <b>%s</b>
 ErrorFileIsInfectedWithAVirus=Het antivirusprogramma kon dit bestand niet valideren (het zou met een virus geïnfecteerd kunnen zijn)
 ErrorSpecialCharNotAllowedForField=Speciale tekens zijn niet toegestaan in het veld " %s"
 ErrorNumRefModel=Er bestaat een verwijzing in de database (%s) en deze is niet compatibel met deze nummeringsregel. Verwijder de tabelregel of hernoem de verwijzing om deze module te activeren.
-ErrorQtyTooLowForThisSupplier=Hoeveelheid te laag voor deze leverancier of geen prijs ingesteld voor dit product voor deze leverancier
-ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
+ErrorModuleSetupNotComplete=Het instellen van de module lijkt onvolledig. Ga naar Home - Setup - Modules om te voltooien.
 ErrorBadMask=Fout bij het masker
 ErrorBadMaskFailedToLocatePosOfSequence=Fout, masker zonder het volgnummer
 ErrorBadMaskBadRazMonth=Fout, slechte resetwaarde
 ErrorMaxNumberReachForThisMask=Max number reach for this mask
-ErrorCounterMustHaveMoreThan3Digits=Counter must have more than 3 digits
+ErrorCounterMustHaveMoreThan3Digits=Teller moet uit meer dan 3 cijfers bestaan
 ErrorSelectAtLeastOne=Fout. Kies ten minste een item.
 ErrorDeleteNotPossibleLineIsConsolidated=Verwijderen niet mogelijk, omdat record is gekoppeld aan een bank transation dat is verzoend
 ErrorProdIdAlreadyExist=%s is toegewezen aan een derde
@@ -119,7 +119,7 @@ ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoice
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> gebruikt om web-server uit te voeren heeft geen toestemming voor die
 ErrorNoActivatedBarcode=Geen geactiveerde barcode soort
 ErrUnzipFails=uitpakken %s mislukt met ZipArchive
-ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
+ErrNoZipEngine=Geen engine om een ​​%s bestand in dit PHP te zip / unzippen
 ErrorFileMustBeADolibarrPackage=Het bestand %s moet een Dolibarr zip-pakket zijn
 ErrorModuleFileRequired=You must select a Dolibarr module package file
 ErrorPhpCurlNotInstalled=De PHP CURL is niet geïnstalleerd, dit is van essentieel belang met Paypal te communiceren
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
-ErrorSupplierCountryIsNotDefined=Land voor deze leverancier is niet gedefinieerd. Corrigeer dit eerst.
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
@@ -198,7 +198,7 @@ ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
 ErrorNoWarehouseDefined=Error, no warehouses defined.
 ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
 ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
-ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Mass validation is not possible when option to increase/decrease stock is set on this action (you must validate one by one so you can define the warehouse to increase/decrease)
+ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Massa-validatie is niet mogelijk wanneer de optie om de voorraad te verhogen/verlagen op deze actie is ingesteld.  (U moet één voor één valideren zodat u het magazijn kunt definiëren om te verhogen/verlagen.)
 ErrorObjectMustHaveStatusDraftToBeValidated=Object %s must have status 'Draft' to be validated.
 ErrorObjectMustHaveLinesToBeValidated=Object %s must have lines to be validated.
 ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Only validated invoices can be sent using the "Send by email" mass action.
diff --git a/htdocs/langs/nl_NL/holiday.lang b/htdocs/langs/nl_NL/holiday.lang
index fd6b7ffd558..75c00750255 100644
--- a/htdocs/langs/nl_NL/holiday.lang
+++ b/htdocs/langs/nl_NL/holiday.lang
@@ -1,106 +1,124 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Leaves
-CPTitreMenu=Leaves
-MenuReportMonth=Monthly statement
-MenuAddCP=New leave request
-NotActiveModCP=You must enable the module Leaves to view this page.
-AddCP=Make a leave request
+Holidays=Verlof
+CPTitreMenu=Verlof
+MenuReportMonth=Maandoverzicht
+MenuAddCP=Nieuw verlofverzoek
+NotActiveModCP=U moet de module 'Beheer van verlofverzoeken' aanzetten om deze pagina te kunnen bekijken.
+AddCP=Aanmaken verlofverzoek
 DateDebCP=Begindatum
 DateFinCP=Einddatum
 DateCreateCP=Aanmaakdatum
 DraftCP=Ontwerp
-ToReviewCP=Awaiting approval
+ToReviewCP=Wachten op goedkeuring
 ApprovedCP=Goedgekeurd
 CancelCP=Geannuleerd
 RefuseCP=Geweigerd
-ValidatorCP=Approbator
-ListeCP=List of leaves
-ReviewedByCP=Will be approved by
+ValidatorCP=Gevolmachtigde voor goedkeuring
+ListeCP=Lijst verlofverzoeken
+LeaveId=Leave ID
+ReviewedByCP=Zal worden goedgekeurd door
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=Firstname of approval user
+UserForApprovalLastname=Lastname of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=Beschrijving
-SendRequestCP=Create leave request
-DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Balance of leaves
-SoldeCPUser=Leaves balance is <b>%s</b> days.
-ErrorEndDateCP=You must select an end date greater than the start date.
-ErrorSQLCreateCP=An SQL error occurred during the creation:
-ErrorIDFicheCP=An error has occurred, the leave request does not exist.
-ReturnCP=Return to previous page
-ErrorUserViewCP=You are not authorized to read this leave request.
-InfosWorkflowCP=Information Workflow
-RequestByCP=Requested by
-TitreRequestCP=Leave request
-NbUseDaysCP=Number of days of vacation consumed
+SendRequestCP=Aanmaken verlofverzoek
+DelayToRequestCP=Verlofverzoeken moeten tenminste <b>%s dag </b> van te voren worden ingediend.
+MenuConfCP=Saldo verlofverzoeken
+SoldeCPUser=Aantal resterende verlofdagen <b>%s</b>
+ErrorEndDateCP=U moet een einddatum kiezen die na de startdatum ligt.
+ErrorSQLCreateCP=Er is een SQL fout ontstaan bij het aanmaken:
+ErrorIDFicheCP=Fout. Verlofverzoek bestaat niet.
+ReturnCP=Terug naar vorige pagina
+ErrorUserViewCP=U heeft geen toestemming voor lezen verlofverzoek.
+InfosWorkflowCP=Workflow informatie
+RequestByCP=Aangevraagd door
+TitreRequestCP=Verlof aanvraag
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
+NbUseDaysCP=Aantal verbruikte verlofdagen
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=Bewerken
 DeleteCP=Verwijderen
-ActionRefuseCP=Refuse
+ActionRefuseCP=Weigeren
 ActionCancelCP=Annuleren
 StatutCP=Status
-TitleDeleteCP=Delete the leave request
-ConfirmDeleteCP=Confirm the deletion of this leave request?
-ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
-CantCreateCP=You don't have the right to make leave requests.
-InvalidValidatorCP=You must choose an approbator to your leave request.
-NoDateDebut=You must select a start date.
-NoDateFin=You must select an end date.
-ErrorDureeCP=Your leave request does not contain working day.
-TitleValidCP=Approve the leave request
-ConfirmValidCP=Are you sure you want to approve the leave request?
-DateValidCP=Date approved
-TitleToValidCP=Send leave request
-ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Refuse the leave request
-ConfirmRefuseCP=Are you sure you want to refuse the leave request?
-NoMotifRefuseCP=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the leave request
-ConfirmCancelCP=Are you sure you want to cancel the leave request?
-DetailRefusCP=Reason for refusal
-DateRefusCP=Date of refusal
-DateCancelCP=Date of cancellation
-DefineEventUserCP=Assign an exceptional leave for a user
-addEventToUserCP=Assign leave
+TitleDeleteCP=Verwijderen verlofverzoek
+ConfirmDeleteCP=Akkoord met het verwijderen van het verlofverzoek?
+ErrorCantDeleteCP=Fout. U heeft geen rechten dit verzoek te verwijderen.
+CantCreateCP=U heeft geen rechten voor het aanmaken van uw verlofverzoek
+InvalidValidatorCP=U moet een iemand kiezen voor het goedkeuren van het verlofverzoek
+NoDateDebut=U moet een startdatum ingeven.
+NoDateFin=U moet een einddatum ingeven.
+ErrorDureeCP=Uw verzoek betreft geen werkdag.
+TitleValidCP=Goedkeuren verlofverzoek
+ConfirmValidCP=Weet u zeker dat u dit verlofverzoek wilt goedkeuren?
+DateValidCP=Datum goedgekeurd
+TitleToValidCP=Verstuur verlofverzoek
+ConfirmToValidCP=Weet u zeker dat u dit verlofverzoek wilt versturen?
+TitleRefuseCP=Weigeren verlofverzoek
+ConfirmRefuseCP=Weet u zeker dat u dit verlofverzoek wilt weigeren?
+NoMotifRefuseCP=U moet een reden kiezen voor het weigeren van het verzoek.
+TitleCancelCP=Verlofverzoek annuleren
+ConfirmCancelCP=Weet u zeker dat u dit verlofverzoek wilt annuleren?
+DetailRefusCP=Reden van weigering verlofverzoek
+DateRefusCP=Datum weigering
+DateCancelCP=Datum van annuleren
+DefineEventUserCP=Toekennen uitzonderlijk verlofverzoek van een gebruiker
+addEventToUserCP=Toekennen verlof
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=Reden
 UserCP=Gebruiker
-ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
-AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View change logs
-LogCP=Log of updates of available vacation days
-ActionByCP=Performed by
-UserUpdateCP=For the user
-PrevSoldeCP=Previous Balance
-NewSoldeCP=New Balance
-alreadyCPexist=A leave request has already been done on this period.
-FirstDayOfHoliday=First day of vacation
-LastDayOfHoliday=Last day of vacation
-BoxTitleLastLeaveRequests=Latest %s modified leave requests
-HolidaysMonthlyUpdate=Monthly update
-ManualUpdate=Manual update
-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
-AllHolidays=All leave requests
-
+ErrorAddEventToUserCP=Er is een fout ontstaan bij het toekennen van het uitzonderlijk verlof.
+AddEventToUserOkCP=Het uitzonderlijk verlof is toegevoegd.
+MenuLogCP=Raadplegen log van wijzigingen
+LogCP=Overzicht aanpassingen van beschikbare vakantiedagen
+ActionByCP=Gedaan door
+UserUpdateCP=Voor gebruiker
+PrevSoldeCP=Vorig saldo
+NewSoldeCP=Nieuw saldo
+alreadyCPexist=U heeft een verlofverzoek aangemaakt welke reeds bestaat voor deze periode.
+FirstDayOfHoliday=Eerste vakantiedag
+LastDayOfHoliday=Laatste vakantiedag
+BoxTitleLastLeaveRequests=Laatste %s aangepaste verlofverzoeken
+HolidaysMonthlyUpdate=Maandelijkse update
+ManualUpdate=Handmatige update
+HolidaysCancelation=Annuleren verlofverzoek
+EmployeeLastname=Medewerker achternaam
+EmployeeFirstname=Medewerker voornaam
+TypeWasDisabledOrRemoved=Verlofsoort (id %s) is niet actief of verwijderd
+LastHolidays=Laatste %s verlofverzoeken
+AllHolidays=Alle verlofverzoeken
+HalfDay=Halve dag
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Betaalde vakantie
+LEAVE_SICK=Ziekteverlof
+LEAVE_OTHER=Overig verlof
+LEAVE_PAID_FR=Betaalde vakantie
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
-UpdateConfCPOK=Updated successfully.
-Module27130Name= Management of leave requests
-Module27130Desc= Management of leave requests
-ErrorMailNotSend=An error occurred while sending email:
-NoticePeriod=Notice period
+LastUpdateCP=Laatste automatische update van verlofverzoek bestemmingen
+MonthOfLastMonthlyUpdate=Laatste maand van automatische verlofverzoek toewijzingen
+UpdateConfCPOK=Bijgewerkt.
+Module27130Name= Beheer verlofverzoeken
+Module27130Desc= Beheer verlofverzoeken
+ErrorMailNotSend=Er is een fout ontstaan bij het versturen van de e-mail:
+NoticePeriod=Opzegtermijn
 #Messages
-HolidaysToValidate=Validate leave requests
-HolidaysToValidateBody=Below is a leave request to validate
-HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
-HolidaysValidated=Validated leave requests
-HolidaysValidatedBody=Your leave request for %s to %s has been validated.
-HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
-HolidaysCanceled=Canceled leaved request
-HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
-NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
+HolidaysToValidate=Verlofverzoeken goedkeuren
+HolidaysToValidateBody=Hieronder verzoek voor goedkeuring
+HolidaysToValidateDelay=Dit verlofverzoek zal plaatsvinden in minder dan %s dag.
+HolidaysToValidateAlertSolde=De aanvrager voor dit verzoek heeft geen voldoende beschikbare verlofdagen over.
+HolidaysValidated=Goedkeuren verlofverzoeken
+HolidaysValidatedBody=Uw verlofverzoek van %s tot %s is goedgekeurd.
+HolidaysRefused=Verlofverzoeken geweigerd
+HolidaysRefusedBody=Uw verlofverzoek van %s tot %s is om de volgende reden geweigerd:
+HolidaysCanceled=Annuleren verlofverzoek
+HolidaysCanceledBody=Uw verlofverzoek van%s tot %s is geannuleerd.
+FollowedByACounter=1: Dit soort verlof moet worden vervolgd met een teller. Deze zal handmatig of automatisch worden opgehoogd en wanneer verlofverzoek is goedgekeurd, zal deze automatisch aftellen. <br>0: Niet worden vervolgd met teller
+NoLeaveWithCounterDefined=Er zijn geen soorten verlof waarbij een teller nodig is.
+GoIntoDictionaryHolidayTypes=Ga naar <strong>Home-Instellingen-Woordenboeken-Soort verlofzoeken</strong> voor het opzetten van verschillende soorten verlofverzoeken.
diff --git a/htdocs/langs/nl_NL/install.lang b/htdocs/langs/nl_NL/install.lang
index 9170be189ae..e8ab173aedc 100644
--- a/htdocs/langs/nl_NL/install.lang
+++ b/htdocs/langs/nl_NL/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=Configuratiebestand <b>%s</b> bestaat
 ConfFileCouldBeCreated=Configuratiebestand <b>%s</b> kon worden gecreëerd.
 ConfFileIsNotWritable=Configuratie bestand <b>%s</b> is niet voor schrijven te openen. Voor de eerste installatie, moet de webserver toestemming krijgen om naar dit bestand te schrijven tijdens het configuratieproces (door bijvoorbeeld "chmod 666" op een Unix-achtig OS).
 ConfFileIsWritable=Configuratiebestand <b>%s</b> kan voor schrijven geopend worden.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reload alle informatie van configuratiebestand.
 PHPSupportSessions=Deze PHP installatie ondersteund sessies.
 PHPSupportPOSTGETOk=Deze PHP installatie ondersteunt POST en GET.
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Aanmaken Dolibarr administrator account niet geslaagd.
 WarningRemoveInstallDir=Waarschuwing, om veiligheidsredenen, dient u de <b>install</b> map na de installatie of upgrade te verwijderen of maak een bestand genaamd <b>install.lock</b> aan in de Dolibarr root map.
 FunctionNotAvailableInThisPHP=Niet beschikbaar in deze PHP installatie
 ChoosedMigrateScript=Kies het migratiescript
-DataMigration=Gegevensmigratie
-DatabaseMigration=Structuur databasemigratie
+DataMigration=Database migratie (gegevens)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script verwerking
 ChooseYourSetupMode=Kies de gewenste installatiemethode en klik op "Start"...
 FreshInstall=Nieuwe installatie
@@ -146,7 +147,7 @@ NothingToDo=Niets te doen
 # upgrade
 MigrationFixData=Reparatie voor gedenormaliseerde gegevens
 MigrationOrder=Gegevensmigratie van orders van afnemers
-MigrationSupplierOrder=Gegevensmigratie van orders van leveranciers
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Gegevensmigratie van zakelijke voorstellen
 MigrationInvoice=Gegevensmigratie van afnemersfacturen
 MigrationContract=Gegevensmigratie van contracten
@@ -196,6 +197,8 @@ MigrationEvents=Migratie van taken om taak eigenaar toe te voegen in toekennings
 MigrationEventsContact=Migratie van evenementen om afspraakcontact toe te voegen aan de toewijzingstabel
 MigrationRemiseEntity=Aanpassen entity veld waarde van llx_societe_remise
 MigrationRemiseExceptEntity=Aanpassen entity veld waarde van llx_societe_remise_except
+MigrationUserRightsEntity=Aanpassen entity veld waarde van llx_user_rights
+MigrationUserGroupRightsEntity=Aanpassen entity veld waarde van llx_usergroup_rights
 MigrationReloadModule=Herlaad module %s
 MigrationResetBlockedLog=Reset BlockedLog module voor v7 algoritme
 ShowNotAvailableOptions=Toon niet beschikbare opties
diff --git a/htdocs/langs/nl_NL/ldap.lang b/htdocs/langs/nl_NL/ldap.lang
index 846d7f439ad..1057185d34b 100644
--- a/htdocs/langs/nl_NL/ldap.lang
+++ b/htdocs/langs/nl_NL/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Wachtwoord voor het domein
 YouMustChangePassNextLogon=Wachtwoord voor de gebruiker <b>%s</b> op het domein <b>%s</b> dient te worden gewijzigd.
 UserMustChangePassNextLogon=Gebruiker dient het wachtwoord te wijzigen op het domein %s
 LDAPInformationsForThisContact=Informatie in LDAP database voor dit contact
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Soort lidmaatschap gesynchroniseerd
 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=Password of user in LDAP
diff --git a/htdocs/langs/nl_NL/loan.lang b/htdocs/langs/nl_NL/loan.lang
index 1e0da4d0202..d278b613571 100644
--- a/htdocs/langs/nl_NL/loan.lang
+++ b/htdocs/langs/nl_NL/loan.lang
@@ -10,46 +10,22 @@ LoanCapital=Kapitaal
 Insurance=Verzekering
 Interest=Rente
 Nbterms=Aantal termijnen
+Term=Term
 LoanAccountancyCapitalCode=Tegenrekening Lening
 LoanAccountancyInsuranceCode=Tegenrekening verzekering
 LoanAccountancyInterestCode=Tegenrekening rente
 ConfirmDeleteLoan=Bevestigen verwijderen lening
 LoanDeleted=Lening verwijderd
-ConfirmPayLoan=Confirm classify paid this loan
+ConfirmPayLoan=Bevestig dat deze lening is betaald
 LoanPaid=Afgeloste lening
-# Calc
-LoanCalc=Lening Calculator
-PurchaseFinanceInfo=Aankoop- en Financiering informatie
-SalePriceOfAsset=Onderliggende waarde
-PercentageDown=Lager percentage
-LengthOfMortgage=Duur lening
-AnnualInterestRate=Rente tarief
-ExplainCalculations=Verklaar berekeningen
-ShowMeCalculationsAndAmortization=Toon berekeningen en amortisatieschema
-MortgagePaymentInformation=Informatie hypotheekbetaling
-DownPayment=Aanbetaling
-DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
-InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
-MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
-MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
-MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
-MonthlyPaymentDesc=Het maandbedrag is tot stand gekomen door gebruik van de volgende formule
-AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
-AmountFinanced=Gefinancierd bedrag
-AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
-Totalsforyear=Totalen per jaar
-MonthlyPayment=Maandelijks bedrag
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
-GoToInterest=%s will go towards INTEREST
-GoToPrincipal=%s will go towards PRINCIPAL
-YouWillSpend=You will spend %s in year %s
-ListLoanAssociatedProject=List of loan associated with the project
+ListLoanAssociatedProject=Leningen die aan het project zijn gekoppeld
 AddLoan=Aanmaken lening
+FinancialCommitment=Financiële verplichting
+InterestAmount=Rente
+CapitalRemain=Capital remain
 # Admin
-ConfigLoan=Configuration of the module loan
+ConfigLoan=Configuratie van de module lening
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Standaard grootboekrekening kapitaal
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Standaard grootboekrekening rente
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Standaard grootboekrekening verzekeringen
-FinancialCommitment=Financial commitment
-CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
+CreateCalcSchedule=Bewerk financiële betrokkenheid
diff --git a/htdocs/langs/nl_NL/mails.lang b/htdocs/langs/nl_NL/mails.lang
index e32217b1c53..b0bde14bfbb 100644
--- a/htdocs/langs/nl_NL/mails.lang
+++ b/htdocs/langs/nl_NL/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Afzender
 MailErrorsTo=Fouten naar
 MailReply=Antwoorden naar
 MailTo=Ontvanger(s)
+MailToUsers=To user(s)
 MailCC=Kopiëren naar
+MailToCCUsers=Copy to users(s)
 MailCCC=Gecachde kopie aan
 MailTopic=Onderwerp e-mail
 MailText=Bericht
@@ -39,10 +41,10 @@ MailSuccessfulySent=E-mail berichten (%s tot %s) zijn geaccepteerd voor verzendi
 MailingSuccessfullyValidated=Emailing succesvol gevalideerd
 MailUnsubcribe=Uitschrijven
 MailingStatusNotContact=Niet meer contacten
-MailingStatusReadAndUnsubscribe=Read and unsubscribe
+MailingStatusReadAndUnsubscribe=Lezen en afmelden
 ErrorMailRecipientIsEmpty=E-mailadres ontvanger is leeg
 WarningNoEMailsAdded=Geen nieuw E-mailadres aan de lijst van ontvangers toe te voegen.
-ConfirmValidMailing=Are you sure you want to validate this emailing?
+ConfirmValidMailing=Weet u zeker dat u deze e-mail wilt valideren?
 ConfirmResetMailing=Warning, by reinitializing emailing <b>%s</b>, you allow to make a mass sending of this email another time. Are you sure you this is what you want to do?
 ConfirmDeleteMailing=Are you sure you want to delete this emailling?
 NbOfUniqueEMails=Aantal unieke e-mails
@@ -67,7 +69,7 @@ MailingStatusRead=Lezen
 YourMailUnsubcribeOK=De e-mail<b>%s</b> is correct uitgeschreven uit de mailinglijst
 ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=E-mail verzonden naar %s ontvangers.
-EMailSentForNElements=EMail sent for %s elements.
+EMailSentForNElements=E-mail verzonden voor %s elementen .
 XTargetsAdded=<b>%s</b> ontvangers toegevoegd in bestemming-lijst
 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 attachment in mass sending in this version).
 AllRecipientSelected=The recipients of the %s record selected (if their email is known).
@@ -78,7 +80,7 @@ ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
-SentXXXmessages=%s message(s) sent.
+SentXXXmessages=%s bericht (en) verzonden.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third party category
@@ -112,9 +114,9 @@ ToAddRecipientsChooseHere=Voeg geadresseerden toe door deze uit de lijst te kiez
 NbOfEMailingsReceived=Bulk Emailings ontvangen
 NbOfEMailingsSend=Mailings verstuurd
 IdRecord=ID-tabelregel
-DeliveryReceipt=Delivery Ack.
+DeliveryReceipt=Ontvangstbevestiging
 YouCanUseCommaSeparatorForSeveralRecipients=U kunt het <b>komma</b> scheidingsteken gebruiken om meerdere ontvangers te specificeren.
-TagCheckMail=Track mail opening
+TagCheckMail=Volg geopende mail
 TagUnsubscribe=Uitschrijf link
 TagSignature=Ondertekening verzendende gebruiker
 EMailRecipient=Ontvanger e-mail
@@ -164,4 +166,4 @@ InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Informatie
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang
index dccbd1ba9ef..dab7ec711fa 100644
--- a/htdocs/langs/nl_NL/main.lang
+++ b/htdocs/langs/nl_NL/main.lang
@@ -71,12 +71,12 @@ SelectDate=Selecteer een datum
 SeeAlso=Zie ook %s
 SeeHere=Zie hier
 ClickHere=Klik hier
-Here=Here
+Here=Hier
 Apply=Toepassen
 BackgroundColorByDefault=Standaard achtergrondkleur
 FileRenamed=The file was successfully renamed
 FileGenerated=Het bestand is succesvol aangemaakt
-FileSaved=The file was successfully saved
+FileSaved=Het bestand is succesvol opgeslagen
 FileUploaded=Het bestand is geüpload
 FileTransferComplete=Bestand(en) succesvol geupload
 FilesDeleted=File(s) successfully deleted
@@ -92,19 +92,20 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is se
 Administrator=Beheerder
 Undefined=Ongedefineerd
 PasswordForgotten=Wachtwoord vergeten?
+NoAccount=No account?
 SeeAbove=Zie hierboven
 HomeArea=Home
 LastConnexion=Laatste connectie
 PreviousConnexion=Laatste keer ingelogd
-PreviousValue=Previous value
+PreviousValue=Vorige waarde
 ConnectedOnMultiCompany=Aangesloten bij Meervoudig bedrijf
 ConnectedSince=Aangesloten sinds
 AuthenticationMode=Authentificatie modus
 RequestedUrl=Gezochte URL
 DatabaseTypeManager=Database Type Manager
 RequestLastAccessInError=Database fout bij laatste verzoek
-ReturnCodeLastAccessInError=Return code for latest database access request error
-InformationLastAccessInError=Information for latest database access request error
+ReturnCodeLastAccessInError=Retourcode voor de meest recente fout bij het toegangsverzoek voor de database
+InformationLastAccessInError=Informatie voor de meest recente database-toegangsverzoekfout
 DolibarrHasDetectedError=Dolibarr heeft een technische fout gedetecteerd
 YouCanSetOptionDolibarrMainProdToZero=You can read log file or set option $dolibarr_main_prod to '0' in your config file to get more information.
 InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to remove such notices)
@@ -204,7 +205,7 @@ Parameter=Instelling
 Parameters=Instellingen
 Value=Waarde
 PersonalValue=Persoonlijke waarde
-NewObject=New %s
+NewObject=Nieuw %s
 NewValue=Nieuwe waarde
 CurrentValue=Huidige waarde
 Code=Code
@@ -231,7 +232,7 @@ Limit=Limiet
 Limits=Grenzen
 Logout=Uitloggen
 NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Inloggen
+Connection=Login
 Setup=Instellingen
 Alert=Kennisgevingen
 MenuWarnings=Kennisgevingen
@@ -265,7 +266,7 @@ DateProcess=Procesdatum
 DateBuild=Datum van rapportgeneratie
 DatePayment=Datum van betaling
 DateApprove=Goedkeurings datum
-DateApprove2=Goedkeurings datum (tweede goedkeuring)
+DateApprove2=Datum akkoord (tweede)
 RegistrationDate=Registration date
 UserCreation=Aanmaken gebruiker
 UserModification=Wijzigen gebruiker
@@ -326,7 +327,7 @@ Copy=Kopiëren
 Paste=Plakken
 Default=Standaard
 DefaultValue=Standaardwaarde
-DefaultValues=Default values
+DefaultValues=Standaard waarden
 Price=Prijs
 PriceCurrency=Price (currency)
 UnitPrice=Eenheidsprijs
@@ -382,7 +383,7 @@ TotalLT2IN=Total SGST
 HT=Exclusief BTW
 TTC=Inclusief BTW
 INCVATONLY=Inc. VAT
-INCT=Inc. all taxes
+INCT=Incl. alle belastingen
 VAT=BTW
 VATIN=IGST
 VATs=BTW
@@ -402,6 +403,7 @@ DefaultTaxRate=BTW tarief
 Average=Gemiddeld
 Sum=Som
 Delta=Variantie
+RemainToPay=Remain to pay
 Module=Module/Applicatie
 Modules=Modules/Applications
 Option=Optie
@@ -414,7 +416,7 @@ Favorite=Favoriet
 ShortInfo=Info.
 Ref=Referentie
 ExternalRef=Ref. extern
-RefSupplier=Leverancierreferentie
+RefSupplier=Ref. vendor
 RefPayment=Betalingskenmerk
 CommercialProposalsShort=Offertes
 Comment=Opmerking
@@ -452,13 +454,13 @@ Duration=Duur
 TotalDuration=Totale duur
 Summary=Samenvatting
 DolibarrStateBoard=Database statistieken
-DolibarrWorkBoard=Te verwerken items in dashboard
+DolibarrWorkBoard=In behandeling
 NoOpenedElementToProcess=No opened element to process
 Available=Beschikbaar
 NotYetAvailable=Nog niet beschikbaar
 NotAvailable=Niet beschikbaar
-Categories=Tags / categorieën
-Category=Tag / categorie
+Categories=Labels/categorieën
+Category=Label/categorie
 By=Door
 From=Van
 to=aan
@@ -471,7 +473,7 @@ Quantity=Hoeveelheid
 Qty=Aantal
 ChangedBy=Veranderd door
 ApprovedBy=Goedgekeurd door
-ApprovedBy2=Goedgekeurd door (tweede goedkeuring)
+ApprovedBy2=Goedgekeurd door (tweede keuring)
 Approved=Goedgekeurd
 Refused=Geweigerd
 ReCalculate=Herberekenen
@@ -493,7 +495,7 @@ Received=Ontvangen
 Paid=Betaald
 Topic=Onderwerp
 ByCompanies=Door bedrijven
-ByUsers=Door gebruikers
+ByUsers=By user
 Links=Links
 Link=Link
 Rejects=Verworpen
@@ -601,7 +603,7 @@ FindBug=Rapporteer een bug
 NbOfThirdParties=Aantal derden
 NbOfLines=Aantal regels
 NbOfObjects=Aantal objecten
-NbOfObjectReferers=Number of related items
+NbOfObjectReferers=Aantal gerelateerde items
 Referers=Gerelateerde items
 TotalQuantity=Totale hoeveelheid
 DateFromTo=Van %s naar %s
@@ -619,9 +621,9 @@ BuildDoc=Genereer Document
 Entity=Entiteit
 Entities=Entiteiten
 CustomerPreview=Afnemersvoorbeeldweergave
-SupplierPreview=Leverancier voorbeeldweergave
+SupplierPreview=Vendor preview
 ShowCustomerPreview=Toon afnemersvoorbeeldweergave
-ShowSupplierPreview=Toon leverancier voorbeeldweergave
+ShowSupplierPreview=Show vendor preview
 RefCustomer=Referentie afnemer
 Currency=Valuta
 InfoAdmin=Informatie voor beheerders
@@ -672,14 +674,14 @@ PartialWoman=Gedeeltelijke
 TotalWoman=Totaal
 NeverReceived=Nooit ontvangen
 Canceled=Geannuleerd
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu Setup - Dictionaries
-YouCanChangeValuesForThisListFrom=You can change values for this list from menu %s
+YouCanChangeValuesForThisListFromDictionarySetup=U kunt waarden voor deze lijst wijzigen via menu-instellingen - woordenboek
+YouCanChangeValuesForThisListFrom=U kunt de waarden van dit menu aanpassen via %s
 YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
 Color=Kleur
 Documents=Gekoppelde bestanden
 Documents2=Documenten
 UploadDisabled=Uploaden uitgeschakeld
-MenuAccountancy=Boekhouden
+MenuAccountancy=Boekhouding
 MenuECM=Documenten
 MenuAWStats=AWStats
 MenuMembers=Leden
@@ -802,7 +804,7 @@ ShowContract=Toon contract
 GoIntoSetupToChangeLogo=Ga naar Home - Setup - Bedrijf om logo te wijzigen of ga naar Home - Instellingen - Scherm om te verbergen.
 Deny=Wijgeren
 Denied=Gewijgerd
-ListOf=List of %s
+ListOf=Lijst van %s
 ListOfTemplates=Lijst van templates
 Gender=Geslacht
 Genderman=Man
@@ -814,7 +816,7 @@ GoodBye=GoodBye
 Sincerely=Oprecht
 DeleteLine=Verwijderen regel
 ConfirmDeleteLine=Weet u zeker dat u deze regel wilt verwijderen?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
+NoPDFAvailableForDocGenAmongChecked=Er was geen PDF beschikbaar voor het genereren van documenten bij gecontroleerde records
 TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record.
 NoRecordSelected=Geen record geselecteerd
 MassFilesArea=Area for files built by mass actions
@@ -838,7 +840,7 @@ Calendar=Kalender
 GroupBy=Sorteer op
 ViewFlatList=Weergeven als lijst
 RemoveString='%s' string verwijderen
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
+SomeTranslationAreUncomplete=Sommige talen zijn mogelijk gedeeltelijk vertaald of bevatten fouten. Als u dit ziet kunt u taalbestanden repareren door u zich registreren op <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/ Dolibarr /</a>.
 DirectDownloadLink=Directe download link (openbaar/extern)
 DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
 Download=Downloaden
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=Diensten of Producten
 SearchIntoProjects=Projecten
 SearchIntoTasks=Taken
 SearchIntoCustomerInvoices=Klantenfactuur
-SearchIntoSupplierInvoices=Leveranciersfacturen
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Klantenbestelling
-SearchIntoSupplierOrders=Leveranciersopdrachten
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=Klantenoffertes
-SearchIntoSupplierProposals=Leveranciersoffertes
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Interventies
 SearchIntoContracts=Contracten
 SearchIntoCustomerShipments=Klantzendingen
@@ -941,3 +943,5 @@ Remote=Remote
 LocalAndRemote=Local and Remote
 KeyboardShortcut=Keyboard shortcut
 AssignedTo=Geaffecteerden
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/nl_NL/margins.lang b/htdocs/langs/nl_NL/margins.lang
index 27b981ebed1..3ebafd0a4d7 100644
--- a/htdocs/langs/nl_NL/margins.lang
+++ b/htdocs/langs/nl_NL/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=Als een dienst
 UseDiscountOnTotal=Op subtotaal
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Definieert als een globale discount wordt behandelt als een training, een dienst, of alleen een subtotaal voor marge berekening.
 MARGIN_TYPE=Inkoop/kostprijs voorgesteld al standaard bij margeberekening
-MargeType1=Marge op gunstigste inkoopprijs
-MargeType2=Marge op gewogen inkoopprijs 
+MargeType1=Margin on Best vendor price
+MargeType2=Marge op gewogen inkoopprijs (GIP)
 MargeType3=Marge inkoopprijs
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Kostprijs
 UnitCharges=Unit toeslag
 Charges=Toeslag
diff --git a/htdocs/langs/nl_NL/members.lang b/htdocs/langs/nl_NL/members.lang
index 072a0ee2803..e4c06a9aee5 100644
--- a/htdocs/langs/nl_NL/members.lang
+++ b/htdocs/langs/nl_NL/members.lang
@@ -55,11 +55,11 @@ NewCotisation=Nieuwe bijdrage
 PaymentSubscription=Nieuwe bijdragebetaling
 SubscriptionEndDate=Einddatum abonnement
 MembersTypeSetup=Ledentype instellen
-MemberTypeModified=Member type modified
-DeleteAMemberType=Delete a member type
-ConfirmDeleteMemberType=Are you sure you want to delete this member type?
-MemberTypeDeleted=Member type deleted
-MemberTypeCanNotBeDeleted=Member type can not be deleted
+MemberTypeModified=Lid gewijzigd
+DeleteAMemberType=Lid verwijderen
+ConfirmDeleteMemberType=Weet u zeker dat u dit lid wilt verwijderen?
+MemberTypeDeleted=Lid verwijderd
+MemberTypeCanNotBeDeleted=Lid kan niet worden verwijderd
 NewSubscription=Nieuw abonnement
 NewSubscriptionDesc=Met dit formulier kunt u uw abonnement te nemen als nieuw lid van de stichting. Wilt u uw abonnement te verlengen (indien reeds lid is), dan kunt u in plaats daarvan contact op met stichtingsbestuur via e-mail %s.
 Subscription=Abonnement
@@ -87,7 +87,7 @@ DeleteSubscription=Abonnement verwijderen
 ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
 Filehtpasswd=htpasswd bestand
 ValidateMember=Valideer een lid
-ConfirmValidateMember=Are you sure you want to validate this member?
+ConfirmValidateMember=Weet u zeker dat u dit lid wilt valideren?
 FollowingLinksArePublic=De volgende links zijn publieke pagina's die niet beschermd worden door Dolibarr. Het zijn niet opgemaakte voorbeeldpagina's om te tonen hoe de ledenlijst database eruit ziet.
 PublicMemberList=Publieke ledenlijst
 BlankSubscriptionForm=Abonnement aanmeldformulier (openbaar)
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
@@ -190,7 +190,7 @@ VATToUseForSubscriptions=BTW tarief voor inschrijvingen
 NoVatOnSubscription=Geen BTW bij inschrijving
 MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product gebruikt voor abbonement regel in factuur: %s
-NameOrCompany=Name or company
+NameOrCompany=Naam of Bedrijf
 SubscriptionRecorded=Subscription recorded
 NoEmailSentToMember=No email sent to member
 EmailSentToMember=Email sent to member at %s
diff --git a/htdocs/langs/nl_NL/modulebuilder.lang b/htdocs/langs/nl_NL/modulebuilder.lang
index 0ae2b4e42a8..abfe45f336e 100644
--- a/htdocs/langs/nl_NL/modulebuilder.lang
+++ b/htdocs/langs/nl_NL/modulebuilder.lang
@@ -6,7 +6,7 @@ ModuleBuilderDesc2=Path where modules are generated/edited (first alternative di
 ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong>
 ModuleBuilderDesc4=A module is detected as 'editable' when the file <strong>%s</strong> exists in root of module directory
 NewModule=Nieuwe module
-NewObject=New object
+NewObject=Nieuw object
 ModuleKey=Module key
 ObjectKey=Object key
 ModuleInitialized=Module geïnitialiseerd
@@ -18,7 +18,7 @@ ModuleBuilderDescobjects=Define here the objects you want to manage with your mo
 ModuleBuilderDescmenus=This tab is dedicated to define menu entries provided by your module.
 ModuleBuilderDescpermissions=This tab is dedicated to define the new permissions you want to provide with your module.
 ModuleBuilderDesctriggers=This is the view of triggers provided by your module. To include code executed when a triggered business event is launched, just edit this file.
-ModuleBuilderDeschooks=This tab is dedicated to hooks.
+ModuleBuilderDeschooks=Dit tabblad is gewijd aan haken.
 ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
 ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
 EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All files of module but also structured data and documentation will be definitly lost !
@@ -45,26 +45,26 @@ SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=Bestand nog niet aangemaakt
 RegenerateClassAndSql=Erase and regenerate class and sql files
 RegenerateMissingFiles=Generate missing files
-SpecificationFile=File with business rules
+SpecificationFile=Bestand met bedrijfsregels
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
-NotNull=Not NULL
+NotNull=Niet NULL
 NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
-DatabaseIndex=Database index
-FileAlreadyExists=File %s already exists
+DatabaseIndex=Database-index
+FileAlreadyExists=Bestand %s bestaat reeds
 TriggersFile=File for triggers code
 HooksFile=File for hooks code
 ArrayOfKeyValues=Array of key-val
 ArrayOfKeyValuesDesc=Array of keys and values if field is a combo list with fixed values
-WidgetFile=Widget file
-ReadmeFile=Readme file
-ChangeLog=ChangeLog file
+WidgetFile=Widget-bestand
+ReadmeFile=Leesmij-bestand
+ChangeLog=ChangeLog-bestand
 TestClassFile=File for PHP Unit Test class
-SqlFile=Sql file
+SqlFile=Sql-bestand
 PageForLib=File for PHP libraries
 SqlFileExtraFields=Sql file for complementary attributes
-SqlFileKey=Sql file for keys
+SqlFileKey=Sql-bestand voor keys
 AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
 UseAsciiDocFormat=You can use Markdown format, but it is recommanded to use Asciidoc format (Comparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Is a measure
@@ -89,9 +89,9 @@ SeeReservedIDsRangeHere=See range of reserved IDs
 ToolkitForDevelopers=Toolkit for Dolibarr developers
 TryToUseTheModuleBuilder=If you have knowledge in SQL and PHP, you can try to use the native module builder wizard. Just enable the module and use the wizard by clicking the <span class="fa fa-bug"></span> on the top right menu. Warning: This is a developer feature, bad use may breaks your application.
 SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
-AddLanguageFile=Add language file
+AddLanguageFile=Taalbestand toevoegen
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
 DropTableIfEmpty=(Delete table if empty)
-TableDoesNotExists=The table %s does not exists
+TableDoesNotExists=Tabel %s bestaat niet
 TableDropped=Table %s deleted
 InitStructureFromExistingTable=Build the structure array string of an existing table
diff --git a/htdocs/langs/nl_NL/opensurvey.lang b/htdocs/langs/nl_NL/opensurvey.lang
index fe9e27eb543..410e51d159f 100644
--- a/htdocs/langs/nl_NL/opensurvey.lang
+++ b/htdocs/langs/nl_NL/opensurvey.lang
@@ -21,7 +21,7 @@ TheBestChoices=The best choices currently are
 with=with
 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.
 CommentsOfVoters=Comments of voters
-ConfirmRemovalOfPoll=Are you sure you want to remove this poll (and all votes)
+ConfirmRemovalOfPoll=Weet u zeker dat u deze poll (met alle stemmen) wilt verwijderen?
 RemovePoll=Remove poll
 UrlForSurvey=URL to communicate to get a direct access to poll
 PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll:
@@ -58,3 +58,4 @@ MoreChoices=Enter more choices for the voters
 SurveyExpiredInfo=The poll has been closed or voting delay has expired.
 EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
 ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/nl_NL/orders.lang b/htdocs/langs/nl_NL/orders.lang
index b74475fd533..865a01fc079 100644
--- a/htdocs/langs/nl_NL/orders.lang
+++ b/htdocs/langs/nl_NL/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Klantenorders overzicht
-SuppliersOrdersArea=Leverancierorders overzicht
+SuppliersOrdersArea=Purchase orders area
 OrderCard=Opdrachtenkaart
 OrderId=Ordernr
 Order=Order
@@ -13,18 +13,18 @@ OrderToProcess=Te verwerken opdracht
 NewOrder=Nieuwe opdracht
 ToOrder=Te bestellen
 MakeOrder=Opdracht indienen
-SupplierOrder=Leveranciersopdracht
-SuppliersOrders=Leveranciersopdrachten
-SuppliersOrdersRunning=Huidige leveranciersopdrachten
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=Afnemersopdracht
-CustomersOrders=Klantenbestelling
+CustomersOrders=Bestellingen klanten
 CustomersOrdersRunning=Huidige klantbestelling
 CustomersOrdersAndOrdersLines=Customer orders and order lines
-OrdersDeliveredToBill=Customer orders delivered to bill
-OrdersToBill=Customer orders delivered
-OrdersInProcess=Customer orders in process
-OrdersToProcess=Customer orders to process
-SuppliersOrdersToProcess=Te verwerken leverancierbestellingen
+OrdersDeliveredToBill=Geleverde klantbestellingen te factureren
+OrdersToBill=Geleverde klanten bestellingen
+OrdersInProcess=Klanten bestelling in voortgang
+OrdersToProcess=Openstaande klanten bestelling
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=Geannuleerd
 StatusOrderDraftShort=Concept
 StatusOrderValidatedShort=Gevalideerd
@@ -40,7 +40,7 @@ StatusOrderRefusedShort=Geweigerd
 StatusOrderBilledShort=Gefactureerd
 StatusOrderToProcessShort=Te verwerken
 StatusOrderReceivedPartiallyShort=Gedeeltelijk ontvangen
-StatusOrderReceivedAllShort=Products received
+StatusOrderReceivedAllShort=Producten ontvangen
 StatusOrderCanceled=Geannuleerd
 StatusOrderDraft=Concept (moet worden gevalideerd)
 StatusOrderValidated=Gevalideerd
@@ -52,7 +52,7 @@ StatusOrderApproved=Goedgekeurd
 StatusOrderRefused=Geweigerd
 StatusOrderBilled=Gefactureerd
 StatusOrderReceivedPartially=Gedeeltelijk ontvangen
-StatusOrderReceivedAll=All products received
+StatusOrderReceivedAll=Alle producten ontvangen
 ShippingExist=Een zending bestaat
 QtyOrdered=Aantal besteld
 ProductQtyInDraft=Hoeveelheid producten in de ontwerp bestellingen
@@ -68,41 +68,41 @@ ValidateOrder=Valideer opdracht
 UnvalidateOrder=Unvalidate order
 DeleteOrder=Verwijder opdracht
 CancelOrder=Annuleer opdracht
-OrderReopened= Order %s Reopened
+OrderReopened= Order %s opnieuw geopend
 AddOrder=Nieuwe bestelling
 AddToDraftOrders=Voeg toe aan order in aanmaak
 ShowOrder=Toon opdracht
 OrdersOpened=Te verwerken opdracht
 NoDraftOrders=Geen orders in aanmaak
-NoOrder=No order
-NoSupplierOrder=Geen leveranciersopdracht
-LastOrders=Latest %s customer orders
-LastCustomerOrders=Latest %s customer orders
-LastSupplierOrders=Latest %s supplier orders
+NoOrder=Geen order
+NoSupplierOrder=No purchase order
+LastOrders=Laatste %s klantbestellingen
+LastCustomerOrders=Laatste %s klantbestellingen
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=Laatste %s aangepaste orders
 AllOrders=Alle opdrachten
 NbOfOrders=Aantal opdrachten
 OrdersStatistics=Opdrachtenstatistieken
-OrdersStatisticsSuppliers=Leveranciersopdrachtenstatistieken
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Aantal opdrachten per maand
 AmountOfOrdersByMonthHT=Aantal orders per maand (zonder btw)
 ListOfOrders=Opdrachtenlijst
 CloseOrder=Opdracht sluiten
-ConfirmCloseOrder=Are you sure you want to set this order to deliverd? Once an order is delivered, it can be set to billed.
-ConfirmDeleteOrder=Are you sure you want to delete this order?
-ConfirmValidateOrder=Are you sure you want to validate this order under name <b>%s</b>?
-ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> to draft status?
-ConfirmCancelOrder=Are you sure you want to cancel this order?
-ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b>?
+ConfirmCloseOrder=Weet u zeker dat u deze order als geleverd wilt markeren? Als een order is geleverd kan hij worden gefactureerd.
+ConfirmDeleteOrder=Weet u zeker dat u deze order wilt verwijderen?
+ConfirmValidateOrder=Weet u zeker dat u deze opdracht wilt valideren als <b>%s</b>?
+ConfirmUnvalidateOrder=Weet u zeker dat u order <b>%s</b> wilt herstellen naar ontwerpstatus?
+ConfirmCancelOrder=Weet u zeker dat u deze order wilt annuleren?
+ConfirmMakeOrder=Weet u zeker dat u deze order wilt bevestigen op <b>%s</b>?
 GenerateBill=Genereer factuur
 ClassifyShipped=Is geleverd
 DraftOrders=Conceptopdrachten
-DraftSuppliersOrders=Concept bestelorder
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=Opdrachten in behandeling
 RefOrder=Ref. Opdracht
-RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for supplier
-RefOrderSupplierShort=Ref. order supplier
+RefCustomerOrder=Order ref. voor klant
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=Verzend opdracht per post
 ActionsOnOrder=Acties op opdrachten
 NoArticleOfTypeProduct=Geen enkel artikel van het type "product", dus geen verzendbaar artikel voor deze opdracht
@@ -111,13 +111,13 @@ AuthorRequest=Auteur / Aanvrager
 UserWithApproveOrderGrant=Gebruikers gerechtigd met het recht "Opdrachten goedkeuren".
 PaymentOrderRef=Betaling van opdracht %s
 CloneOrder=Kloon opdracht
-ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
+ConfirmCloneOrder=Weet u zeker dat u order <b>%s</b> wilt klonen?
 DispatchSupplierOrder=Ontvangst van leveranciersopdracht %s
 FirstApprovalAlreadyDone=Eerste goedkeuring al gedaan
 SecondApprovalAlreadyDone=Tweede goedkeuring al gedaan
-SupplierOrderReceivedInDolibarr=Supplier order %s received %s
-SupplierOrderSubmitedInDolibarr=Supplier order %s submited
-SupplierOrderClassifiedBilled=Supplier order %s set billed
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Andere opdrachten
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Vertegenwoordiger die follow-up van afnemersopdracht doet
@@ -125,11 +125,11 @@ TypeContact_commande_internal_SHIPPING=Vertegenwoordiger die follow-up van verze
 TypeContact_commande_external_BILLING=Afnemersfactuurcontactpersoon
 TypeContact_commande_external_SHIPPING=Afnemersverzendingscontactpersoon
 TypeContact_commande_external_CUSTOMER=Afnemerscontact die follow-up van opdracht doet
-TypeContact_order_supplier_internal_SALESREPFOLL=Vertegenwoordiger die follow-up van leveranciersopdracht doet
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Vertegenwoordiger die follow-up van verzending doet
-TypeContact_order_supplier_external_BILLING=Leveranciersfactuurcontactpersoon
-TypeContact_order_supplier_external_SHIPPING=Leveranciersverzendingcontactpersoon
-TypeContact_order_supplier_external_CUSTOMER=Leverancierscontact die de follow-up van de opdracht doet
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constante COMMANDE_SUPPLIER_ADDON niet gedefinieerd
 Error_COMMANDE_ADDON_NotDefined=Constante COMMANDE_ADDON niet gedefinieerd
 Error_OrderNotChecked=Geen te factureren order gekozen
@@ -153,6 +153,6 @@ OrderFail=Fout tijdens aanmaken order
 CreateOrders=Maak orders
 ToBillSeveralOrderSelectCustomer=Om een factuur voor verscheidene orden te creëren, klikt eerste op klant, dan kies "%s".
 OptionToSetOrderBilledNotEnabled=Option (from module Workflow) to set order to 'Billed' automatically when invoice is validated is off, so you will have to set status of order to 'Billed' manually.
-IfValidateInvoiceIsNoOrderStayUnbilled=If invoice validation is 'No', the order will remain to status 'Unbilled' until the invoice is validated.
-CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
-SetShippingMode=Set shipping mode
+IfValidateInvoiceIsNoOrderStayUnbilled=Als een factuur niet is gevalideerd, zal hij de status "niet gefactureerd" behouden tot validering.
+CloseReceivedSupplierOrdersAutomatically=Sluit order automatisch als "%s" bij ontvangst van alle producten.
+SetShippingMode=Kies verzendwijze
diff --git a/htdocs/langs/nl_NL/other.lang b/htdocs/langs/nl_NL/other.lang
index 76e1857d38b..2e75c081f94 100644
--- a/htdocs/langs/nl_NL/other.lang
+++ b/htdocs/langs/nl_NL/other.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - other
 SecurityCode=Beveiligingscode
-NumberingShort=N°
+NumberingShort=N °
 Tools=Gereedschap
 TMenuTools=Gereedschap
 ToolsDesc=All miscellaneous tools not included in other menu entries are collected here.<br><br>All the tools can be reached in the left menu.
@@ -17,7 +17,7 @@ TextPreviousMonthOfInvoice=Voorgaande maand (tekst) van factuurdatum.
 NextMonthOfInvoice=Volgende maand (nummer 1-12) van factuurdatum
 TextNextMonthOfInvoice=Volgende maand (tekst) van factuurdatum
 ZipFileGeneratedInto=ZIP bestand aangemaakt in <b>%s</b>.
-DocFileGeneratedInto=Doc file generated into <b>%s</b>.
+DocFileGeneratedInto=Doc-bestand aangemaakt in <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
 MessageForm=Message on online payment form
 MessageOK=Bericht opde  bevestigingspagina van een gevalideerde betaling
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Geachte)__\n\nU ontvangt hierbij order  __REF__\n\n\n__(Hoogachtend)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -105,12 +105,12 @@ ModifiedBy=Gewijzigd door %s
 ValidatedBy=Gevalideerd door %s
 ClosedBy=Gesloten door %s
 CreatedById=User id who created
-ModifiedById=User id who made latest change
+ModifiedById=Gebruikers-ID van diegene die de laatste wijziging heeft aangebracht
 ValidatedById=User id who validated
 CanceledById=User id who canceled
 ClosedById=User id who closed
 CreatedByLogin=User login who created
-ModifiedByLogin=User login who made latest change
+ModifiedByLogin=Gebruikerslogin van diegene die de laatste wijziging heeft aangebracht
 ValidatedByLogin=User login who validated
 CanceledByLogin=User login who canceled
 ClosedByLogin=User login who closed
@@ -174,13 +174,13 @@ StatsByNumberOfUnits=Statistics for sum of qty of products/services
 StatsByNumberOfEntities=Statistics in number of referring entities (nb of invoice, or order...)
 NumberOfProposals=Number of proposals
 NumberOfCustomerOrders=Number of customer orders
-NumberOfCustomerInvoices=Number of customer invoices
+NumberOfCustomerInvoices=Aantal klant facturen
 NumberOfSupplierProposals=Number of supplier proposals
 NumberOfSupplierOrders=Number of supplier orders
 NumberOfSupplierInvoices=Number of supplier invoices
 NumberOfUnitsProposals=Number of units on proposals
 NumberOfUnitsCustomerOrders=Number of units on customer orders
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices
+NumberOfUnitsCustomerInvoices=Aantal eenheden op klant facturen
 NumberOfUnitsSupplierProposals=Number of units on supplier proposals
 NumberOfUnitsSupplierOrders=Number of units on supplier orders
 NumberOfUnitsSupplierInvoices=Number of units on supplier invoices
@@ -218,7 +218,7 @@ FileIsTooBig=Bestanden is te groot
 PleaseBePatient=Even geduld a.u.b.
 NewPassword=New password
 ResetPassword=Reset password
-RequestToResetPasswordReceived=Een verzoek om uw Dolibarr wachtwoord te wijzigen is ontvangen
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=Dit is uw nieuwe sleutel om in te loggen
 NewKeyWillBe=Uw nieuwe sleutel in te loggen zal zijn
 ClickHereToGoTo=Klik hier om naar %s
@@ -233,6 +233,8 @@ PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=Uitvoeroverzicht
 AvailableFormats=Beschikbare formaten
@@ -246,4 +248,4 @@ WEBSITE_PAGEURL=URL of page
 WEBSITE_TITLE=Titel
 WEBSITE_DESCRIPTION=Omschrijving
 WEBSITE_KEYWORDS=Keywords
-LinesToImport=Lines to import
+LinesToImport=Regels om te importeren
diff --git a/htdocs/langs/nl_NL/printing.lang b/htdocs/langs/nl_NL/printing.lang
index 4e697a52011..9ce3c2beaf4 100644
--- a/htdocs/langs/nl_NL/printing.lang
+++ b/htdocs/langs/nl_NL/printing.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - printing
-Module64000Name=Direct Printing
-Module64000Desc=Enable Direct Printing System
+Module64000Name=Direct afdrukken
+Module64000Desc=Direct afdruksysteem inschakelen
 PrintingSetup=Setup of Direct Printing System
 PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
-MenuDirectPrinting=Direct Printing jobs
-DirectPrint=Direct print
+MenuDirectPrinting=Directe print opdrachten
+DirectPrint=Direct afdrukken
 PrintingDriverDesc=Configuration variables for printing driver.
-ListDrivers=List of drivers
-PrintTestDesc=List of Printers.
+ListDrivers=Lijst met stuurprogramma's
+PrintTestDesc=Lijst met printers.
 FileWasSentToPrinter=File %s was sent to printer
 ViaModule=via the module
 NoActivePrintingModuleFound=No active driver to print document. Check setup of module %s.
@@ -17,14 +17,14 @@ SetupDriver=Driver setup
 TargetedPrinter=Targeted printer
 UserConf=Setup per user
 PRINTGCP_INFO=Google OAuth API setup
-PRINTGCP_AUTHLINK=Authentication
-PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
+PRINTGCP_AUTHLINK=Authenticatie
+PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth-token
 PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
 GCP_Name=Achternaam
 GCP_displayName=Display Name
 GCP_Id=Printer Id
 GCP_OwnerName=Owner Name
-GCP_State=Printer State
+GCP_State=Printerstatus
 GCP_connectionStatus=Online State
 GCP_Type=Printer Type
 PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed.
@@ -36,17 +36,19 @@ NoDefaultPrinterDefined=No default printer defined
 DefaultPrinter=Default printer
 Printer=Printer
 IPP_Uri=Printer Uri
-IPP_Name=Printer Name
-IPP_State=Printer State
-IPP_State_reason=State reason
-IPP_State_reason1=State reason1
-IPP_BW=BW
+IPP_Name=Printernaam
+IPP_State=Printerstatus
+IPP_State_reason=Reden van status
+IPP_State_reason1=Reden van status1
+IPP_BW=ZW
 IPP_Color=Kleur
-IPP_Device=Device
+IPP_Device=Apparaat
 IPP_Media=Printer media
-IPP_Supported=Type of media
+IPP_Supported=Soort media
 DirectPrintingJobsDesc=This page lists printing jobs found for available printers.
 GoogleAuthNotConfigured=Google OAuth setup not done. Enable module OAuth and set a Google ID/Secret.
 GoogleAuthConfigured=Google OAuth credentials were found into setup of module OAuth.
 PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print.
+PrintingDriverDescprintipp=Configuration variables for printing driver Cups.
 PrintTestDescprintgcp=List of Printers for Google Cloud Print.
+PrintTestDescprintipp=List of Printers for Cups.
diff --git a/htdocs/langs/nl_NL/productbatch.lang b/htdocs/langs/nl_NL/productbatch.lang
index 3859445ca7d..392837c87bf 100644
--- a/htdocs/langs/nl_NL/productbatch.lang
+++ b/htdocs/langs/nl_NL/productbatch.lang
@@ -16,7 +16,7 @@ printEatby=Verval: %s
 printSellby=Verkoop: %s
 printQty=Aantal: %d
 AddDispatchBatchLine=Voeg een regel toe voor houdbaarheids ontvangst
-WhenProductBatchModuleOnOptionAreForced=Als de module Lot/Serial is ingeschakeld, automatische modus voor verhoging/verlaging van voorraad wordt geforceerd naar handmatig valideren van verzending en handmatig afhandelen van ontvangst en kan niet worden bewerkt. Andere opties kunnen gedefinieerd worden zoals u wilt.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=Dit product maakt geen gebruik van lot/serial nummer
 ProductLotSetup=Module instellingen voor lot/serial
 ShowCurrentStockOfLot=Toon huidige voorraad voor product/lot paar
diff --git a/htdocs/langs/nl_NL/products.lang b/htdocs/langs/nl_NL/products.lang
index c6a52765bf7..721a9a88815 100644
--- a/htdocs/langs/nl_NL/products.lang
+++ b/htdocs/langs/nl_NL/products.lang
@@ -32,8 +32,8 @@ ProductsOnSaleOnly=Producten alleen voor verkoop
 ProductsOnPurchaseOnly=Producten alleen voor aankoop
 ProductsNotOnSell=Producten niet voor aan- en verkoop
 ProductsOnSellAndOnBuy=Producten voor verkoop en aankoop
-ServicesOnSaleOnly=Services for sale only
-ServicesOnPurchaseOnly=Services for purchase only
+ServicesOnSaleOnly=Diensten alleen voor verkoop
+ServicesOnPurchaseOnly=Diensten alleen voor aankoop
 ServicesNotOnSell=Diensten niet voor aan- en verkoop
 ServicesOnSellAndOnBuy=Diensten voor verkoop en aankoop
 LastModifiedProductsAndServices=Laatste %s aangepaste producten/diensten
@@ -43,7 +43,7 @@ CardProduct0=Productdetails
 CardProduct1=Dienstdetails
 Stock=Voorraad
 Stocks=Voorraden
-Movements=Mutaties
+Movements=Verplaatsingen
 Sell=Verkoop
 Buy=Inkoop
 OnSell=Voor verkoop
@@ -70,6 +70,7 @@ SoldAmount=Aantal verkocht
 PurchasedAmount=Aantal ingekocht
 NewPrice=Nieuwe prijs
 MinPrice=Min. verkoopprijs
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=De verkoopprijs kan niet lager zijn dan de minimumprijs voor dit product ( %s zonder belasting)
 ContractStatusClosed=Gesloten
 ErrorProductAlreadyExists=Een product met verwijzing %s bestaat reeds.
@@ -83,7 +84,7 @@ ShowService=Toon dienst
 ProductsAndServicesArea=Producten- en dienstenoverzicht
 ProductsArea=Productoverzicht
 ServicesArea=Dienstenoverzicht
-ListOfStockMovements=Voorradenlijst
+ListOfStockMovements=Lijst voorraad-verplaatsingen
 BuyingPrice=Inkoopprijs
 PriceForEachProduct=Products with specific prices
 SupplierCard=Leveranciersdetails
@@ -155,7 +156,7 @@ BuyingPrices=Inkoop prijzen
 CustomerPrices=Consumenten prijzen
 SuppliersPrices=Levernaciersprijs
 SuppliersPricesOfProductsOrServices=Leveranciersprijs (van producten/diensten)
-CustomCode=Customs/Commodity/HS code
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=Land van herkomst
 Nature=Natuur
 ShortLabel=Kort label
@@ -211,8 +212,8 @@ VariantLabelExample=Voorbeeld: Kleur
 Build=Produceer
 ProductsMultiPrice=Products and prices for each price segment
 ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
-ProductSellByQuarterHT=Products turnover quarterly before tax
-ServiceSellByQuarterHT=Services turnover quarterly before tax
+ProductSellByQuarterHT=Kwartaalomzet producten voor belasting
+ServiceSellByQuarterHT=Kwartaalomzet diensten voor belasting
 Quarter1=1e kwartaal
 Quarter2=2e kwartaal
 Quarter3=3e kwartaal
@@ -255,7 +256,7 @@ MinCustomerPrice=Minimum verkoopprijs bij klant
 DynamicPriceConfiguration=Dynamische prijs configuratie
 DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able to use and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
 AddVariable=Variabele toevoegen
-AddUpdater=Add Updater
+AddUpdater=Voeg Updater toe
 GlobalVariables=Globale variabelen
 VariableToUpdate=Variabele bijwerken
 GlobalVariableUpdaters=Globale variabele aanpassers
@@ -270,7 +271,7 @@ LastUpdated=Laatst bijgewerkt
 CorrectlyUpdated=Correct bijgewerkt
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Selecteer PDF bestanden
-IncludingProductWithTag=Including product/service with tag
+IncludingProductWithTag=Inclusief product/dienst met label
 DefaultPriceRealPriceMayDependOnCustomer=Standaard verkoopprijs, echte verkoopprijs kan bij klant zijn vastgelegd
 WarningSelectOneDocument=Selecteer tenminste één document
 DefaultUnitToShow=Eenheid
@@ -321,8 +322,8 @@ ErrorCreatingProductAttributeValue=There was an error while creating the attribu
 ProductCombinationGeneratorWarning=If you continue, before generating new variants, all previous ones will be DELETED. Already existing ones will be updated with the new values
 TooMuchCombinationsWarning=Generating lots of variants may result in high CPU, memory usage and Dolibarr not able to create them. Enabling the option "%s" may help reduce memory usage.
 DoNotRemovePreviousCombinations=Do not remove previous variants
-UsePercentageVariations=Use percentage variations
-PercentageVariation=Percentage variation
+UsePercentageVariations=Gebruik percentagevariaties
+PercentageVariation=Variatie in percentage 
 ErrorDeletingGeneratedProducts=There was an error while trying to delete existing product variants
 NbOfDifferentValues=Nb of different values
 NbProducts=Nb. of products
diff --git a/htdocs/langs/nl_NL/projects.lang b/htdocs/langs/nl_NL/projects.lang
index bb146ecd864..dfc1bf1ccd9 100644
--- a/htdocs/langs/nl_NL/projects.lang
+++ b/htdocs/langs/nl_NL/projects.lang
@@ -17,14 +17,14 @@ ProjectsPublicTaskDesc=Deze weergave toont alle projecten en taken die je mag le
 ProjectsDesc=Deze weergave toont alle projecten (Uw gebruikersrechten staan het u toe alles in te zien).
 TasksOnProjectsDesc=Dit overzicht laat alle projecten en alle taken zien (uw gebruikers-rechten geven u hiervoor toestemming).
 MyTasksDesc=This view is limited to projects or tasks you are a contact for
-OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
+OnlyOpenedProject=Alleen projecten in bewerking zijn zichtbaar (projecten in concept of gesloten status zijn niet zichtbaar).
 ClosedProjectsAreHidden=Closed projects are not visible.
 TasksPublicDesc=Deze weergave toont alle projecten en taken die u mag inzien.
 TasksDesc=Deze weergave toont alle projecten en taken (Uw gebruikersrechten staan het u toe alles in te zien).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
 ImportDatasetTasks=Taken bij projecten
-ProjectCategories=Project tags/categories
+ProjectCategories=Labels/categorieën projecten
 NewProject=Nieuw project
 AddProject=Nieuw project
 DeleteAProject=Project verwijderen
@@ -33,7 +33,7 @@ ConfirmDeleteAProject=Weet u zeker dat u dit project wilt verwijderen?
 ConfirmDeleteATask=Weet u zeker dat u deze taak wilt verwijderen?
 OpenedProjects=Projecten in bewerking
 OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
+OpportunitiesStatusForOpenedProjects=Kansen bij projecten in bewerking per status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Toon project
 ShowTask=Toon taak
@@ -51,7 +51,7 @@ TaskTimeSpent=Tijd besteed aan taken
 TaskTimeUser=Gebruiker
 TaskTimeNote=Notitie
 TaskTimeDate=Datum
-TasksOnOpenedProject=Tasks on open projects
+TasksOnOpenedProject=Taken bij projecten in bewerking
 WorkloadNotDefined=Workload niet gedefinieerd
 NewTimeSpent=Bestede tijd
 MyTimeSpent=Mijn bestede tijd
@@ -69,7 +69,7 @@ Activity=Activiteit
 Activities=Taken / activiteiten
 MyActivities=Mijn taken / activiteiten
 MyProjects=Mijn projecten
-MyProjectsArea=My projects Area
+MyProjectsArea=Mijn projecten omgeving
 DurationEffective=Effectieve duur
 ProgressDeclared=Ingegeven voorgang
 ProgressCalculated=Berekende voorgang
@@ -77,6 +77,7 @@ Time=Tijd
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=Lijst van aan het project verbonden offertes
 ListOrdersAssociatedProject=Lijst met relaties gekoppeld aan dit project
@@ -150,7 +151,7 @@ OpportunityStatusShort=Opp. status
 OpportunityProbability=Opportunity probability
 OpportunityProbabilityShort=Opp. probab.
 OpportunityAmount=Opportunity amount
-OpportunityAmountShort=Opp. amount
+OpportunityAmountShort=Opp. bedrag
 OpportunityAmountAverageShort=Average Opp. amount
 OpportunityAmountWeigthedShort=Weighted Opp. amount
 WonLostExcluded=Exclusief akkoord/niet doorgegaan
@@ -190,24 +191,24 @@ AssignTask=Toewijzen
 ProjectOverview=Overzicht
 ManageTasks=Use projects to follow tasks and time
 ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
-ProjectNbProjectByMonth=Nb of created projects by month
+ProjectNbProjectByMonth=Aantal nieuwe projecten per maand
 ProjectNbTaskByMonth=Nb of created tasks by month
-ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
-ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
-ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
-ProjectsStatistics=Statistics on projects/leads
+ProjectOppAmountOfProjectsByMonth=Aantal kansen per maand
+ProjectWeightedOppAmountOfProjectsByMonth=Gewogen aantal kansen per maand
+ProjectOpenedProjectByOppStatus=Open project/lead op status van kans
+ProjectsStatistics=Projecten/leads statistieken
 TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Open projects by third parties
-OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
-NotAnOpportunityShort=Not an opportunity
-OpportunityTotalAmount=Opportunities total amount
+OpenedProjectsByThirdparties=Projecten in bewerking bij relaties
+OnlyOpportunitiesShort=Alleen kansen
+OpenedOpportunitiesShort=Open kansen
+NotAnOpportunityShort=Geen kans
+OpportunityTotalAmount=Totaalbedrag aan kansen
 OpportunityPonderatedAmount=Opportunities weighted amount
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
-OppStatusPROSP=Prospection
+OppStatusPROSP=Prospectie
 OppStatusQUAL=Kwalificatie
 OppStatusPROPO=Offerte
 OppStatusNEGO=Onderhandeling
@@ -226,4 +227,4 @@ AllowCommentOnProject=Allow user comments on projects
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/nl_NL/sendings.lang b/htdocs/langs/nl_NL/sendings.lang
index 776e3a372a2..096564d7d5a 100644
--- a/htdocs/langs/nl_NL/sendings.lang
+++ b/htdocs/langs/nl_NL/sendings.lang
@@ -5,12 +5,12 @@ Sendings=Verzendingen
 AllSendings=Alle zendingen
 Shipment=Verzending
 Shipments=Verzendingen
-ShowSending=Show Shipments
+ShowSending=Toon zendingen
 Receivings=Delivery Receipts
 SendingsArea=Zendingenoverzicht
 ListOfSendings=Verzendlijst
 SendingMethod=Verzendwijze
-LastSendings=Latest %s shipments
+LastSendings=Laatste %s zendingen
 StatisticsOfSendings=Verzendingsstatistieken
 NbOfSendings=Aantal zendingen
 NumberOfShipmentsByMonth=Aantal verzendingen per maand
@@ -18,7 +18,7 @@ SendingCard=Verzendings kaart
 NewSending=Nieuwe verzending
 CreateShipment=Creëer verzending
 QtyShipped=Aantal verzonden
-QtyShippedShort=Qty ship.
+QtyShippedShort=Stk verz.
 QtyPreparedOrShipped=Qty prepared or shipped
 QtyToShip=Aantal te verzenden
 QtyReceived=Aantal ontvangen
@@ -36,13 +36,13 @@ StatusSendingDraftShort=Concept
 StatusSendingValidatedShort=Gevalideerd
 StatusSendingProcessedShort=Verwerkt
 SendingSheet=Verzendings blad
-ConfirmDeleteSending=Are you sure you want to delete this shipment?
-ConfirmValidateSending=Are you sure you want to validate this shipment with reference <b>%s</b>?
-ConfirmCancelSending=Are you sure you want to cancel this shipment?
+ConfirmDeleteSending=Weet u zeker dat u deze zending wilt verwijderen?
+ConfirmValidateSending=Weet u zeker dat u deze zending wilt valideren met als referentie <b>%s</b>?
+ConfirmCancelSending=Weet u zeker dat u deze verzending wilt annuleren?
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Waarschuwing, geen producten die op verzending wachten.
 StatsOnShipmentsOnlyValidated=Statistiek op verzendingen die bevestigd zijn.  Datum is de datum van bevestiging van de verzending (geplande leverdatum is niet altijd bekend).
-DateDeliveryPlanned=Planned date of delivery
+DateDeliveryPlanned=Verwachte leverdatum
 RefDeliveryReceipt=Ref delivery receipt
 StatusReceipt=Status delivery receipt
 DateReceived=Datum leveringsonvangst
diff --git a/htdocs/langs/nl_NL/stocks.lang b/htdocs/langs/nl_NL/stocks.lang
index 486a678e0f3..5db7431f1da 100644
--- a/htdocs/langs/nl_NL/stocks.lang
+++ b/htdocs/langs/nl_NL/stocks.lang
@@ -8,9 +8,9 @@ WarehouseEdit=Magazijn wijzigen
 MenuNewWarehouse=Nieuw magazijn
 WarehouseSource=Bronmagazijn
 WarehouseSourceNotDefined=Geen magazijn bepaald
-AddWarehouse=Create warehouse
+AddWarehouse=Aanmaken magazijn
 AddOne=Voeg toe
-DefaultWarehouse=Default warehouse
+DefaultWarehouse=Standaardmagazijn
 WarehouseTarget=Doelmagazijn
 ValidateSending=Valideer verzending
 CancelSending=Annuleer verzending
@@ -18,13 +18,13 @@ DeleteSending=Verwijder verzending
 Stock=Voorraad
 Stocks=Voorraden
 StocksByLotSerial=Voorraad volgorde op lot/serienummer
-LotSerial=Lots/Serials
-LotSerialList=List of lot/serials
-Movements=Mutaties
+LotSerial=Partij/Serienummer
+LotSerialList=Overzicht van partij/serienummers
+Movements=Verplaatsingen
 ErrorWarehouseRefRequired=Magazijnreferentienaam is verplicht
 ListOfWarehouses=Magazijnenlijst
-ListOfStockMovements=Voorraadmutatielijst
-ListOfInventories=List of inventories
+ListOfStockMovements=Lijst voorraad-verplaatsingen
+ListOfInventories=Voorraadlijst
 MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
@@ -33,17 +33,17 @@ Location=Locatie
 LocationSummary=Korte naam locatie
 NumberOfDifferentProducts=Aantal verschillende producten
 NumberOfProducts=Totaal aantal producten
-LastMovement=Latest movement
-LastMovements=Latest movements
+LastMovement=Laatste verplaatsing
+LastMovements=Laatste verplaatsingen
 Units=Eenheden
 Unit=Eenheid
-StockCorrection=Stock correction
+StockCorrection=Voorraad vorrectie
 CorrectStock=Voorraadcorrectie
 StockTransfer=Voorraadbeweging
 TransferStock=Transfer stock
-MassStockTransferShort=Mass stock transfer
-StockMovement=Stock movement
-StockMovements=Stock movements
+MassStockTransferShort=Bulk verplaatsen van voorraad
+StockMovement=Voorraad verplaatsen
+StockMovements=Voorraad-verplaatsingen
 LabelMovement=Bewegingslabel
 NumberOfUnit=Aantal eenheden
 UnitPurchaseValue=Eenheidsprijs
@@ -90,8 +90,8 @@ WarehousesAndProductsBatchDetail=Magazijnen en producten (met detail per lot/ser
 AverageUnitPricePMPShort=Gewogen gemiddelde inkoopprijs
 AverageUnitPricePMP=Gewogen gemiddelde inkoopprijs
 SellPriceMin=Verkopen Prijs per Eenheid
-EstimatedStockValueSellShort=Value for sell
-EstimatedStockValueSell=Value for sell
+EstimatedStockValueSellShort=Verkoopwaarde
+EstimatedStockValueSell=Verkoopwaarde
 EstimatedStockValueShort=Geschatte voorraadwaarde
 EstimatedStockValue=Geschatte voorraadwaarde
 DeleteAWarehouse=Verwijder een magazijn
@@ -125,7 +125,7 @@ Replenishments=Bevoorradingen
 NbOfProductBeforePeriod=Aantal op voorraad van product %s voor de gekozen periode (<%s)
 NbOfProductAfterPeriod=Aantal op voorraad van product %s na de gekozen periode (<%s)
 MassMovement=Volledige verplaatsing
-SelectProductInAndOutWareHouse=Kies een product, een aantal, een van-magazijn, een naar-magazijn, en klik "%s".  Als alle nodige bewegingen zijn aangeduid, klik op "%s".
+SelectProductInAndOutWareHouse=Kies een product, een aantal, een van-magazijn, een naar-magazijn, en klik "%s".  Als alle nodige bewegingen zijn gemaakt, klik op "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Ontvangsten voor deze bestelling
 StockMovementRecorded=Geregistreerde voorraadbewegingen
@@ -138,9 +138,9 @@ DateMovement=Date of movement
 InventoryCode=Verplaatsing of inventaris code
 IsInPackage=Vervat in pakket
 WarehouseAllowNegativeTransfer=Negatieve voorraad is mogelijk
-qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse and your setup does not allow negative stocks.
+qtyToTranferIsNotEnough=Er is onvoldoende voorraad in uw magazijn en uw instellingen staan ​​geen negatieve voorraad toe.
 ShowWarehouse=Toon magazijn
-MovementCorrectStock=Stock correction for product %s
+MovementCorrectStock=Voorraad correctie product %s
 MovementTransferStock=Voorraad overdracht van het product %s in een ander magazijn
 InventoryCodeShort=Inv./Verpl. code
 NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
@@ -148,10 +148,10 @@ ThisSerialAlreadyExistWithDifferentDate=Deze lot/serienummer (<strong>%s</strong
 OpenAll=Open for all actions
 OpenInternal=Open only for internal actions
 UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on supplier order reception
-OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
-ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
-ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
-ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock correctly deleted
+OptionMULTIPRICESIsOn=De optie "verschillende prijzen per segment" is ingeschakeld. Dit betekent dat een product verschillende verkoopprijzen heeft. De verkoopwaarde kan dus niet worden berekend.
+ProductStockWarehouseCreated=Voorraadalarm en gewenste optimale voorraad correct gecreëerd
+ProductStockWarehouseUpdated=Voorraadalarm en gewenste optimale voorraad correct bijgewerkt
+ProductStockWarehouseDeleted=Voorraadalarm en gewenste optimale voorraad correct verwijderd
 AddNewProductStockWarehouse=Set new limit for alert and desired optimal stock
 AddStockLocationLine=Decrease quantity then click to add another warehouse for this product
 InventoryDate=Inventory date
@@ -203,3 +203,4 @@ RegulateStock=Regulate Stock
 ListInventory=Lijstoverzicht
 StockSupportServices=Stock management support services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/nl_NL/stripe.lang b/htdocs/langs/nl_NL/stripe.lang
index ec56ca43df5..731afdd3c1c 100644
--- a/htdocs/langs/nl_NL/stripe.lang
+++ b/htdocs/langs/nl_NL/stripe.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - stripe
-StripeSetup=Stripe module setup
+StripeSetup=Stripe-module instellen
 StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 StripeOrCBDoPayment=Pay with credit card or Stripe
 FollowingUrlAreAvailableToMakePayments=De volgende URL's zijn beschikbaar om een pagina te bieden aan afnemers voor het doen van een betaling van Dolibarr objecten
@@ -47,19 +47,19 @@ StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
 BankAccountForBankTransfer=Bank account for fund payouts
-StripeAccount=Stripe account
+StripeAccount=Stripe-account
 StripeChargeList=List of Stripe charges
 StripeTransactionList=List of Stripe transactions
 StripeCustomerId=Stripe customer id
 StripePaymentModes=Stripe payment modes
 LocalID=Local ID
 StripeID=Stripe ID
-NameOnCard=Name on card
-CardNumber=Card Number
-ExpiryDate=Expiry Date
+NameOnCard=Tenaamstelling kaart
+CardNumber=Kaartnummer
+ExpiryDate=Vervaldatum
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/nl_NL/supplier_proposal.lang b/htdocs/langs/nl_NL/supplier_proposal.lang
index 7bd4824eee6..6d2c52382dd 100644
--- a/htdocs/langs/nl_NL/supplier_proposal.lang
+++ b/htdocs/langs/nl_NL/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Supplier commercial proposals
-supplier_proposalDESC=Manage price requests to suppliers
-SupplierProposalNew=New price request
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
+SupplierProposalNew=Opvragen prijs
 CommRequest=Price request
-CommRequests=Price requests
+CommRequests=Prijs aanvragen
 SearchRequest=Find a request
 DraftRequests=Draft requests
-SupplierProposalsDraft=Concept leveringsvoorstel
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=Latest %s modified price requests
 RequestsOpened=Open price requests
-SupplierProposalArea=Supplier proposals area
-SupplierProposalShort=Supplier proposal
-SupplierProposals=Leveranciersoffertes
-SupplierProposalsShort=Leveranciersoffertes
-NewAskPrice=New price request
+SupplierProposalArea=Vendor proposals area
+SupplierProposalShort=Vendor proposal
+SupplierProposals=Vendor proposals
+SupplierProposalsShort=Vendor proposals
+NewAskPrice=Opvragen prijs
 ShowSupplierProposal=Show price request
 AddSupplierProposal=Create a price request
-SupplierProposalRefFourn=Supplier ref
+SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=Leveringsdatum
 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>?
@@ -47,9 +47,9 @@ CommercialAsk=Price request
 DefaultModelSupplierProposalCreate=Standaard model aanmaken
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposals=List of supplier proposal requests
-ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
-SupplierProposalsToClose=Supplier proposals to close
-SupplierProposalsToProcess=Supplier proposals to process
+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
diff --git a/htdocs/langs/nl_NL/suppliers.lang b/htdocs/langs/nl_NL/suppliers.lang
index bc5cc99ac6c..5da2c11d4f1 100644
--- a/htdocs/langs/nl_NL/suppliers.lang
+++ b/htdocs/langs/nl_NL/suppliers.lang
@@ -1,47 +1,47 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Leveranciers
-SuppliersInvoice=Leveranciersfactuur
-ShowSupplierInvoice=Show Supplier Invoice
+Suppliers=Vendors
+SuppliersInvoice=Factuur leverancier
+ShowSupplierInvoice=Toon factuur van leverancier
 NewSupplier=Nieuwe leverancier
 History=Geschiedenis
 ListOfSuppliers=Leverancierslijst
-ShowSupplier=Toon leverancier
+ShowSupplier=Show vendor
 OrderDate=Besteldatum
-BuyingPriceMin=Best buying price
-BuyingPriceMinShort=Best buying price
+BuyingPriceMin=Voorkeur inkoopprijs
+BuyingPriceMinShort=Voorkeur inkoopprijs
 TotalBuyingPriceMinShort=Totaal van aankoopprijzen subproducten
-TotalSellingPriceMinShort=Total of subproducts selling prices
+TotalSellingPriceMinShort=Totaal verkoopprijs sub-producten
 SomeSubProductHaveNoPrices=Sommige sub-producten hebben geen prijs ingevuld
-AddSupplierPrice=Add buying price
-ChangeSupplierPrice=Change buying price
-SupplierPrices=Supplier prices
+AddSupplierPrice=Voeg inkoopprijs toe
+ChangeSupplierPrice=Wijzig inkoopprijs
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Deze leveranciersreferentie is al in verband met de referentie: %s
-NoRecordedSuppliers=Geen leveranciers geregistreerd
-SupplierPayment=Leveranciersbetaling
-SuppliersArea=Leveranciersoverzicht
-RefSupplierShort=Ref. Leverancier
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=Beschikbaarheid
-ExportDataset_fournisseur_1=Leveranciersfacturenlijst en factuurregels
-ExportDataset_fournisseur_2=Leveranciersfacturen en -betalingen
-ExportDataset_fournisseur_3=Leveranciersorders en orderlijnen
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=Opdracht goedkeuren
-ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
+ConfirmApproveThisOrder=Weet u zeker dat u deze order wilt accepteren <b>%s</b>?
 DenyingThisOrder=Wijger deze bestelling
-ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
-ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
-AddSupplierOrder=Voeg Leveranciersopdracht toe
-AddSupplierInvoice=Voeg leveranciersfactuur toe
-ListOfSupplierProductForSupplier=Lijst van producten en de prijzen van de leverancier <b>%s</b>
-SentToSuppliers=Stuur naar leveranciers
-ListOfSupplierOrders=Lijst van leverancier bestellingen
-MenuOrdersSupplierToBill=Leverancier bestellingen te factureren
+ConfirmDenyingThisOrder=Weet u zeker dat u deze order wilt negeren <b>%s</b>?
+ConfirmCancelThisOrder=Weet u zeker dat u deze order wilt annuleren <b>%s</b>?
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Levering vertraging in de dagen
-DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-SupplierReputation=Supplier reputation
-DoNotOrderThisProductToThisSupplier=Do not order
-NotTheGoodQualitySupplier=Wrong quality
-ReputationForThisProduct=Reputation
-BuyerName=Buyer name
-AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=Supplier prices
+DescNbDaysToDelivery=Langste levertermijn van de producten in deze bestelling.
+SupplierReputation=Vendor reputation
+DoNotOrderThisProductToThisSupplier=Niet bestellen
+NotTheGoodQualitySupplier=Verkeerde kwaliteit
+ReputationForThisProduct=Reputatie
+BuyerName=Afnemer
+AllProductServicePrices=Prijzen alle producten/diensten
+AllProductReferencesOfSupplier=Referenties alle producten/diensten van leverancier
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/nl_NL/trips.lang b/htdocs/langs/nl_NL/trips.lang
index 71836e9b529..d5612c0b876 100644
--- a/htdocs/langs/nl_NL/trips.lang
+++ b/htdocs/langs/nl_NL/trips.lang
@@ -1,26 +1,26 @@
 # Dolibarr language file - Source file is en_US - trips
-ShowExpenseReport=Show expense report
-Trips=Onkostennota's 
-TripsAndExpenses=Expenses reports
-TripsAndExpensesStatistics=Expense reports statistics
-TripCard=Expense report card
-AddTrip=Create expense report
-ListOfTrips=List of expense reports
+ShowExpenseReport=Toon onkostenrapportage
+Trips=Declaraties
+TripsAndExpenses=Declaraties
+TripsAndExpensesStatistics=Uitgave statistieken
+TripCard=Rapportage onkosten
+AddTrip=Maak rapportage onkosten
+ListOfTrips=Onkostenrapportages
 ListOfFees=Vergoedingenlijst
 TypeFees=Types of fees
-ShowTrip=Show expense report
+ShowTrip=Onkostenrapport
 NewTrip=New expense report
-LastExpenseReports=Latest %s expense reports
+LastExpenseReports=Laatste %s onkostenoverzichten
 AllExpenseReports=All expense reports
 CompanyVisited=Company/organization visited
 FeesKilometersOrAmout=Kilometerskosten
 DeleteTrip=Delete expense report
 ConfirmDeleteTrip=Are you sure you want to delete this expense report?
-ListTripsAndExpenses=List of expense reports
-ListToApprove=Waiting for approval
+ListTripsAndExpenses=Onkostenrapportages
+ListToApprove=Wachten op goedkeuring
 ExpensesArea=Expense reports area
 ClassifyRefunded=Classify 'Refunded'
-ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApproval=Een nieuwe onkostendeclaratie is ingediend voor goedkeuring
 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
@@ -32,45 +32,45 @@ 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
+TripId=Id onkostenoverzicht
 AnyOtherInThisListCanValidate=Person to inform for validation.
-TripSociete=Information company
+TripSociete=Informatie bedrijf
 TripNDF=Informations expense report
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 ExpenseReportLine=Expense report line
 TF_OTHER=Ander
-TF_TRIP=Transportation
+TF_TRIP=Vervoer
 TF_LUNCH=Lunch
 TF_METRO=Metro
-TF_TRAIN=Train
+TF_TRAIN=Trein
 TF_BUS=Bus
 TF_CAR=Auto
-TF_PEAGE=Toll
-TF_ESSENCE=Fuel
+TF_PEAGE=Tol
+TF_ESSENCE=Brandstof
 TF_HOTEL=Hotel
 TF_TAXI=Taxi
 EX_KME=Mileage costs
-EX_FUE=Fuel CV
+EX_FUE=Brandstof bedrijfswagen
 EX_HOT=Hotel
-EX_PAR=Parking CV
-EX_TOL=Toll CV
-EX_TAX=Various Taxes
+EX_PAR=Parkeerkosten bedrijfswagen
+EX_TOL=Tol bedrijfswagen
+EX_TAX=Diverse belastingen
 EX_IND=Indemnity transportation subscription
 EX_SUM=Maintenance supply
-EX_SUO=Office supplies
-EX_CAR=Car rental
-EX_DOC=Documentation
+EX_SUO=Kantoorbenodigdheden
+EX_CAR=Autoverhuur
+EX_DOC=Documentatie
 EX_CUR=Customers receiving
 EX_OTR=Other receiving
-EX_POS=Postage
+EX_POS=Porto
 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
+EX_GUM=Gasten maaltijd
+EX_BRE=Ontbijt
+EX_FUE_VP=Brandstof privé auto
+EX_TOL_VP=Tol privé auto
+EX_PAR_VP=Parkeerkosten privé auto
+EX_CAM_VP=Privé auto onderhoud en reparatie
 DefaultCategoryCar=Default transportation mode
 DefaultRangeNumber=Default range number
 
@@ -80,24 +80,24 @@ AucuneLigne=There is no expense report declared yet
 
 ModePaiement=Payment mode
 
-VALIDATOR=User responsible for approval
+VALIDATOR=Gebruiker is verantwoordelijk voor goedkeuring
 VALIDOR=Goedgekeurd door
 AUTHOR=Recorded by
-AUTHORPAIEMENT=Paid by
-REFUSEUR=Denied by
-CANCEL_USER=Deleted by
+AUTHORPAIEMENT=Betaald door
+REFUSEUR=Geweigerd door
+CANCEL_USER=Verwijderd door
 
 MOTIF_REFUS=Reden
 MOTIF_CANCEL=Reden
 
-DATE_REFUS=Deny date
+DATE_REFUS=Weiger datum
 DATE_SAVE=Validatiedatum
-DATE_CANCEL=Cancelation date
+DATE_CANCEL=Annuleringsdatum
 DATE_PAIEMENT=Betaaldatum
-BROUILLONNER=Reopen
+BROUILLONNER=Heropenen
 ExpenseReportRef=Ref. expense report
-ValidateAndSubmit=Validate and submit for approval
-ValidatedWaitingApproval=Validated (waiting for approval)
+ValidateAndSubmit=Valideren en indienen voor goedkeuring
+ValidatedWaitingApproval=Gevalideerd (wachten op goedkeuring)
 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
@@ -110,21 +110,21 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta
 SaveTrip=Valideren resultaatrekening kosten
 ConfirmSaveTrip=Weet u zeker dat u dit kosten-rapport wilt valideren?
 NoTripsToExportCSV=Geen kosten-rapport voor deze periode om te exporteren.
-ExpenseReportPayment=Expense report payment
-ExpenseReportsToApprove=Expense reports to approve
-ExpenseReportsToPay=Expense reports to pay
-CloneExpenseReport=Clone expense report
+ExpenseReportPayment=Onkostendeclaratie
+ExpenseReportsToApprove=Onkostendeclaraties te accorderen
+ExpenseReportsToPay=Declaraties te betalen
+CloneExpenseReport=Kloon onkostenrapportage
 ConfirmCloneExpenseReport=Are you sure you want to clone this expense report ?
-ExpenseReportsIk=Expense report milles index
+ExpenseReportsIk=Onkostendeclaratie kilometrage index
 ExpenseReportsRules=Expense report rules
 ExpenseReportIkDesc=You can modify the calculation of kilometers expense by category and range who they are previously defined. <b>d</b> is the distance in kilometers
 ExpenseReportRulesDesc=You can create or update any rules of calculation. This part will be used when user will create a new expense report
 expenseReportOffset=Offset (afstand)
-expenseReportCoef=Coefficient
+expenseReportCoef=Coëfficiënt
 expenseReportTotalForFive=Example with <u>d</u> = 5
 expenseReportRangeFromTo=from %d to %d
-expenseReportRangeMoreThan=more than %d
-expenseReportCoefUndefined=(value not defined)
+expenseReportRangeMoreThan=meer dan %d
+expenseReportCoefUndefined=(waarde niet gedefinieerd)
 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
@@ -138,20 +138,20 @@ ExpenseReportRestrictive=Restrictive
 AllExpenseReport=All type of expense report
 OnExpense=Expense line
 ExpenseReportRuleSave=Expense report rule saved
-ExpenseReportRuleErrorOnSave=Error: %s
-RangeNum=Range %d
+ExpenseReportRuleErrorOnSave=Fout: %s
+RangeNum=Bereik %d
 
-ExpenseReportConstraintViolationError=Constraint violation id [%s]: %s  is superior to %s %s
+ExpenseReportConstraintViolationError=Beperking overtreding id [%s]: %s is superieur aan %s %s
 byEX_DAY=by day (limitation to %s)
 byEX_MON=by month (limitation to %s)
 byEX_YEA=by year (limitation to %s)
 byEX_EXP=by line (limitation to %s)
-ExpenseReportConstraintViolationWarning=Constraint violation id [%s]: %s  is superior to %s %s
-nolimitbyEX_DAY=by day (no limitation)
+ExpenseReportConstraintViolationWarning=Beperking overtreding id [%s]: %s is superieur aan %s %s
+nolimitbyEX_DAY=per dag (geen beperking)
 nolimitbyEX_MON=by month (no limitation)
 nolimitbyEX_YEA=by year (no limitation)
 nolimitbyEX_EXP=by line (no limitation)
 
-CarCategory=Category of car
+CarCategory=Auto categorie
 ExpenseRangeOffset=Offset amount: %s
-RangeIk=Mileage range
+RangeIk=Afstand in km.
diff --git a/htdocs/langs/nl_NL/website.lang b/htdocs/langs/nl_NL/website.lang
index 854ff1c80b9..5dc5d14bce5 100644
--- a/htdocs/langs/nl_NL/website.lang
+++ b/htdocs/langs/nl_NL/website.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Code
 WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them.
-DeleteWebsite=Delete website
+DeleteWebsite=Website verwijderen
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
@@ -18,24 +18,24 @@ PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
 MediaFiles=Media library
 EditCss=Edit Style/CSS or HTML header
-EditMenu=Edit menu
+EditMenu=Wijzig menu
 EditMedias=Edit medias
 EditPageMeta=Edit Meta
 AddWebsite=Add website
-Webpage=Web page/container
+Webpage=Webpagina/container
 AddPage=Add page/container
-HomePage=Home Page
+HomePage=Startpagina
 PageContainer=Page/container
 PreviewOfSiteNotYetAvailable=Een voorbeeld van uw website <strong>%s</strong> is nog niet beschikbaar. U moet eerst een pagina toevoegen.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
-PageContent=Page/Contenair
+PageContent=Pagina/Container
 PageDeleted=Page/Contenair '%s' of website %s deleted
 PageAdded=Page/Contenair '%s' added
 ViewSiteInNewTab=View site in new tab
 ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
-ViewWebsiteInProduction=View web site using home URLs
+ViewWebsiteInProduction=Bekijk website met behulp van eigen URL's
 SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong><br>then enter here the virtual hostname you have created, so the preview can be done also using this dedicated web server access instead of only using Dolibarr server.
 YouCanAlsoTestWithPHPS=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>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
@@ -44,12 +44,12 @@ WritePerm=Write
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
 PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
 VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
-NoPageYet=No pages yet
-SyntaxHelp=Help on specific syntax tips
+NoPageYet=Nog geen pagina's
+SyntaxHelp=Help bij specifieke syntax-tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-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, $langs, $db, $mysoc, $user, $website.<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:<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&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 access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
-ClonePage=Clone page/container
-CloneSite=Clone site
+YouCanEditHtmlSource=<br> <span class="fa fa-bug"></span> U kunt PHP-code opnemen in deze bron met behulp van labels <strong> &lt;? php? &gt;</strong>. De volgende globale variabelen zijn beschikbaar: $ conf, $ langs, $ db, $ mysoc, $ user, $ website. <br><br> <span class="fa fa-bug"></span>Je kunt ook inhoud van een andere pagina/container met de volgende syntaxis: <br> <strong> &lt;? php includeContainer ('alias_of_container_to_include'); ? &gt; </strong><br><br><span class="fa fa-bug"></span>U kunt een omleiding naar een andere pagina / container uitvoeren met de volgende syntaxis: <br><strong> &lt;? php redirectToContainer ('alias_of_container_to_redirect_to'); ? &gt; </strong><br><br><span class="fa fa-download"></span> Een <strong>-link opnemen om te downloaden</strong> een bestand dat is opgeslagen in de <strong>documenten</strong> map, gebruik de <strong>document.php</strong> wrapper:<br>Voorbeeld, voor een bestand naar documenten / ecm (moet worden gelogd), syntaxis is:<br><strong>&lt;a href = "/document.php?modulepart=ecm&file=[relative_dir/]filename.ext" &gt; </strong><br> Voor een bestand naar documenten / media (open map voor openbare toegang) is de syntaxis: <br><strong>&lt;a href = "/ document.php? modulepart = medias & file = [relative_dir /] bestandsnaam.ext" &gt;</strong> <br> Voor een bestand dat wordt gedeeld met een gedeelde link (open toegang met behulp van de hash-sleutel van bestand delen), syntaxis is: <br> <strong>&lt;a href = "/ document.php? hashp = publicsharekeyoffile" &gt;</strong> <br> <br> <span class="fa fa-picture-o"></span>Naar een <strong>afbeelding</strong> opnemen die is opgeslagen in de map <strong>documenten</strong>, gebruikt u de<strong> viewimage.php</strong> -wrapper: <br> Voorbeeld voor een afbeelding in documenten / media (open toegang), syntaxis is: <br> <strong> &lt;a href = "/ viewimage.php? modulepart = medias&amp;file = [relative_dir /] bestandsnaam.ext" &gt; </strong><br>
+ClonePage=Kloon pagina/container
+CloneSite=Klonen site
 SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
@@ -73,7 +73,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
diff --git a/htdocs/langs/nl_NL/withdrawals.lang b/htdocs/langs/nl_NL/withdrawals.lang
index 9f0a8e654a2..5911ac32044 100644
--- a/htdocs/langs/nl_NL/withdrawals.lang
+++ b/htdocs/langs/nl_NL/withdrawals.lang
@@ -1,19 +1,19 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Direct debit payment orders area
-SuppliersStandingOrdersArea=Direct credit payment orders area
+SuppliersStandingOrdersArea=Directe betaalopdrachten omgeving
 StandingOrdersPayment=Orders automatisch te incasseren
 StandingOrderPayment=Incasso betalingsopdracht
-NewStandingOrder=New direct debit order
+NewStandingOrder=Nieuwe incasso opdracht
 StandingOrderToProcess=Te verwerken
 WithdrawalsReceipts=Incasso-opdrachten
 WithdrawalReceipt=Incasso-opdracht
-LastWithdrawalReceipts=Latest %s direct debit files
+LastWithdrawalReceipts=Laatste %s incassobestanden
 WithdrawalsLines=Direct debit order lines
 RequestStandingOrderToTreat=Request for direct debit payment order to process
 RequestStandingOrderTreated=Request for direct debit payment order processed
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
 NbOfInvoiceToWithdraw=Nb. of qualified invoice with waiting direct debit order
-NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+NbOfInvoiceToWithdrawWithInfo=Aantal klant factuur met automatische incasso betalingsopdrachten en gedefinieerde bankrekeninginformatie
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Bedrag in te trekken
 WithdrawsRefused=Direct debit refused
@@ -22,7 +22,7 @@ ResponsibleUser=Verantwoordelijke gebruiker
 WithdrawalsSetup=Direct debit payment setup
 WithdrawStatistics=Automatische incasso statistieken
 WithdrawRejectStatistics=Geweigerde automatische incasso statistieken
-LastWithdrawalReceipt=Latest %s direct debit receipts
+LastWithdrawalReceipt=Laatste %s ontvangen incasso's
 MakeWithdrawRequest=Automatische incasso aanmaken
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Bankcode van derde
@@ -40,7 +40,7 @@ RefusedData=Datum van de afwijzing
 RefusedReason=Reden voor afwijzing
 RefusedInvoicing=Facturering van de afwijzing
 NoInvoiceRefused=Factureer de afwijzing niet
-InvoiceRefused=Invoice refused (Charge the rejection to customer)
+InvoiceRefused=Factuur geweigerd (de afwijzing door belasten aan de klant)
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Wachtend
 StatusTrans=Verzonden
@@ -82,26 +82,26 @@ RUMWillBeGenerated=If empty, UMR number will be generated once bank account info
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
-SepaMandate=SEPA Direct Debit Mandate
-SepaMandateShort=SEPA Mandate
-PleaseReturnMandate=Please return this mandate form by email to %s or by mail to
-SEPALegalText=By signing this mandate form, you authorize (A) %s to send instructions to your bank to debit your account and (B) your bank to debit your account in accordance with the instructions from %s. As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
-CreditorIdentifier=Creditor Identifier
-CreditorName=Creditor’s Name
-SEPAFillForm=(B) Please complete all the fields marked *
-SEPAFormYourName=Your name
-SEPAFormYourBAN=Your Bank Account Name (IBAN)
-SEPAFormYourBIC=Your Bank Identifier Code (BIC)
-SEPAFrstOrRecur=Type of payment
-ModeRECUR=Reccurent payment
-ModeFRST=One-off payment
-PleaseCheckOne=Please check one only
+SepaMandate=Machtiging doorlopende SEPA incasso
+SepaMandateShort=SEPA-mandaat
+PleaseReturnMandate=Stuur dit machtigingsformulier per e-mail naar\n%s of per post naar:
+SEPALegalText=Door dit machtigingsformulier te ondertekenen, machtigt u (A) %s om uw bank opdracht te geven om uw rekening te belasten en (B) een bedrag van uw rekening af te schrijven overeenkomstig de instructies van %s. Als onderdeel van uw rechten heeft u recht op terugbetaling overeenkomstig de voorwaarden van uw overeenkomst met uw bank. Een stornering moet plaats vinden binnen 8 weken gerekend vanaf de datum waarop het bedrag is afgeschreven. De voorwaarden met betrekking tot de bovenstaande volmacht kunt u verkrijgen bij uw bank.
+CreditorIdentifier=Incassant id.
+CreditorName=Naam Incassant
+SEPAFillForm=(B) Alle velden met een * zijn verplicht.
+SEPAFormYourName=Uw naam
+SEPAFormYourBAN=Uw bankrekeningnummer (IBAN)
+SEPAFormYourBIC=Uw bankidentificatiecode (BIC)
+SEPAFrstOrRecur=Soort betaling
+ModeRECUR=Herhaal betaling
+ModeFRST=Eenmalige incasso
+PleaseCheckOne=Alleen één controleren
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
 SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
-ExecutionDate=Execution date
-CreateForSepa=Create direct debit file
+ExecutionDate=Uitvoeringsdatum
+CreateForSepa=Aanmaken incassobestand
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/nl_NL/workflow.lang b/htdocs/langs/nl_NL/workflow.lang
index 98974a07f2b..45e1639d307 100644
--- a/htdocs/langs/nl_NL/workflow.lang
+++ b/htdocs/langs/nl_NL/workflow.lang
@@ -1,12 +1,12 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Workflow module setup
 WorkflowDesc=Deze module is ontworpen om het gedrag van automatische acties aan te passen. Standaard is de workflow open (u kunt dingen doen in de volgorde die u wilt). U kunt automatische acties activeren indien u wenst.
-ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+ThereIsNoWorkflowToModify=Er zijn geen wijzigingen in de workflow beschikbaar met de geactiveerde modules.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed (new order will have same amount than proposal)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (new invoice will have same amount than proposal)
-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 customer order is closed (new invoice will have same amount than order)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatisch een order aanmaken nadat een offerte is ondertekend (nieuwe order heeft hetzelfde bedrag als offerte)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Maak automatisch een klant factuur aan nadat de offerte is ondertekend (nieuwe factuur heeft hetzelfde bedrag als offerte)
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Maak automatisch een klant factuur aan nadat contract is gevalideerd.
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Maak automatisch een klant factuur aan nadat order is gesloten. (nieuwe factuur heeft zelfde bedrag als order)
 # Autoclassify customer proposal or order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer order is set to billed (and if amount of the order is same than total amount of signed linked proposals)
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of signed linked proposals)
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source custome
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
-AutomaticCreation=Automatic creation
-AutomaticClassification=Automatic classification
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+AutomaticCreation=Automatisch aanmaken
+AutomaticClassification=Automatisch classificeren
diff --git a/htdocs/langs/pl_PL/accountancy.lang b/htdocs/langs/pl_PL/accountancy.lang
index 10d64759fdb..9160b4e3a98 100644
--- a/htdocs/langs/pl_PL/accountancy.lang
+++ b/htdocs/langs/pl_PL/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Księgowość
 ACCOUNTING_EXPORT_SEPARATORCSV=Separator kolumn dla eksportowanego pliku
 ACCOUNTING_EXPORT_DATE=Format daty dla eksportowanego pliku 
 ACCOUNTING_EXPORT_PIECE=Exportuj ilość sztuk
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Accounts with non zero values
 ListOfAccounts=List of accounts
 
 MainAccountForCustomersNotDefined=Główne konto księgowe dla klientów nie zdefiniowane w ustawieniach
-MainAccountForSuppliersNotDefined=Główne konto księgowe dla dostawców nie zdefiniowane w ustawieniach
+MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
 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
 
-AccountancyArea=Obszar księgowości
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=Następujące akcje są wykonywane zwykle tylko raz lub raz w roku...
 AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
@@ -89,7 +90,7 @@ MenuProductsAccounts=Konta produktów
 ProductsBinding=Konta produktów
 Ventilation=Dowiązane do kont
 CustomersVentilation=Powiązania do faktury klienta
-SuppliersVentilation=Powiązania do faktury dostawcy
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Utwórz nową transakcję
 UpdateMvts=Modyfikacja transakcji
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=Dziennik zakupów
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Dziennik różnic
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Dziennik raportów kosztowych
 ACCOUNTING_SOCIAL_JOURNAL=Czasopismo Społecznego
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Konto księgowe dla przelewów
 ACCOUNTING_ACCOUNT_SUSPENSE=Konto księgowe dla oczekujących
@@ -185,11 +187,12 @@ ListeMvts=Lista ruchów
 ErrorDebitCredit=Debetowych i kredytowych nie może mieć wartość w tym samym czasie
 AddCompteFromBK=Dodaj konta księgowe do grupy
 ReportThirdParty=Lista kont kontrahentów
-DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=Lista kont księgowych
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Grupa konta
 Pcgsubtype=Podgrupa konta
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Powiąż pozycje faktury aktualnie nie związane  z kontem księgowym produktu
 ChangeAccount=Zmień konto księgowe dla zaznaczonych produktów/usług na następujące konto księgowe:
 Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=Skonsultuj się tutaj listę linii dostawcy faktur i ich koncie księgowym
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
 DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report 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 fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Dowiąż automatycznie
 AutomaticBindingDone=Automatyczne dowiązanie ukończone
 
 ErrorAccountancyCodeIsAlreadyUse=Błąd, nie można usunąc tego konta księgowego, ponieważ jest w użyciu
-MvtNotCorrectlyBalanced=Ruch nie zbilansowany poprawnie. Uznanie = %s. Obciążenie = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Karta dowiązania
 GeneralLedgerIsWritten=Transakcje zapisane w księdze głównej
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -293,4 +296,9 @@ Binded=Lines bound
 ToBind=Linie do dowiązania
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
index f82a63d00b6..a0ce9620bc7 100644
--- a/htdocs/langs/pl_PL/admin.lang
+++ b/htdocs/langs/pl_PL/admin.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - admin
 Foundation=Fundacja
 Version=Wersja
-Publisher=Publisher
+Publisher=Wydawca
 VersionProgram=Wersja programu
 VersionLastInstall=Zainstalowana początkowa wersja
 VersionLastUpgrade=Ostatnia zaktualizowana wersja
@@ -9,20 +9,20 @@ VersionExperimental=Eksperymentalny
 VersionDevelopment=Rozwój
 VersionUnknown=Nieznany
 VersionRecommanded=Zalecana
-FileCheck=Files integrity checker
+FileCheck=Sprawdzanie integralności plików
 FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. Value of some setup constants may also be checked. You can use this tool to detect if some files were modified by a hacker for example.
-FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files were added.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
-GlobalChecksum=Global checksum
+FileIntegrityIsStrictlyConformedWithReference=Integralność plików jest ściśle zgodna z referencją.
+FileIntegrityIsOkButFilesWereAdded=Sprawdzenie integralności plików przebiegło pomyślnie, ale dodano nowe pliki.
+FileIntegritySomeFilesWereRemovedOrModified=Sprawdzenie integralności plików zakończylo się niepowodzeniem. Niektóre pliki zostaly zmodyfikowane, usunięte lub dodane.
+GlobalChecksum=Globalna suma kontrolna
 MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
 LocalSignature=Embedded local signature (less reliable)
 RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Brakujące pliki
 FilesUpdated=Aktualizacja plików
-FilesModified=Modified Files
-FilesAdded=Added Files
-FileCheckDolibarr=Check integrity of application files
+FilesModified=Zmodyfikowane pliki
+FilesAdded=Dodane pliki
+FileCheckDolibarr=Sprawdź integralność plików aplikacji
 AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package
 XmlNotFound=Xml Integrity File of application not found
 SessionId=ID sesji
@@ -51,7 +51,7 @@ InternalUsers=Wewnętrzni użytkownicy
 ExternalUsers=Zewnetrzni użytkownicy
 GUISetup=Wyświetlanie
 SetupArea=Dział konfiguracji
-UploadNewTemplate=Upload new template(s)
+UploadNewTemplate=Załaduj nowy szablon(y)
 FormToTestFileUploadForm=Formularz do wysyłania pliku testowego (według konfiguracji)
 IfModuleEnabled=Uwaga: tak jest skuteczne tylko wtedy, gdy <b>moduł %s</b> jest aktywny
 RemoveLock=Usuń <b>plik %s,</b> jeśli istnieje, aby umożliwić aktualizację narzędzia.
@@ -116,7 +116,7 @@ CurrentValueSeparatorDecimal=Separator dziesiętny
 CurrentValueSeparatorThousand=Separator tysięczny
 Destination=Miejsce przeznaczenia
 IdModule=Identyfikator modułu
-IdPermissions=Uprawnienia ID
+IdPermissions=ID uprawnień
 LanguageBrowserParameter=Parametr %s
 LocalisationDolibarrParameters=Parametry lokalizacji
 ClientTZ=Strefa Czasowa Klienta (użytkownik)
@@ -126,12 +126,12 @@ PHPTZ=Strefa czasowa serwera PHP
 DaylingSavingTime=Czas letni (użytkownik)
 CurrentHour=Aktualna godzina
 CurrentSessionTimeOut=Obecna sesja wygasła
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris"
+YouCanEditPHPTZ=Aby ustawić inną strefę czasową PHP (nie wymagane) spróbuj dodać plik .htaccess z wpisem takim jak "SetEnv TZ Europe/Warszawa"
 HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widżet
 Boxes=Widżety
 MaxNbOfLinesForBoxes=Maks. ilość linii dla widgetów
-AllWidgetsWereEnabled=All available widgets are enabled
+AllWidgetsWereEnabled=Wszystkie dostępne widgety zostały wlączone
 PositionByDefault=Domyślny porządek
 Position=Pozycja
 MenusDesc=Menadżer menu ustawia zawartość dwóch pasków menu (poziomego i pionowego)
@@ -190,28 +190,28 @@ EncodeBinariesInHexa=Kodowanie danych binarnych w postaci szesnastkowej
 IgnoreDuplicateRecords=Ignoruj błędy zduplikowanych rekordów (INSERT IGNORE)
 AutoDetectLang=Autodetekcja (język przeglądarki)
 FeatureDisabledInDemo=Funkcja niedostępna w wersji demo
-FeatureAvailableOnlyOnStable=Feature only available on official stable versions
+FeatureAvailableOnlyOnStable=Funkcjonalność dostępna tylko w oficjalnej stabilnej wersji
 BoxesDesc=Widgety są komponentami pokazującymi pewne informacje, które możesz dodać w celu spersonalizowania niektórych stron. Możesz wybrać pomiędzy pokazaniem wigetu lub nie poprzez wybranie docelowej strony i kliknięcie "Aktywacja", lub poprzez kliknięcie na kosz w celu wyłączenia go.
 OnlyActiveElementsAreShown=Tylko elementy z <a href="%s">aktywnych modułów</a> są widoczne.
 ModulesDesc=Moduły Dolibarr definiują, która aplikacja / funkcja jest włączona w oprogramowaniu. Niektóre aplikacje / moduły wymagają uprawnień, które musisz przyznać użytkownikom po ich aktywacji. Kliknij przycisk ON/OFF, aby włączyć moduł/aplikację.
 ModulesMarketPlaceDesc=Możesz znaleźć więcej modułów do pobrania na zewnętrznych stronach internetowych...
 ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
 ModulesMarketPlaces=Znajdź dodatkowe aplikacje / moduły
-ModulesDevelopYourModule=Develop your own app/modules
-ModulesDevelopDesc=You can develop or find a partner to develop for you, your personalised module
+ModulesDevelopYourModule=Stwórz własną aplikację/moduły
+ModulesDevelopDesc=Możesz opracować lub znaleźć partnera, który opracuje dla Ciebie twój spersonalizowany moduł
 DOLISTOREdescriptionLong=Instead of switching on <a href="https://www.dolistore.com">www.dolistore.com</a> web site to find an external module, you can use this embedded tool that will make the seach on the external market place for you (may be slow, need an internet access)...
 NewModule=Nowy
 FreeModule=Free
 CompatibleUpTo=Kompatybilne z wersją %s
-NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s - Max %s).
+NotCompatible=ten moduł nie jest kompatybilny z twoją wersją Dolibarr %s (Min %s - Max %s).
 CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=See in Market place
 Updated=Updated
-Nouveauté=Novelty
+Nouveauté=Nowość
 AchatTelechargement=Buy / Download
-GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
+GoModuleSetupArea=Aby udostępnić/zainstalowac nowy moduł, przejdź do ustawień Modułu <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, oficjalny kanał dystrybucji zewnętrznych modułów Dolibarr ERP / CRM
-DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
+DoliPartnersDesc=Lista firm dostarczających niestandardowe moduły lub funkcje (Uwaga: każdy doświadczony w programowaniu PHP może udostępnić niestandardowy opracowanie dla projektu open source)
 WebSiteDesc=Powiązane strony z modułami...
 DevelopYourModuleDesc=Some solutions to develop your own module...
 URL=Łącze
@@ -242,7 +242,7 @@ OfficialMarketPlace=Oficjalne miejsce dystrybucji zewnętrznych modułów / doda
 OfficialWebHostingService=Opisywane usługi hostingowe (Cloud hosting)
 ReferencedPreferredPartners=Preferowani Partnerzy
 OtherResources=Inne zasoby
-ExternalResources=External resources
+ExternalResources=Zasoby zewnętrzne
 SocialNetworks=Sieci społecznościowe
 ForDocumentationSeeWiki=Aby zapoznać się z dokumentacją użytkownika lub dewelopera (Doc, FAQ ...), <br> zajrzyj do Dolibarr Wiki: <br> <a href="%s" target="_blank"><b> %s</b></a>
 ForAnswersSeeForum=Aby znaleźć odpowiedzi na pytania / uzyskać dodatkową pomoc, możesz skorzystać z  forum Dolibarr : <br> <a href="%s" target="_blank"><b> %s</b></a>
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=Host SMTP (domyślnie w <b>php.ini: %s)</b>
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Port SMTP (Nie zdefiniowany w PHP dla systemów z rodziny Unix)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Host SMTP (Nie zdefiniowany w PHP dla systemów z rodziny Unix)
 MAIN_MAIL_EMAIL_FROM=E-mail wysyłający do automatycznych wiadomości e-mail (domyślnie w php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= Wysyłaj systematycznie ukryte kopie wszystkich wysłanych e-maili do
 MAIN_DISABLE_ALL_MAILS=Wyłącz wszystkie wysyłki wiadomości (dla testu ustawień lub trybu demo)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=Metoda używana do wysłania E-maili
 MAIN_MAIL_SMTPS_ID=Identyfikator SMTP, jeżeli wymaga uwierzytelniania
 MAIN_MAIL_SMTPS_PW=Hasło SMTP , jeżeli wymagane uwierzytelniania
@@ -291,7 +292,7 @@ ModuleSetup=Moduł konfiguracji
 ModulesSetup=Ustawienia Modułów/Aplikacji
 ModuleFamilyBase=System
 ModuleFamilyCrm=Zarządzanie relacjami z klientem (CRM)
-ModuleFamilySrm=Zarządzanie Relacjami z Dostawcami (ZRD)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Zarządzanie produktami
 ModuleFamilyHr=Zarządzanie zasobami ludzkimi
 ModuleFamilyProjects=Projekty / Praca zespołowa
@@ -311,7 +312,7 @@ StepNb=Krok %s
 FindPackageFromWebSite=Odnajdź pakiet, który zapewnia wybraną przez Ciebię funkcję (np. na oficjalnej stronie internetowej %s).
 DownloadPackageFromWebSite=Download package (for example from official web site %s).
 UnpackPackageInDolibarrRoot=Rozpakuj spakowane pliki do katalogu serwera przeznaczonego na Dollibar:<b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
+UnpackPackageInModulesRoot=Aby udostępnić/zainstalować dodatkowy moduł, rozpakuj pliki na serwerze do katalogu dedycowanego modułom: <b>%s</b>.
 SetupIsReadyForUse=Wdrażanie modułu zostało zakończone. Musisz jednak włączyć i skonfigurować moduł w aplikacji, przechodząc na stronę do konfiguracji modułów: <a href="%s">%s</a>.
 NotExistsDirect=Alternatywny katalog główny nie jest zdefiniowany w istniejącym katalogu.<br>
 InfDirAlt=Od wersji 3 możliwe jest zdefiniowanie alternatywnego katalogu głównego. Pozwala to na przechowywanie w dedykowanym katalogu wtyczek oraz niestandardowych szablonów. <br>Wystarczy utworzyć katalog w lokalizacji plików Dolibarr (na przykład: niestandardowe).<br>
@@ -350,7 +351,7 @@ AddCRIfTooLong=Brak automatycznego zawijania. Jeśli linia znajduje się poza do
 ConfirmPurge=Czy na pewno chcesz wykonać to czyszczenie? <br> Usunie to ostatecznie wszystkie pliki z danymi danych bez możliwości ich przywrócenia (pliki ECM, załączone pliki...).
 MinLength=Minimalna długość
 LanguageFilesCachedIntoShmopSharedMemory=Pliki. Lang załadowane do pamięci współdzielonej
-LanguageFile=Language file
+LanguageFile=Plik języka
 ExamplesWithCurrentSetup=Przykłady z obecnie działającą konfiguracją
 ListOfDirectories=Lista katalogów szablonów OpenDocument
 ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah 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>.
@@ -373,8 +374,9 @@ NoSmsEngine=Brak menedżera SMSów nadawczych. Menedżer SMSów nadawczych nie j
 PDF=PDF
 PDFDesc=Można ustawić każdą opcję globalną związaną z generowaniem PDF
 PDFAddressForging=Zasady złączania pól adresowych
-HideAnyVATInformationOnPDF=Ukryj wszystkie informacje dotyczące podatku VAT w wygenerowanym pliku PDF
-PDFLocaltax=Rules for %s
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
+PDFLocaltax=Zasady dla %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=Ukryj opis produktów w wygenerowanych plikach PDF
 HideRefOnPDF=Ukryj numer referencyjny produktów w generowanych plikach PDF
@@ -410,7 +412,7 @@ ExtrafieldRadio=Radio buttons (on choice only)
 ExtrafieldCheckBox=Pola wyboru
 ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link do obiektu
-ComputedFormula=Computed field
+ComputedFormula=Obliczone pole
 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, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties 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>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->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->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
 ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
@@ -445,7 +447,8 @@ DisplayCompanyInfo=Wyświetl adres firmy
 DisplayCompanyManagers=Display manager names
 DisplayCompanyInfoAndManagers=Wyświetl adres firmy i dane menadżerów
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Zwróć pusty kod księgowy
 ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party 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.
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Set this to 1 if you want to attach main document to emai
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=Użytkownicy i grupy
 Module0Desc=Zarządzanie Użytkownikami/Pracownikami i Grupami
@@ -479,7 +485,7 @@ Module1Desc=Zarządzanie firmami oraz kontaktami (klienci, prospekty...)
 Module2Name=Reklama
 Module2Desc=Zarządzanie reklamą
 Module10Name=Księgowość
-Module10Desc=Raporty księgowości podstawowej (dzienniki, zwroty) generowane w oparciu o zawartość bazy danych. Bez wysyłek.
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=Propozycje
 Module20Desc=Zarządzanie propozycjami reklam
 Module22Name=Masowe wysyłanie E-maili
@@ -546,8 +552,8 @@ Module400Name=Projekty / Możliwości / Wskazówki
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Integracja Webcalendar
-Module500Name=Special expenses
-Module500Desc=Zarządzanie kosztami specjalnymi (podatki, opłaty ZUS, dywidendy)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Payment of employee wages
 Module510Desc=Record and follow payment of your employee wages
 Module520Name=Pożyczka
@@ -561,14 +567,14 @@ Module700Name=Darowizny
 Module700Desc=Zarządzanie darowiznami
 Module770Name=Expense reports
 Module770Desc=Zarządzanie i roszczenia raporty wydatków (transport, posiłek, ...)
-Module1120Name=Dostawca propozycja handlowa
-Module1120Desc=Dostawca komercyjnych i wniosek propozycja ceny
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Integracja Mantis
 Module1520Name=Generowanie dokumentu
 Module1520Desc=Dokument poczty masowej generacji
 Module1780Name=Tagi / Kategorie
-Module1780Desc=Tworzenie tagów / kategorii (produktów, klientów, dostawców, kontaktów lub członków)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=Edytor WYSIWYG
 Module2000Desc=Pozwól na edycję niektórych pól tekstowych z użyciem zaawansowanego edytora (bazującego na CKEditor)
 Module2200Name=Dynamiczne Ceny
@@ -576,7 +582,7 @@ Module2200Desc=Włącz użycie wyrażeń matematycznych dla cen
 Module2300Name=Zaplanowane zadania
 Module2300Desc=Zarządzanie zaplanowanymi zadaniami (jak cron lub chrono table)
 Module2400Name=Wydarzenia/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=SZD / ZZE
 Module2500Desc=System Zarządzania Dokumentami / Zarządzanie Zawartością Elektroniczną. Automatyczna organizacja twoich wygenerowanych lub składowanych dokumentów. Udostępniaj je kiedy chcesz.
 Module2600Name=API services (Web services SOAP)
@@ -613,7 +619,7 @@ Module50100Desc=Punkty sprzedaży (POS)
 Module50200Name=Paypal
 Module50200Desc=Moduł oferujący stronę płatności online akceptujący płatności za pośrednictwem PayPal (karty kredytowe lub środki PayPal). Może zostać użyty do zapewnienia twoim klientom możliwości darmowych płatności za konkretne dokumenty Dolibarr (faktury, zamówienia, ...)
 Module50400Name=Rachunkowość (zaawansowane)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=PrintIPP
 Module54000Desc=Druk bezpośredni (bez otwierania dokumentów) za pomocą interfejsu Puchary IPP (drukarki muszą być widoczne z serwera, a CUPS musi być installé na serwerze).
 Module55000Name=Poll, Survey or Vote
@@ -983,7 +989,7 @@ Host=Serwer
 DriverType=Typ sterownika
 SummarySystem=Podsumowanie informacji systemowych
 SummaryConst=Lista wszystkich parametrów konfiguracji Dolibarr
-MenuCompanySetup=Company/Organization
+MenuCompanySetup=Firma/Organizacja
 DefaultMenuManager= Menedżer standardowego menu
 DefaultMenuSmartphoneManager=Menedżer menu Smartphona
 Skin=Skórka
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerancja opóźnienie (w dniach) przed wpisu na opó
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerancja opóźnienia (liczba dni) przed wpisu do deponowania czeków do
 Delays_MAIN_DELAY_EXPENSEREPORTS=Opóźnienie tolerancji (w dniach) przed wpisu do zestawienia wydatków do zatwierdzenia
 SetupDescription1=Obszar ustawień jest przeznaczony dla ustawienia startowych parametrów zanim zaczniesz używać Dolibarr.
-SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parametry w menu <a href="%s">%s->%s</a>- są wymagane ponieważ definiują dane używane na ekranach Dolibarr oraz do personalizowana domyślnego środowiska oprogramowania (dla kraju - powiązane funkcje dla przykładu).
-SetupDescription4=Parametry w menu <a href="%s">%s-> %s</a> są wymagane ponieważ Dolibarr jest zbiorem kilku modułów/aplikacji, które są bardziej lub mniej ze sobą powiązane. Nowe funkcjonalności będą dodawane do menu za każdorazową aktywacją kolejnego modułu.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=Inne pozycje menu zarządzają opcjonalnymi parametrami.
 LogEvents=Zdarzenia audytu bezpieczeństwa
 Audit=Audyt
@@ -1054,8 +1060,9 @@ LogEventDesc=Można włączyć dziennik Dolibarr bezpieczeństwa imprez tutaj. A
 AreaForAdminOnly=Parametry mogą być ustawiane tylko przez <b>użytkowników z prawami administratora</b>.
 SystemInfoDesc=System informacji jest różne informacje techniczne można uzyskać w trybie tylko do odczytu i widoczne tylko dla administratorów.
 SystemAreaForAdminOnly=Obszar ten jest dostępny tylko dla użytkowników na prawach administratora. Żadne z uprawnień Dolibarr nie zniesie tego ograniczenia.
-CompanyFundationDesc=Edytuj na tej stronie wszystkie znane Ci informacje na temat firmy lub fundacji (Aby to zrobić, kliknij na przycisk "Modyfikuj" lub "Zapisz" na dole strony)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=Tutaj możesz ustawić każdy z parametrów związanych z wyglądem i zachowaniem Dolibarr
 AvailableModules=Dostępne aplikacje / moduły
 ToActivateModule=Aby uaktywnić modules, przejdź na konfigurację Powierzchnia.
@@ -1188,11 +1195,11 @@ UserMailRequired=Email wymagane, aby utworzyć nowego użytkownika
 HRMSetup=Ustawianie modułu HR
 ##### Company setup #####
 CompanySetup=Firmy konfiguracji modułu
-CompanyCodeChecker=Moduł dla stron trzecich i generowania kodu kontroli (klienta lub dostawcy)
-AccountCodeManager=Moduł do generowania kodów księgowych (klient lub dostawca)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=Powiadomienia email pozwalają na wysyłanie automatycznych wiadomości email w tle dla pewnym zdarzeń w aplikacji Dolibarr. Odbiorca powiadomień może być zdefiniowany:
 NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
 ModelModules=Szablony dokumentów
 DocumentModelOdt=Generowanie dokumentów z szablonów (.odt OpenDocuments lub ods pliki dla OpenOffice, KOffice, TextEdit, ...)
@@ -1203,6 +1210,9 @@ MustBeUnique=Musi być unikatowy?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
 TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Wywóz <b>link %s</b> format jest dostępny na poniższy link: %s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=Darmowy tekstu propozycji
 WatermarkOnDraftProposal=Znak wodny projektów wniosków komercyjnych (brak jeśli pusty)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Zapytaj o rachunku bankowego przeznaczenia propozycji
 ##### SupplierProposal #####
-SupplierProposalSetup=Cena żąda konfiguracji modułu dostawcy
-SupplierProposalNumberingModules=Wnioski Cena dostawcy numeracji modeli
-SupplierProposalPDFModules=Cena żąda dostawców modele dokumenty
-FreeLegalTextOnSupplierProposal=Bezpłatne tekst na prośby cen dostawców
-WatermarkOnDraftSupplierProposal=Znak wodny w sprawie projektu cenie żąda dostawców (brak jeśli pusty)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Zapytaj o rachunku bankowego przeznaczenia proponowaniu ceny
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Zapytaj o magazyn źródłowy dla zamówienia
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=Konfiguracja modułu zamówień
 OrdersNumberingModules=Zamówienia numeracji modules
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=Połączenie do serwera ' %s' z bazą danych " %s" z użytkowni
 OSCommerceTestKo1=Pomyślnie połączono się z serwerem '%s', ale baza danych '%s' jest niedostępna.
 OSCommerceTestKo2=Połączenie do serwera '%s' z użytkownikiem '%s' nie powiodło się.
 ##### Stock #####
-StockSetup=Magazyn konfiguracji modułu
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=W przypadku korzystania z modułu Point of Sale (moduł POS dostarczony domyślnie lub inny moduł zewnętrzny), ta konfiguracja może być ignorowana przez twój moduł POS. Większość modułów POS jest zaprojektowana, aby wystawiać natychmiast fakturę i obniżać zapas domyślnie, czyli podobnie jak poniższe opcje. Tak więc, jeśli chcesz lub nie, aby twój moduł POS obsłużył zmniejszanie zapasu na magazynie podczas rejestrowania sprzedaży, sprawdź konfigurację twojego modułu POS.
 ##### Menu #####
 MenuDeleted=Menu skreślony
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
 MultiCompanySetup=Firma Multi-Moduł konfiguracji
 ##### Suppliers #####
 SuppliersSetup=Dostawca konfiguracji modułu
-SuppliersCommandModel=Kompletny szablon zamówienia dostawcy (logo...)
-SuppliersInvoiceModel=Kompletny szablon faktury dostawcy (logo...)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Modele numeracji faktur dostawcy
 IfSetToYesDontForgetPermission=Jeśli jest ustawiona na yes, nie zapomnij, aby zapewnić uprawnień do grup lub użytkowników dopuszczonych do drugiego zatwierdzenia
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=Nie należy używać znaków wieloznacznych ("1", "L",
 SalariesSetup=Konfiguracja modułu wynagrodzenia
 SortOrder=Kolejność sortowania
 Format=Format
-TypePaymentDesc=0: Rodzaj klienta płatności, 1: Dostawca typ płatności, 2: Zarówno klienci i dostawcy typ płatności
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Dołącz ścieżkę (zdefiniowane w zmiennej% s)
 ExpenseReportsSetup=Konfiguracja modułu Raporty Kosztów
 TemplatePDFExpenseReports=Szablony dokumentów w celu wygenerowania raportu wydatków dokument
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Instalacja zewnętrznych modułów z p
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Kolor podświetlenia linii przy najechaniu na nią myszą (pozostaw puste jeżeli ma nie być podświetlona)
-TextTitleColor=Kolor tytułu strony
+TextTitleColor=Text color of Page title
 LinkColor=Kolor odnośników
 PressF5AfterChangingThis=Naciśnij CTRL+F5 na klawiaturze aby wyczyścić cache w przeglądarce po zmianie tej wartości, aby zobaczyć efekt tej zmiany
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=Kolor tła górnego menu
 TopMenuDisableImages=Ukryj obrazki górnego menu
 LeftMenuBackgroundColor=Kolor tła bocznego menu
 BackgroundTableTitleColor=Kolor tła nagłówka tabeli
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Kolor tła pozostałych lini tabeli
 BackgroundTableLineEvenColor=Kolor tła dla równomiernych lini tabeli
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
 ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-MailToMember=To send email from member page
-MailToUser=To send email from user page
-MailToProject= To send email from project page
+MailToSendProposal=Oferty klientów
+MailToSendOrder=Zamówienia klienta
+MailToSendInvoice=Faktury klienta
+MailToSendShipment=Transporty
+MailToSendIntervention=Interwencje
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Zamówienia zakupowe
+MailToSendSupplierInvoice=Faktury dostawcy
+MailToSendContract=Kontrakty
+MailToThirdparty=Kontrahenci
+MailToMember=Członkowie
+MailToUser=Użytkownicy
+MailToProject=Projects page
 ByDefaultInList=Pokaż domyślnie w widoku listy
 YouUseLastStableVersion=Używasz ostatniej stabilnej wersji
 TitleExampleForMajorRelease=Przykład wiadomości można użyć, aby ogłosić to główne wydanie (prosimy używać go na swoich stronach internetowych)
@@ -1780,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/pl_PL/agenda.lang b/htdocs/langs/pl_PL/agenda.lang
index 604be4379a8..dd101559a5b 100644
--- a/htdocs/langs/pl_PL/agenda.lang
+++ b/htdocs/langs/pl_PL/agenda.lang
@@ -53,9 +53,9 @@ MemberValidatedInDolibarr=Członek %s potwierdzony
 MemberModifiedInDolibarr=Użytkownik %s zmodyfikowany
 MemberResiliatedInDolibarr=Członek %s został usunięty
 MemberDeletedInDolibarr=Członek %s usunięty
-MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
-MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
-MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
+MemberSubscriptionAddedInDolibarr=Subskrypcja %s dla członka %s dodana
+MemberSubscriptionModifiedInDolibarr=Subskrypcja %s dla członka %s zmodyfikowana
+MemberSubscriptionDeletedInDolibarr=Subskrypcja %s dla członka %s usunięta
 ShipmentValidatedInDolibarr=Przesyłka %s potwierdzona
 ShipmentClassifyClosedInDolibarr=Wysyłka %s sklasyfikowana jako rozliczona
 ShipmentUnClassifyCloseddInDolibarr=Wysyłka %s sklasyfikowana jako ponownie otwarta
diff --git a/htdocs/langs/pl_PL/bills.lang b/htdocs/langs/pl_PL/bills.lang
index 03072094e0d..d32b3694bda 100644
--- a/htdocs/langs/pl_PL/bills.lang
+++ b/htdocs/langs/pl_PL/bills.lang
@@ -109,7 +109,7 @@ CancelBill=Anulowanie faktury
 SendRemindByMail=Wyślij przypomnienie / ponaglenie mailem
 DoPayment=Wprowadź płatność
 DoPaymentBack=Wprowadź zwrot
-ConvertToReduc=Zamień na przyszły rabat
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Wprowadź płatność otrzymaną od klienta
@@ -120,7 +120,7 @@ BillStatus=Status faktury
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Projekt (musi zostać zatwierdzone)
 BillStatusPaid=Płatność
-BillStatusPaidBackOrConverted=Credit note refund or converted into discount
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Opuszczony
 BillStatusValidated=Zatwierdzona (trzeba zapłacić)
@@ -296,10 +296,10 @@ DiscountType=Discount type
 NoteReason=Uwaga/Powód
 ReasonDiscount=Powód
 DiscountOfferedBy=Przyznane przez
-DiscountStillRemaining=Dostępne zniżki
-DiscountAlreadyCounted=Discounts already consumed
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+SupplierDiscounts=Vendors discounts
 BillAddress=Bill adres
 HelpEscompte=Ta zniżka zniżki przyznawane klienta, ponieważ jego paiement został złożony przed terminem.
 HelpAbandonBadCustomer=Kwota ta została opuszczonych (klient mówi się, że zły klient) i jest uważany za exceptionnal luźne.
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Co %s dni
 FrequencyPer_m=Co %s miesięcy
 FrequencyPer_y=Co %s lat
@@ -505,9 +511,14 @@ SituationAmount=Kwota Sytuacja faktury (netto)
 SituationDeduction=Sytuacja odejmowanie
 ModifyAllLines=Modyfikuj wszystkie linie
 CreateNextSituationInvoice=Tworzenie kolejnej sytuacji
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=Następna sytuacja już istnieje.
 DisabledBecauseFinal=Sytuacja ta jest ostateczna.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=Ni
 CantBeLessThanMinPercent=Postęp nie może być mniejsza niż wartość w poprzedniej sytuacji.
 NoSituations=Brak otwartych sytuacji
 InvoiceSituationLast=Ostatnia i główna faktura
@@ -532,3 +543,4 @@ AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/pl_PL/boxes.lang b/htdocs/langs/pl_PL/boxes.lang
index 49d1d4f4811..3192cb72101 100644
--- a/htdocs/langs/pl_PL/boxes.lang
+++ b/htdocs/langs/pl_PL/boxes.lang
@@ -54,7 +54,7 @@ NoRecordedContacts=Brak zapisanych kontaktów
 NoActionsToDo=Brak działań do wykonania
 NoRecordedOrders=Brak zarejestrowanych zamówień klienta
 NoRecordedProposals=Brak zarejestrowanych wniosków
-NoRecordedInvoices=Brak zarejestrowanych rachunków klienta
+NoRecordedInvoices=Brak zarejestrowanych faktur klienta
 NoUnpaidCustomerBills=Brak niezapłaconych faktur klientów
 NoUnpaidSupplierBills=Brak niezapłaconych faktur dostawców
 NoModifiedSupplierBills=Brak zarejestrowanych faktur dostawców
@@ -77,7 +77,7 @@ BoxTitleLastModifiedSupplierBills=Ostatnie %s zmodyfikowanych rachunków dostawc
 BoxTitleLatestModifiedSupplierOrders=Ostatnie %s zmodyfikowanych zamówień dostawców
 BoxTitleLastModifiedCustomerBills=Ostatnie %s zmodyfikowanych rachunków klientów
 BoxTitleLastModifiedCustomerOrders=Ostatnich %s modyfikowanych zamówień klientów
-BoxTitleLastModifiedPropals=Ostatnich %s zmodyfikowanych ofert
+BoxTitleLastModifiedPropals=Ostatnie %s zmodyfikowane oferty
 ForCustomersInvoices=Faktury Klientów
 ForCustomersOrders=Zamówienia klientów
 ForProposals=Oferty
diff --git a/htdocs/langs/pl_PL/categories.lang b/htdocs/langs/pl_PL/categories.lang
index b1c7e4abe40..44d992c0ee6 100644
--- a/htdocs/langs/pl_PL/categories.lang
+++ b/htdocs/langs/pl_PL/categories.lang
@@ -16,7 +16,7 @@ MembersCategoriesArea=Użytkownicy tagi / obszar kategorie
 ContactsCategoriesArea=Kontakt tagi / obszar kategorie
 AccountsCategoriesArea=Obsza tagów / kategorii kont
 ProjectsCategoriesArea=Obszar tagów / kategorii projektów
-SubCats=Podkategorie
+SubCats=Sub-categories
 CatList=Lista tagów / kategorii
 NewCategory=Nowy tag / kategoria
 ModifCat=Modyfikuj tag/kategorię
@@ -85,3 +85,4 @@ CategorieRecursivHelp=Jeśli aktywna, produkt będzie również związany z kate
 AddProductServiceIntoCategory=Dodaj następujący produkt / usługę
 ShowCategory=Pokaż tag / kategoria
 ByDefaultInList=Domyśłnie na liście
+ChooseCategory=Choose category
diff --git a/htdocs/langs/pl_PL/commercial.lang b/htdocs/langs/pl_PL/commercial.lang
index 2bb992a826d..aabac7a4500 100644
--- a/htdocs/langs/pl_PL/commercial.lang
+++ b/htdocs/langs/pl_PL/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=Blisko
 ActionAC_EMAILING=Wyślij mass maila
 ActionAC_COM=Wyślij zamówienie klienta pocztą
 ActionAC_SHIP=Wyślij wysyłki za pośrednictwem poczty
-ActionAC_SUP_ORD=Wyślij zamówienie dostawy pocztą.
-ActionAC_SUP_INV=Wyślij Fakture/rozliczenie dostawy pocztą
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=Inny
 ActionAC_OTH_AUTO=Automatycznie wstawione wydarzenia
 ActionAC_MANUAL=Ręcznie wstawione wydarzenia
@@ -71,9 +71,9 @@ Stats=Statystyka sprzedaży
 StatusProsp=Stan oferty
 DraftPropals=Szkic oferty handlowej
 NoLimit=Bez limitu
-ToOfferALinkForOnlineSignature=Link for online signature
+ToOfferALinkForOnlineSignature=Link dla podpisu online
 WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
 ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
 ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
 SignatureProposalRef=Signature of quote/commerical proposal %s
-FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
+FeatureOnlineSignDisabled=Funkcjonalność podpisu online wyłączona lub dokument wygenerowano przed włączeniem tej funkcji
diff --git a/htdocs/langs/pl_PL/companies.lang b/htdocs/langs/pl_PL/companies.lang
index 03ae564da5a..bde9269a0e3 100644
--- a/htdocs/langs/pl_PL/companies.lang
+++ b/htdocs/langs/pl_PL/companies.lang
@@ -10,9 +10,9 @@ MenuNewCustomer=Nowy klient
 MenuNewProspect=Nowy potencjalny klient
 MenuNewSupplier=Nowy dostawca
 MenuNewPrivateIndividual=Nowa osoba prywatna
-NewCompany=Nowa firma (potencjalny klient, klient, dostawca)
-NewThirdParty=Nowy kontrahent (potencjalny klient, klient, dostawca)
-CreateDolibarrThirdPartySupplier=Wprowadź podmiot zewnętrzny (dostawca)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Stwórz kontrahenta (dostawcę)
 CreateThirdPartyOnly=Utwórz kontrahenta
 CreateThirdPartyAndContact=Utwórz kontrahenta i potomny kontakt
 ProspectionArea=Obszar potencjalnych klientów
@@ -43,7 +43,7 @@ Individual=Osoba prywatna
 ToCreateContactWithSameName=Utworzy automatycznie kontakt/adres z takimi samymi informacjami jak dane kontrahenta. Najczęściej jeżeli twój kontrahent jest osobą fizyczną, wystarczy utworzenie samego kontrahenta.
 ParentCompany=Firma macierzysta
 Subsidiaries=Oddziały
-ReportByMonth=Report by month
+ReportByMonth=Raport za miesiąc
 ReportByCustomers=Report by customer
 ReportByQuarter=Raport wg stawek
 CivilityCode=Zwrot grzecznościowy
@@ -77,11 +77,11 @@ Web=Strona www
 Poste= Stanowisko
 DefaultLang=Domyślny język
 VATIsUsed=Sales tax is used
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Uzupełnij adres danymi kontrahenta
-ThirdpartyNotCustomerNotSupplierSoNoRef=Ani kontrahent, ani klient, ani dostawca, nie ma obiektów odsyłających
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Konto bankowe dla płatności
 OverAllProposals=Propozycje
 OverAllOrders=Zamówienia
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=Typ Re
 TypeLocaltax2ES=Typ IRPF
 WrongCustomerCode=Nieprawidłowy kod Klienta
-WrongSupplierCode=Nieprawidłowy kod Dostawcy
+WrongSupplierCode=Nieprawidłowy kod dostawcy
 CustomerCodeModel=Model kodu Klienta
-SupplierCodeModel=Model kodu Dostawcy
+SupplierCodeModel=Model kodu dostawcy
 Gencod=Kod kreskowy
 ##### Professional ID #####
 ProfId1Short=Prof ID 1
@@ -267,7 +267,7 @@ Prospect=Perspektywa
 CustomerCard=Karta Klienta
 Customer=Klient
 CustomerRelativeDiscount=Względny rabat klienta
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=Względny rabat
 CustomerAbsoluteDiscountShort=Bezwzględny rabat
 CompanyHasRelativeDiscount=Ten klient ma standardowy rabat <b>%s%%</b>
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this suppl
 CompanyHasNoAbsoluteDiscount=Ten klient nie posiada punktów rabatowych
 CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
 CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=Żaden
 Supplier=Dostawca
 AddContact=Stwórz konktakt
@@ -308,9 +308,9 @@ SupplierCode=Kod dostawcy
 CustomerCodeShort=Kod klienta
 SupplierCodeShort=Kod dostawcy
 CustomerCodeDesc=Kod Klienta, unikatowy dla wszystkich klientów
-SupplierCodeDesc=Kod Dostawcy, unikatowy dla wszystkich dostawców
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=Wymagane, jeżeli Kontrahent jest klientem lub potencjalnym klientem
-RequiredIfSupplier=Wymagane, jeżeli kontrahent jest dostawcą
+RequiredIfSupplier=Wymagane jeżeli kontrahent jest dostawcą
 ValidityControledByModule=Ważność kontrolowana przez moduł
 ThisIsModuleRules=To są zasady tego modułu
 ProspectToContact=Potencjalny Klient do kontaktu
@@ -338,7 +338,7 @@ MyContacts=Moje kontakty
 Capital=Kapitał
 CapitalOf=Kapitał %s
 EditCompany=Edycja firmy
-ThisUserIsNot=Ten użytkownik nie jest potencjalnym klientem, klientem ani dostawcą
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=Sprawdź
 VATIntraCheckDesc=Kliknij tutaj <b>%s</b> aby sprawdzić NIP Klienta w serwisie Europejskiej Komisji VAT. Wymagany jest dostęp do internetu.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do?locale=pl
@@ -391,7 +391,7 @@ ExportDataset_company_1=Kontrahenci (Firmy/Fundacje/Osoby fizyczne) i ich ustawi
 ExportDataset_company_2=Kontakty i właściwości
 ImportDataset_company_1=Kontrahenci (Firmy/Fundacje/Osoby fizyczne) i ich ustawienia
 ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
-ImportDataset_company_3=Bank accounts of third parties
+ImportDataset_company_3=Konta bankowe kontrahentów
 ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
 PriceLevel=Poziom cen
 DeliveryAddress=Adres dostawy
@@ -419,8 +419,8 @@ ProductsIntoElements=Lista produktów/usług w %s
 CurrentOutstandingBill=Biężący, niezapłacony rachunek
 OutstandingBill=Maksymalna kwota niezapłaconego rachunku
 OutstandingBillReached=Maksymalna kwota dla niespłaconych rachunków osiągnięta
-OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Wróć NUMERO z formatu %syymm-nnnn klienta i kod %syymm-nnnn dla dostawcy kod yy gdzie jest rok, mm miesiąc i nnnn jest ciągiem bez przerwy i nie ma powrotu do 0.\nZwraca numer w formacie %syymm-nnnn dla kodu klienta i %syymm-nnnn dla kodu dostawcy, gdzie yy to rok, mm to miesiąc i nnnn jest sekwencją bez przerwy, bez powrotu do 0.
+OrderMinAmount=Minimalna kwota dla zamówienia
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=Dowolny kod Klienta / Dostawcy. Ten kod może być modyfikowany w dowolnym momencie.
 ManagingDirectors=Funkcja(e) managera (prezes, dyrektor generalny...)
 MergeOriginThirdparty=Duplikuj kontrahenta (kontrahenta, którego chcesz usunąć)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Login przedstawiciela handlowego
 SaleRepresentativeFirstname=Imię przedstawiciela handlowego
 SaleRepresentativeLastname=Nazwisko przedstawiciela handlowego
 ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=Kod dla nowego klienta lub dostawcy zasugerowany dla zduplikowanego kodu
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/pl_PL/compta.lang b/htdocs/langs/pl_PL/compta.lang
index 55cb8da5453..4dec92233f5 100644
--- a/htdocs/langs/pl_PL/compta.lang
+++ b/htdocs/langs/pl_PL/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=HT paid
 VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
-VATSummary=Tax Balance
+VATSummary=Tax monthly
+VATBalance=Tax Balance
 VATPaid=Tax paid
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=Obszar księgowości
 NewPayment=Nowa płatność
 Payments=Płatności
 PaymentCustomerInvoice=Klient płatności faktury
-PaymentSupplierInvoice=Dostawca płatności faktury
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Płatność za ZUS/podatek
 PaymentVat=Zapłata podatku VAT
 ListPayment=Wykaz płatności
 ListOfCustomerPayments=Lista płatności klientów
-ListOfSupplierPayments=Lista płatności dostawców
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Data początku okresu
 DateEndPeriod=Data końca okresu
 newLT1Payment=Nowa płatność podatku 2
@@ -110,7 +111,7 @@ ShowVatPayment=Pokaż płatności za podatek VAT
 TotalToPay=Razem do zapłaty
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
 CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Kod księg. klienta
 SupplierAccountancyCodeShort=Kod rach. dost.
 AccountNumber=Numer konta
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=Sprawozdanie trzecim RE partii
 LT2ReportByCustomersES=Raport osób trzecich IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Sprawozdanie VAT klienta gromadzone i wypłacane
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Chart of accounts models
 Pcg_type=Typ PCG
 Pcg_subtype=PCG podtyp
 InvoiceLinesToDispatch=Linie do wysyłki faktury
-ByProductsAndServices=Przez produkty i usługi
+ByProductsAndServices=By product and service
 RefExt=Ref Zewnętrzne
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
 LinkedOrder=Link do zamówienia
@@ -215,7 +218,8 @@ Mode1=Metoda 1
 Mode2=Metoda 2
 CalculationRuleDesc=Aby obliczyć całkowity podatek VAT, można wykorzystać jedną z dwóch metod: <br> Metoda 1 polega na zaokrągleniu VAT dla każdej pozycji, a następnie ich zsumowaniu. <br> Metoda 2 polega na zsumowaniu wszystkich VAT z każdej pozycji, a następnie zaokrągleniu wyniku. <br> Efekt końcowy może różnić się o kilka groszy. Domyślnym trybem jest tryb <b>%s</b>.
 CalculationRuleDescSupplier=W zależności od dostawcy, wybierz odpowiednią metodę, aby dodać podobną zasadę i otrzymać podobny wynik oczekiwany przez dostawcę.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Raport obroty na produkcie, w przypadku korzystania z trybu <b>rachunkowości gotówki,</b> nie ma znaczenia. Raport ten jest dostępny tylko w przypadku korzystania z trybu <b>zaangażowanie rachunkowości</b> (patrz konfiguracja modułu księgowego).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Tryb Obliczanie
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=Powiel opłatę za ZUS/podatek
 ConfirmCloneTax=Potwierdź powielenie płatności za ZUS/podatek
@@ -242,3 +246,10 @@ FiscalPeriod=Okres rozliczeniowy
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/pl_PL/contracts.lang b/htdocs/langs/pl_PL/contracts.lang
index 96008ff3767..32a5e4997a4 100644
--- a/htdocs/langs/pl_PL/contracts.lang
+++ b/htdocs/langs/pl_PL/contracts.lang
@@ -31,7 +31,7 @@ NewContract=Nowy kontrakt
 NewContractSubscription=Nowa umowa/subskrypcja
 AddContract=Stwórz kontrakt
 DeleteAContract=Usuń kontrakt
-ActivateAllOnContract=Activate all services
+ActivateAllOnContract=Aktywuj wszystkie usługi
 CloseAContract=Zamknij kontrakt
 ConfirmDeleteAContract=Are you sure you want to delete this contract and all its services?
 ConfirmValidateContract=Are you sure you want to validate this contract under name <b>%s</b>?
diff --git a/htdocs/langs/pl_PL/dict.lang b/htdocs/langs/pl_PL/dict.lang
index 4a7ed4c2b49..9888ae40d0a 100644
--- a/htdocs/langs/pl_PL/dict.lang
+++ b/htdocs/langs/pl_PL/dict.lang
@@ -5,7 +5,8 @@ CountryIT=Włochy
 CountryES=Hiszpania
 CountryDE=Niemcy
 CountryCH=Szwajcaria
-CountryGB=Wielkiej Brytanii
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=Zjednoczone Królestwo
 CountryUK=Zjednoczone Królestwo
 CountryIE=Irlandia
 CountryCN=Chiny
diff --git a/htdocs/langs/pl_PL/ecm.lang b/htdocs/langs/pl_PL/ecm.lang
index 110e5cd6cd8..4b5feca5c01 100644
--- a/htdocs/langs/pl_PL/ecm.lang
+++ b/htdocs/langs/pl_PL/ecm.lang
@@ -39,9 +39,10 @@ ShowECMSection=Pokaż katalog
 DeleteSection=Usuń katalog
 ConfirmDeleteSection=Czy możesz potwierdzić usunięcie katalogu <b>%s</b>?
 ECMDirectoryForFiles=Pokrewny katalog dla plików
-CannotRemoveDirectoryContainsFiles=Usunięcie nie możliwe, ponieważ zawiera on pewne pliki
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=Menedżer plików
-ECMSelectASection=Wybierz katalog na lewym drzewie...
+ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
diff --git a/htdocs/langs/pl_PL/errors.lang b/htdocs/langs/pl_PL/errors.lang
index c85f437535f..ce6a8de3891 100644
--- a/htdocs/langs/pl_PL/errors.lang
+++ b/htdocs/langs/pl_PL/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Wymagany kod kreskowy
 ErrorCustomerCodeAlreadyUsed=Kod klienta jest już używany
 ErrorBarCodeAlreadyUsed=Kod kreskowy jest już używany
 ErrorPrefixRequired=Wymaga przedrostka
-ErrorBadSupplierCodeSyntax=Zła składnia dla kodu dostawcy
-ErrorSupplierCodeRequired=Wymagany kod dostawcy
-ErrorSupplierCodeAlreadyUsed=Kod dostawcy aktualnie używany
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Złe parametry
 ErrorBadValueForParameter=Zła wartość '%s' dla parametru '%s'
 ErrorBadImageFormat=Plik ze zdjęciem ma nie wspierany format (twoje PHP nie wspiera funcji konwersji zdjęć w tym formacie)
@@ -87,7 +87,7 @@ ErrorsOnXLines=Błędów na linii źródło <b>%s</b>
 ErrorFileIsInfectedWithAVirus=Program antywirusowy nie był w stanie potwierdzić (plik może być zainfekowany przez wirusa)
 ErrorSpecialCharNotAllowedForField=Znaki specjalne nie są dozwolone dla pola "%s"
 ErrorNumRefModel=Odniesienia nie istnieje w bazie danych (%s) i nie jest zgodna z tą zasadą numeracji. Zmiana nazwy lub usuwanie zapisu w odniesieniu do aktywacji tego modułu.
-ErrorQtyTooLowForThisSupplier=Zbyt mała ilość tego dostawcy lub ceny nie określono tego produktu dla tego dostawca
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Ustawienia modułu wyglądają na niekompletne. Idź do Strona główna - Konfiguracja - Moduły aby ukończyć.
 ErrorBadMask=Błąd w masce wprowadzania
 ErrorBadMaskFailedToLocatePosOfSequence=Błąd, maska ​​bez kolejnego numeru
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad definicja tablicy w menu mod
 ErrorSavingChanges=Wystąpił błąd podczas zapisywania zmian
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=Flik musi mieć format %s
-ErrorSupplierCountryIsNotDefined=Kraj dla tego dostawcy nie jest zdefiniowany. Proszę to poprawić.
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Zapas dla artykułu %sjest nie wystarczający, aby dodać go do nowego zamówienia
 ErrorStockIsNotEnoughToAddProductOnInvoice=Zapas dla artykułu %s jest nie wystarczający, aby dodać go do nowej faktury
diff --git a/htdocs/langs/pl_PL/exports.lang b/htdocs/langs/pl_PL/exports.lang
index 00691647d92..cbd78a15689 100644
--- a/htdocs/langs/pl_PL/exports.lang
+++ b/htdocs/langs/pl_PL/exports.lang
@@ -120,7 +120,7 @@ SelectPrimaryColumnsForUpdateAttempt=Select column(s) to use as primary key for
 UpdateNotYetSupportedForThisImport=Update is not supported for this type of import (only insert)
 NoUpdateAttempt=No update attempt was performed, only insert
 ImportDataset_user_1=Użytkownicy (pracownicy lub nie) i ustawienia
-ComputedField=Computed field
+ComputedField=Obliczone pole
 ## filters
 SelectFilterFields=Jeśli chcesz filtrować po jakiś wartościach, po po prostu podaj wartości tutaj.
 FilteredFields=Filtrowane pola
diff --git a/htdocs/langs/pl_PL/holiday.lang b/htdocs/langs/pl_PL/holiday.lang
index 164418c393c..a3f2acbf11a 100644
--- a/htdocs/langs/pl_PL/holiday.lang
+++ b/htdocs/langs/pl_PL/holiday.lang
@@ -2,10 +2,10 @@
 HRM=HRM
 Holidays=Urlopy
 CPTitreMenu=Urlopy
-MenuReportMonth=Oświadczenie miesięczny
+MenuReportMonth=Miesięczne zestawienie
 MenuAddCP=Nowy wniosek urlopowy
 NotActiveModCP=Musisz włączyć moduł Urlopów aby zobaczyć tą stronę.
-AddCP=Złożyć wniosek do urlopu
+AddCP=Stwórz wniosek  urlopowy
 DateDebCP=Data rozpoczęcia
 DateFinCP=Data zakończenia
 DateCreateCP=Data utworzenia
@@ -13,13 +13,18 @@ DraftCP=Szkic
 ToReviewCP=Oczekuje na zatwierdzenie
 ApprovedCP=Zatwierdzony
 CancelCP=Odwołany
-RefuseCP=Odmówił
-ValidatorCP=Approbator
+RefuseCP=Odrzucony
+ValidatorCP=Akceptujący
 ListeCP=Lista urlopów
-ReviewedByCP=Będzie zatwierdzone przez
+LeaveId=Leave ID
+ReviewedByCP=Będzie zatwierdzony przez
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=Firstname of approval user
+UserForApprovalLastname=Lastname of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=Opis
 SendRequestCP=Tworzenie wniosku urlopowego
-DelayToRequestCP=Zostawić wnioski muszą być wykonane co <b>​​najmniej% s dzień (dni)</b> przed nimi.
+DelayToRequestCP=Wniosek urlopowy musi być stworzony przynajmniej <b>%s dzień (i) </b> przed jego rozpoczęciem.
 MenuConfCP=Bilans urlopów
 SoldeCPUser=Liście saldo <b>jest% s</b> dni.
 ErrorEndDateCP=Musisz wybrać datę zakończenia większą niż data rozpoczęcia.
@@ -30,22 +35,29 @@ ErrorUserViewCP=Nie masz uprawnień do przeglądania tego wniosku urlopowego
 InfosWorkflowCP=Informacje Workflow
 RequestByCP=Wniosek
 TitreRequestCP=Wniosek urlopowy
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=Liczba dni urlopu spożywane
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=Edytuj
 DeleteCP=Usunąć
-ActionRefuseCP=Odmawiać
+ActionRefuseCP=Odrzuć
 ActionCancelCP=Anuluj
 StatutCP=Status
 TitleDeleteCP=Usuń wniosek urlopowy
 ConfirmDeleteCP=Potwierdzić usunięcie tego wniosku urlopowego?
-ErrorCantDeleteCP=Błąd nie masz prawo do usunięcia tego żądania urlopu.
-CantCreateCP=Nie mają prawa do składania wniosków urlopowych.
-InvalidValidatorCP=Musisz wybrać approbator do żądania urlopu.
+ErrorCantDeleteCP=Błąd. Nie masz uprawnień do kasowania tego wniosku urlopowego.
+CantCreateCP=Nie masz uprawnień do tworzenia wniosku urlopowego.
+InvalidValidatorCP=Musisz wybrać zatwierdzającego dla twojego wniosku urlopowego.
 NoDateDebut=Musisz wybrać datę rozpoczęcia.
 NoDateFin=Musisz wybrać datę zakończenia.
 ErrorDureeCP=Twój wniosek urlopowy nie zawiera dni roboczych.
-TitleValidCP=Zatwierdzenie wniosku urlopu
-ConfirmValidCP=Czy na pewno chcesz, aby zatwierdzić wniosek urlopu?
+TitleValidCP=Zaakceptuj wniosek urlopowy
+ConfirmValidCP=Czy jesteś pewien, że chcesz zaakceptować wniosek urlopowy?
 DateValidCP=Data zatwierdzenia
 TitleToValidCP=Wyslij wniosek urlopowy
 ConfirmToValidCP=Czy jesteś pewien, że chcesz wysłać wniosek urlopowy?
@@ -59,6 +71,7 @@ DateRefusCP=Data odmowy
 DateCancelCP=Data odwołania
 DefineEventUserCP=Przypisywanie wyjątkowy urlop dla użytkownika
 addEventToUserCP=Przypisywanie urlopu
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=Powód
 UserCP=Użytkownik
 ErrorAddEventToUserCP=Wystąpił błąd podczas dodawania wyjątkowy urlop.
@@ -78,10 +91,15 @@ ManualUpdate=Ręczna aktualizacja
 HolidaysCancelation=Anulowanie wniosku urlopowego
 EmployeeLastname=Nazwisko pracownika
 EmployeeFirstname=Imię pracownika
-TypeWasDisabledOrRemoved=Typ urlopu (id %s) zostało wyłączone lub usunięte
+TypeWasDisabledOrRemoved=Typ urlopu (id %s) został wyłączony lub usunięty
 LastHolidays=Ostatnie %s wnioski urlopowe
 AllHolidays=Wszystkie wnioski urlopowe
-
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
 LastUpdateCP=Ostatnia automatyczna aktualizacja alokacji urlopów
 MonthOfLastMonthlyUpdate=Miesiąc ostatniej automatycznej aktualizacji alokacji urlopów
@@ -91,10 +109,10 @@ Module27130Desc= Zarządzanie wnioskami urlopowymi
 ErrorMailNotSend=Wystąpił błąd podczas wysyłania wiadomości e-mail:
 NoticePeriod=Okres wypowiedzenia
 #Messages
-HolidaysToValidate=Weryfikacja wniosków urlopowych
+HolidaysToValidate=Zatwierdź wnioski urlopowe
 HolidaysToValidateBody=Poniżej jest wniosek o dopuszczenie do sprawdzenia
 HolidaysToValidateDelay=Wniosek ten urlop odbędzie się w ciągu mniej niż% s dni.
-HolidaysToValidateAlertSolde=Użytkownik, który dokonał tego zostawić nie mają przesiał wniosek wystarczająco dostępne dni.
+HolidaysToValidateAlertSolde=Użytkownik, który stworzył ten wniosek urlopowy nie ma wystarczających ilości dni.
 HolidaysValidated=Zatwierdzone wnioski urlopowe
 HolidaysValidatedBody=Twój wniosek urlopowy od %s do %s został zatwierdzony.
 HolidaysRefused=Zapytanie zaprzeczył
diff --git a/htdocs/langs/pl_PL/install.lang b/htdocs/langs/pl_PL/install.lang
index 062a4bf2f0a..75885569df4 100644
--- a/htdocs/langs/pl_PL/install.lang
+++ b/htdocs/langs/pl_PL/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=Plik konfiguracyjny <b>%s</b> nie istn
 ConfFileCouldBeCreated=Plik konfiguracyjny <b>%s</b> został lub mógł zostać utworzony.
 ConfFileIsNotWritable=Plik konfiguracyjny <b>%s</b> nie ma uprawnień do zapisu. Sprawdź uprawnienia. Przy pierwszej instalacji Twój serwer WWW musi posiadać uprawnienia do zapisu tego pliku podczas procesu konfiguracji (Dla systemów uniksowych wystarczy wykonać polecenie "chmod 666").
 ConfFileIsWritable=Plik konfiguracyjny <b>%s</b> ma uprawnienia do zapisu.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Odśwież wszystkie informacje z pliku konfiguracyjnego.
 PHPSupportSessions=PHP obsługuje sesje.
 PHPSupportPOSTGETOk=PHP obsługuje zmienne POST i GET.
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Utworzenie konta administratora Dolibarr nie powiodło
 WarningRemoveInstallDir=Ostrzeżenie: ze względów bezpieczeństwa by zapobiec nieuprawnionemu użyciu po instalacji lub aktualizacji powinno się usunąć katalog install lub zmienić jego nazwę na <b>install.lock</b>.
 FunctionNotAvailableInThisPHP=Niedostępne w tej wersji PHP
 ChoosedMigrateScript=Wybierz skrypt migracyjny
-DataMigration=Migracja danych
-DatabaseMigration=Migracja struktur baz danych
+DataMigration=Migracja bazy danych (dane)
+DatabaseMigration=Migracja bazy danych (struktura i niektóre dane)
 ProcessMigrateScript=Przetwarzanie skryptów
 ChooseYourSetupMode=Wybierz tryb instalacji i potwierdź przyciskiem "Start"...
 FreshInstall=Nowa instalacja
@@ -146,13 +147,13 @@ NothingToDo=Nic do zrobienia
 # upgrade
 MigrationFixData=Napraw nieznormalizowane dane
 MigrationOrder=Migracja danych zamówień odbiorców
-MigrationSupplierOrder=Migracja danych zamówień dostawców
+MigrationSupplierOrder=Migracja danych dla zamówień dostawców
 MigrationProposal=Migracja danych dla ofert handlowych
 MigrationInvoice=Migracja dla danych faktur odbiorców
 MigrationContract=Migracja danych kontraktów
 MigrationSuccessfullUpdate=Aktualizacja zakończona pomyślnie
 MigrationUpdateFailed=Aktualizacja nie powiodła się
-MigrationRelationshipTables=Migracja dla danych propozycji handlowych (%s)
+MigrationRelationshipTables=Migracja dla danych spokrewnionych tabel (%s)
 MigrationPaymentsUpdate=Korekta danych płatności
 MigrationPaymentsNumberToUpdate=%s płatności do aktualizacji
 MigrationProcessPaymentUpdate=Aktualizacja płatności %s
@@ -196,6 +197,8 @@ MigrationEvents=Przenieś wydarzenie by dodać nowego właściciela do przypisan
 MigrationEventsContact=Migracja zdarzeń w celu dodania kontaktu zdarzenia do tabeli przydziału
 MigrationRemiseEntity=Zaktualizuj wartość pola podmiotu llx_societe_remise
 MigrationRemiseExceptEntity=Zaktualizuj wartość pola podmiotu llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
 MigrationReloadModule=Odśwież moduł %s
 MigrationResetBlockedLog=Zresetuj moduł BlockedLog dla algorytmu v7
 ShowNotAvailableOptions=Pokaż niedostępne opcje.
diff --git a/htdocs/langs/pl_PL/ldap.lang b/htdocs/langs/pl_PL/ldap.lang
index 52010a9c165..3295d552dbd 100644
--- a/htdocs/langs/pl_PL/ldap.lang
+++ b/htdocs/langs/pl_PL/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Hasło do domeny
 YouMustChangePassNextLogon=Hasło dla <b>użytkownika %s na %s</b> domeny muszą być zmienione.
 UserMustChangePassNextLogon=Użytkownik musi zmienić hasło w domenie %s
 LDAPInformationsForThisContact=Informacje zawarte w bazie danych LDAP dla tego kontaktu
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Member type synchronized
 ContactSynchronized=Kontakt zsynchronizowany
 ForceSynchronize=Synchronizacja użytkownika (Dolibarr -> LDAP)
 ErrorFailedToReadLDAP=Nie można odczytać bazy danych LDAP. Sprawdź LDAP moduł konfiguracji bazy danych i dostępności.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/pl_PL/loan.lang b/htdocs/langs/pl_PL/loan.lang
index f7277feb703..42c2333f80e 100644
--- a/htdocs/langs/pl_PL/loan.lang
+++ b/htdocs/langs/pl_PL/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=Kapitał
 Insurance=Ubezpieczenie
 Interest=Odsetki
 Nbterms=Liczba składników
+Term=Term
 LoanAccountancyCapitalCode=Kapitał rachunku księgowego
 LoanAccountancyInsuranceCode=Ubezpieczenie konta księgowego
 LoanAccountancyInterestCode=Odsetki rachunku księgowego
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=Potwierdź usunięcie tego kredytu
 LoanDeleted=Pożyczka została usunięta
 ConfirmPayLoan=Potwierdź sklasyfikować wypłacane pożyczka
 LoanPaid=Pożyczka Płatny
-# Calc
-LoanCalc=Kalkulator kredytu bankowego
-PurchaseFinanceInfo=Zakup i Finansowanie informacji
-SalePriceOfAsset=Cena sprzedaży aktywów
-PercentageDown=Procent w dół
-LengthOfMortgage=Czas trwania kredytu
-AnnualInterestRate=Roczna stopa procentowa
-ExplainCalculations=Wyjaśnij Obliczenia
-ShowMeCalculationsAndAmortization=Pokaż mi obliczenia i amortyzację
-MortgagePaymentInformation=Informacje o płatności za kredyt hipoteczny
-DownPayment=Zaliczka
-DownPaymentDesc=<b>Zaliczka</b> = cena domu pomnożona przez procent w dół, podzielona przez 100 (dla 5% w dół staje 5/100 lub 0,05)
-InterestRateDesc=<b>Oprocentowanie</b> = Roczna wartość procentowa odsetek podzielony przez 100
-MonthlyFactorDesc=<b>Miesięczna czynnikiem</b> = wynik wzoru
-MonthlyInterestRateDesc=<b>Miesięczna stopa procentowa</b> = roczna stopa procentowa podzielona przez 12 (za 12 miesięcy w roku)
-MonthTermDesc=<b>Miesięcy okres</b> kredytowania w miesiącach = ilość lat wziąłeś kredyt się do czasów 12
-MonthlyPaymentDesc=Miesięczny płatności zorientowali się, stosując następujący wzór
-AmortizationPaymentDesc=<a href="#amortization">Amortyzacja</a> zepsuje, ile miesięczne płatności idzie w kierunku zainteresowania banku, a ile idzie do spłaty kwoty głównej pożyczki.
-AmountFinanced=Kwota finansowania
-AmortizationMonthlyPaymentOverYears=Amortyzacja miesięczną <b>spłatę:% s</b> na% s lat
-Totalsforyear=Sumy dla roku
-MonthlyPayment=Miesięczna płatność
-LoanCalcDesc=Ten <b> kalkulator kredytu hipotycznego </b> może zostać użyty do określenia miesięcznych spłat pożyczki, na podstawie kwoty kredytu, okresu kredytowania i oprocentowania. <br> Kalkulator zawiera również PUK (Prywatne Ubezpieczenie Kredytu) dla pożyczek, gdzie mniej niż 20%% jest umieszczone jako zaliczka. Brane pod uwagę są również miejskie podatki od nieruchomości i ich wpływ na całkowitą miesięczną ratę <br>
-GoToInterest=% s zostanie przeznaczona INTERESÓW
-GoToPrincipal=% s zostanie przeznaczona PODSTAWOWA
-YouWillSpend=Wydasz %s w roku %s
 ListLoanAssociatedProject=Lista pożyczek związanych z projektem
 AddLoan=Utwórz pożyczkę
+FinancialCommitment=Financial commitment
+InterestAmount=Odsetki
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=Konfiguracja modułu kredytu
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Domyśly kapitał konta rachunkowego
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Domyślnie odsetki od rachunku księgowego
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Domyślnie ubezpieczenie rachunku księgowego
-FinancialCommitment=Financial commitment
 CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/langs/pl_PL/mails.lang b/htdocs/langs/pl_PL/mails.lang
index 9714e10deff..df4613a62d1 100644
--- a/htdocs/langs/pl_PL/mails.lang
+++ b/htdocs/langs/pl_PL/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Nadawca
 MailErrorsTo=Błędów do
 MailReply=Odpowiedz do
 MailTo=Odbiorca(y)
+MailToUsers=To user(s)
 MailCC=Kopiuj do
+MailToCCUsers=Copy to users(s)
 MailCCC=Kopi w pamięci do
 MailTopic=Temat maila
 MailText=Wiadomość
@@ -164,4 +166,4 @@ InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Informacja
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang
index afe179b35d4..50ebf01edc6 100644
--- a/htdocs/langs/pl_PL/main.lang
+++ b/htdocs/langs/pl_PL/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=Parametr %s nie został zdefiniowany
 ErrorUnknown=Nieznany błąd
 ErrorSQL=Błąd SQL
 ErrorLogoFileNotFound=Logo pliku ' %s' nie zostało odnalezione
-ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
+ErrorGoToGlobalSetup=Idź do ustawień Firmy/Organizacji aby to naprawić
 ErrorGoToModuleSetup=Przejdź do modułu konfiguracji aby naprawić
 ErrorFailedToSendMail=Próba wysłania maila nie udana (nadawca=%s, odbiorca=%s)
 ErrorFileNotUploaded=Plik nie został załadowany. Sprawdź, czy rozmiar nie przekracza maksymalnej dopuszczalnej wagi, lub czy wolne miejsce jest dostępne na dysku. Sprawdz czy nie ma już pliku o takiej samej nazwie w tym katalogu.
@@ -64,14 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=Błąd, nie określono stawki VAT dla kraj
 ErrorNoSocialContributionForSellerCountry=Błąd, brak określonej stopy podatkowej dla kraju '%s'.
 ErrorFailedToSaveFile=Błąd, nie udało się zapisać pliku.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max number of record per page
+MaxNbOfRecordPerPage=Maksymalna ilość wpisów na stronę
 NotAuthorized=Nie masz autoryzacji aby to zrobić
 SetDate=Ustaw datę
 SelectDate=Wybierz datę
 SeeAlso=Zobacz także %s
 SeeHere=Zobacz tutaj
 ClickHere=Kliknij tutaj
-Here=Here
+Here=Tutaj
 Apply=Zastosuj
 BackgroundColorByDefault=domyślny kolor tła
 FileRenamed=Nazwa pliku została pomyślnie zmieniona
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Tryb uwierzytelniania Dolibarr jes
 Administrator=Administrator
 Undefined=Niezdefiniowano
 PasswordForgotten=Zapomniałeś hasła?
+NoAccount=No account?
 SeeAbove=Patrz wyżej
 HomeArea=Strona Startowa
 LastConnexion=Ostatnie logowanie
@@ -133,8 +134,8 @@ Never=Nigdy
 Under=pod
 Period=Okres
 PeriodEndDate=Data zakończenia okresu
-SelectedPeriod=Selected period
-PreviousPeriod=Previous period
+SelectedPeriod=Wybrany okres
+PreviousPeriod=Poprzedni okres
 Activate=Uaktywnij
 Activated=Aktywowany
 Closed=Zamknięte
@@ -187,7 +188,7 @@ ToLink=Łącze
 Select=Wybierz
 Choose=Wybrać
 Resize=Zmiana rozmiaru
-ResizeOrCrop=Resize or Crop
+ResizeOrCrop=Zmień rozmiar lub przytnij
 Recenter=Wyśrodkuj
 Author=Autor
 User=Użytkownik
@@ -231,7 +232,7 @@ Limit=Limit
 Limits=Limity
 Logout=Wyloguj
 NoLogoutProcessWithAuthMode=żadna aplikacja nierozłączona w skutek uwierzytelniania trybu <b>%s</b>
-Connection=Połączenie
+Connection=Login
 Setup=Konfiguracja
 Alert=Sygnał
 MenuWarnings=Alarmy
@@ -328,7 +329,7 @@ Default=Domyślny
 DefaultValue=Wartość domyślna
 DefaultValues=Domyślne wartości
 Price=Cena
-PriceCurrency=Price (currency)
+PriceCurrency=Cena (waluta)
 UnitPrice=Cena jednostkowa
 UnitPriceHT=Cena jednostkowa (netto)
 UnitPriceHTCurrency=Unit price (net) (currency)
@@ -396,12 +397,13 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=Stawka VAT
-VATCode=Tax Rate code
+VATCode=Kod stawki podatkowej
 VATNPR=Tax Rate NPR
 DefaultTaxRate=Domyślna stawka podatku
 Average=Średni
 Sum=Suma
 Delta=Delta
+RemainToPay=Pozostało do zapłaty
 Module=Moduł/Aplikacja
 Modules=Moduły/Aplikacje
 Option=Opcja
@@ -414,7 +416,7 @@ Favorite=Ulubiony
 ShortInfo=Info.
 Ref=Nr ref.
 ExternalRef=Ref. zewnętrzny
-RefSupplier=Nr ref. dostawcy
+RefSupplier=Ref. vendor
 RefPayment=Nr ref. płatności
 CommercialProposalsShort=Oferty komercyjne
 Comment=Komentarz
@@ -428,17 +430,17 @@ ActionRunningShort=W trakcie
 ActionDoneShort=Zakończone
 ActionUncomplete=Niekompletne
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Company/Organization
-Accountant=Accountant
+CompanyFoundation=Firma/Organizacja
+Accountant=Księgowa
 ContactsForCompany=Kontakty dla tego zamówienia
 ContactsAddressesForCompany=Kontakt/adres dla tej części/zamówienia/
 AddressesForCompany=Adressy dla części trzeciej
 ActionsOnCompany=Działania na temat tego zamówienia
 ActionsOnMember=Informacje o wydarzeniach dla tego uzytkownika
-ActionsOnProduct=Events about this product
+ActionsOnProduct=Wydarzenia dotyczące tego produktu
 NActionsLate=%s późno
 ToDo=Do zrobienia
-Completed=Completed
+Completed=Zakończony
 Running=W trakcie
 RequestAlreadyDone=Żądanie już wysłane
 Filter=Filtr
@@ -493,7 +495,7 @@ Received=Przyjęto
 Paid=Zapłacone
 Topic=Temat
 ByCompanies=Według zamówień
-ByUsers=Według użytkowników
+ByUsers=Według użytkownika
 Links=Linki
 Link=Link
 Rejects=Odrzucone
@@ -502,7 +504,7 @@ NextStep=Następny krok
 Datas=Dane
 None=Żaden
 NoneF=Żaden
-NoneOrSeveral=None or several
+NoneOrSeveral=Brak lub kilka
 Late=Późno
 LateDesc=Opóźnienie w celu określenia, czy rekord jest opóźniony, czy nie zależy od konfiguracji. Poproś swojego administratora o zmianę opóźnienia z menu Strona główna - Konfiguracja - Alerty.
 Photo=Obraz
@@ -621,7 +623,7 @@ Entities=Podmioty
 CustomerPreview=Podgląd klienta
 SupplierPreview=Podgląd dostawcy
 ShowCustomerPreview=Pokaż podgląd klienta
-ShowSupplierPreview=Pokaż podląd dostawcy
+ShowSupplierPreview=Pokaż podgląd dostawcy
 RefCustomer=Nr ref. klient
 Currency=Waluta
 InfoAdmin=Informacje dla administratorów
@@ -666,7 +668,7 @@ SessionName=Nazwa sesji
 Method=Metoda
 Receive=Odbiór
 CompleteOrNoMoreReceptionExpected=Pełna lub niczego więcej nie oczekiwano
-ExpectedValue=Expected Value
+ExpectedValue=Oczekiwana wartość
 CurrentValue=Aktualna wartość
 PartialWoman=Część
 TotalWoman=Razem
@@ -690,7 +692,7 @@ CurrentUserLanguage=Język bieżący
 CurrentTheme=Aktualny temat
 CurrentMenuManager=Aktualny Menu menager
 Browser=Przeglądarka
-Layout=Skórka
+Layout=Ułożenie
 Screen=Rozdzielczość
 DisabledModules=Nieaktywnych modułów
 For=Dla
@@ -718,7 +720,7 @@ CoreErrorTitle=Błąd systemu
 CoreErrorMessage=Przepraszamy, napotkano błąd. Skontaktuj się z administratorem w celu sprawdzenia logów lub wyłącz $dolibarr_main_prod=1 aby uzyskać więcej informacji.
 CreditCard=Karta kredytowa
 ValidatePayment=Weryfikacja płatności
-CreditOrDebitCard=Credit or debit card
+CreditOrDebitCard=Karta debetowa lub kredytowa
 FieldsWithAreMandatory=Pola <b>%s</b>  są obowiązkowe
 FieldsWithIsForPublic=Pola <b>%s</b> są wyświetlane na publiczną listę członków. Jeśli nie chcesz, odznacz opcję "publiczny".
 AccordingToGeoIPDatabase=(Zgodnie z konwersji GeoIP)
@@ -810,7 +812,7 @@ Genderwoman=Kobieta
 ViewList=Widok listy
 Mandatory=Zleceniobiorca
 Hello=Witam
-GoodBye=GoodBye
+GoodBye=Do widzenia
 Sincerely=Z poważaniem
 DeleteLine=Usuń linię
 ConfirmDeleteLine=Czy jesteś pewien, że chcesz usunąć tą linię?
@@ -819,8 +821,8 @@ TooManyRecordForMassAction=Zbyt wiele rekordów wybranych do masowej akcji. Czyn
 NoRecordSelected=Nie wybrano wpisu
 MassFilesArea=Obszar plików zbudowanych masowo
 ShowTempMassFilesArea=Wyświetl obszar plików zbudowanych masowo
-ConfirmMassDeletion=Bulk delete confirmation
-ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ?
+ConfirmMassDeletion=Zbiorcze potwierdzenie usunięcia
+ConfirmMassDeletionQuestion=Jesteś pewnien, że chcesz usunąć %s zaznaczonych rekodów?
 RelatedObjects=Powiązane obiekty
 ClassifyBilled=Oznacz jako zafakturowana
 ClassifyUnbilled=Classify unbilled
@@ -836,13 +838,13 @@ ExportOptions=Opcje eksportu
 Miscellaneous=Różne
 Calendar=Kalendarz
 GroupBy=Grupuj według
-ViewFlatList=View flat list
+ViewFlatList=Zobacz płaską listę
 RemoveString=Usuń ciąg '%s'
 SomeTranslationAreUncomplete=Co poniektóre języki mogą być częściowo przetłumaczone bądź mogą zawierać błędy. Jeśli zauważysz błędy w tłumaczeniu, możesz je naprawić rejestrując się na <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
-DirectDownloadLink=Direct download link (public/external)
-DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
+DirectDownloadLink=Bezpośredni link do pobierania (publiczny / zewnętrzny)
+DirectDownloadInternalLink=Bezpośredni link do pobrania (musisz się zalogować i potrzebujesz uprawnień)
 Download=Pobierz
-DownloadDocument=Download document
+DownloadDocument=Pobierz dokument
 ActualizeCurrency=Aktualizuj kurs walut
 Fiscalyear=Rok podatkowy
 ModuleBuilder=Module Builder
@@ -850,23 +852,23 @@ SetMultiCurrencyCode=Ustaw walutę
 BulkActions=Masowe działania
 ClickToShowHelp=Kliknij, aby wyświetlić pomoc etykiety
 WebSite=Strona WWW
-WebSites=Web sites
+WebSites=Strony internetowe
 WebSiteAccounts=Web site accounts
 ExpenseReport=Raport kosztów
 ExpenseReports=Raporty kosztów
 HR=Dział personalny
-HRAndBank=HR and Bank
+HRAndBank=HR i Bank
 AutomaticallyCalculated=Automatycznie przeliczone
 TitleSetToDraft=Powróć do wersji roboczej
 ConfirmSetToDraft=Jesteś pewien, że chcesz powrócić do wersji roboczej?
-ImportId=Import id
+ImportId=ID importu
 Events=Wydarzenia
 EMailTemplates=Szablony wiadomości e-mail
-FileNotShared=File not shared to exernal public
+FileNotShared=Plik nie jest udostępniany na zewnątrz
 Project=Projekt
 Projects=Projekty
 Rights=Uprawnienia
-LineNb=Line no.
+LineNb=Linia nr
 IncotermLabel=Formuły handlowe
 # Week day
 Monday=Poniedziałek
@@ -899,7 +901,7 @@ ShortSaturday=So
 ShortSunday=Ni
 SelectMailModel=Wybierz szablon wiadomości email
 SetRef=Ustaw referencję
-Select2ResultFoundUseArrows=Some results found. Use arrows to select.
+Select2ResultFoundUseArrows=Znaleziono pewne wyniki. Użyj strzałek, aby wybrać.
 Select2NotFound=Nie znaleziono wyników
 Select2Enter=Enter
 Select2MoreCharacter=lub więcej znaków
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=Produkty lub usługi
 SearchIntoProjects=Projekty
 SearchIntoTasks=Zadania
 SearchIntoCustomerInvoices=Faktury klienta
-SearchIntoSupplierInvoices=Faktury dostawców
+SearchIntoSupplierInvoices=Faktury dostawcy
 SearchIntoCustomerOrders=Zamówienia klienta
-SearchIntoSupplierOrders=Zamówienia dostwców
+SearchIntoSupplierOrders=Zamówienia zakupowe
 SearchIntoCustomerProposals=Oferty klientów
-SearchIntoSupplierProposals=Oferty dostawcy
+SearchIntoSupplierProposals=Propozycje dostawcy
 SearchIntoInterventions=Interwencje
 SearchIntoContracts=Kontrakty
 SearchIntoCustomerShipments=Wysyłki klienta
@@ -927,17 +929,19 @@ SearchIntoExpenseReports=Zestawienia wydatków
 SearchIntoLeaves=Urlopy
 CommentLink=Komentarze
 NbComments=Ilość komentarzy
-CommentPage=Comments space
+CommentPage=Miejsce na komentarze
 CommentAdded=Komentarz dodany
 CommentDeleted=Komentarz usunięty
 Everybody=Wszyscy
-PayedBy=Payed by
-PayedTo=Payed to
-Monthly=Monthly
-Quarterly=Quarterly
-Annual=Annual
-Local=Local
-Remote=Remote
-LocalAndRemote=Local and Remote
-KeyboardShortcut=Keyboard shortcut
+PayedBy=Opłacone przez
+PayedTo=Opłacone do
+Monthly=Miesięcznie
+Quarterly=Kwartalnie
+Annual=Rocznie
+Local=Lokalnie
+Remote=Zdalnie
+LocalAndRemote=Lokalnie i zdalnie
+KeyboardShortcut=Skróty klawiaturowe
 AssignedTo=Przypisany do
+Deletedraft=Usuń szkic
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/pl_PL/margins.lang b/htdocs/langs/pl_PL/margins.lang
index f730fc714b6..3b161a492b0 100644
--- a/htdocs/langs/pl_PL/margins.lang
+++ b/htdocs/langs/pl_PL/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=Jako usługa
 UseDiscountOnTotal=Na podsumy
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Określa, czy globalne rabatu jest traktowana jako produktu, usługi lub tylko na sumy częściowej obliczania marży.
 MARGIN_TYPE=Cena zakupu/cena fabryczna jest sugerowana jako domyślna do obliczenia marży
-MargeType1=Marża na najlepszej cenie dostawcy
+MargeType1=Margin on Best vendor price
 MargeType2=Marża na średniej cenie ważonej
 MargeType3=Marża na cenie fabrycznej
-MarginTypeDesc=* Marża na najlepszej cenie zakupu = Cena sprzedaży - Najlepsza cena dostawcy zdefiniowana na karcie produktu<br>* Marża na średnio ważonej cenie (WAP) = Cena sprzedaży - Średnio ważona cena (WAP) lub najlepsza cena dostawcy jeżeli WAP nie jest zdefiniowana<br>* Marża na cenie fabrycznej = Cena sprzedaży -  Cena fabryczna zdefiniowana na karcie produktu lub WAP jeżeli cena fabryczna nie jest zdefiniowana, lub najlepsza cena dostawcy jeżeli WAP nie jest jeszcze zdefiniowana
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Cena fabryczna
 UnitCharges=Koszty jednostkowe
 Charges=Opłaty
diff --git a/htdocs/langs/pl_PL/members.lang b/htdocs/langs/pl_PL/members.lang
index 6b450d90e5a..34003027198 100644
--- a/htdocs/langs/pl_PL/members.lang
+++ b/htdocs/langs/pl_PL/members.lang
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
diff --git a/htdocs/langs/pl_PL/multicurrency.lang b/htdocs/langs/pl_PL/multicurrency.lang
index 9ac5ce25625..88ff08cd2aa 100644
--- a/htdocs/langs/pl_PL/multicurrency.lang
+++ b/htdocs/langs/pl_PL/multicurrency.lang
@@ -1,16 +1,16 @@
 # Dolibarr language file - Source file is en_US - multicurrency
-MultiCurrency=Multi currency
+MultiCurrency=Wielowalutowość
 ErrorAddRateFail=Błąd w dodanym kursie
 ErrorAddCurrencyFail=Błąd w dodanej walucie
 ErrorDeleteCurrencyFail=Error delete fail
-multicurrency_syncronize_error=Synchronisation error: %s
+multicurrency_syncronize_error=Błąd synchronizacji: %s
 MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use date of document to find currency rate, instead of using latest known rate
 multicurrency_useOriginTx=Kiedy obiekt jest tworzony z innego, zachowaj oryginalny kurs obiektu, z którego został utworzony (w przeciwnym razie użyj ostatniego znanego kursu)
 CurrencyLayerAccount=CurrencyLayer API
-CurrencyLayerAccount_help_to_synchronize=You sould create an account on their website to use this functionnality<br>Get your <b>API key</b><br />If you use a free account you can't change the <b>currency source</b> (USD by default)<br />But if your main currency isn't USD you can use the <b>alternate currency source</b> to force you main currency<br /><br />You are limited at 1000 synchronizations per month
+CurrencyLayerAccount_help_to_synchronize=You sould create an account on their website to use this functionnality<br>Get your <b>API key</b><br>If you use a free account you can't change the <b>currency source</b> (USD by default)<br>But if your main currency isn't USD you can use the <b>alternate currency source</b> to force you main currency<br><br>You are limited at 1000 synchronizations per month
 multicurrency_appId=Klucz API
 multicurrency_appCurrencySource=Źródło walut
-multicurrency_alternateCurrencySource=Alternate currency source
+multicurrency_alternateCurrencySource=Alternatywne źródło waluty
 CurrenciesUsed=Użyte waluty
 CurrenciesUsed_help_to_add=Dodaj różne waluty i kursy walut, które potrzebujesz użyć do swoich <b>ofert</b>,<b>zamówień</b>, itd.
 rate=kurs
diff --git a/htdocs/langs/pl_PL/oauth.lang b/htdocs/langs/pl_PL/oauth.lang
index d54c328e7cc..f53e2dffaf3 100644
--- a/htdocs/langs/pl_PL/oauth.lang
+++ b/htdocs/langs/pl_PL/oauth.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Konfiguracja Oauth
-OAuthServices=OAuth services
+OAuthServices=Usługi OAuth
 ManualTokenGeneration=Ręczne generowanie tokena
 TokenManager=Token manager
-IsTokenGenerated=Is token generated ?
+IsTokenGenerated=Czy wygenerowano token?
 NoAccessToken=Brak tokenu zapisanego w lokalnej bazie danych
 HasAccessToken=Token wygenerowano i zapisano w lokalnej bazie danych
 NewTokenStored=Token odebrany i zapisany
@@ -13,15 +13,15 @@ RequestAccess=Kliknij tutaj w celu wysłania zapotrzebowania/odnowienia dostępu
 DeleteAccess=Kliknuj tutaj, aby usunąć token
 UseTheFollowingUrlAsRedirectURI=Użyj następującego adresu URL jako Przekierowanie URI podczas tworzenia poświadczeń dostawcy OAuth:
 ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
-OAuthSetupForLogin=Page to generate an OAuth token
+OAuthSetupForLogin=Strona do generowania tokena OAuth
 SeePreviousTab=See previous tab
 OAuthIDSecret=OAuth ID and Secret
 TOKEN_REFRESH=Reklamowe Odśwież Present
-TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRED=Token wygasł
 TOKEN_EXPIRE_AT=Token wygaśnie za
 TOKEN_DELETE=Usuń zachowany token
-OAUTH_GOOGLE_NAME=Oauth Google service
-OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_NAME=Usługa Google OAuth
+OAUTH_GOOGLE_ID=ID OAuth Google
 OAUTH_GOOGLE_SECRET=Oauth Google Secret
 OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
 OAUTH_GITHUB_NAME=Serwis Oauth GitHub
diff --git a/htdocs/langs/pl_PL/opensurvey.lang b/htdocs/langs/pl_PL/opensurvey.lang
index ab6b46ecbc6..00de5f3650a 100644
--- a/htdocs/langs/pl_PL/opensurvey.lang
+++ b/htdocs/langs/pl_PL/opensurvey.lang
@@ -26,14 +26,14 @@ RemovePoll=Usuń ankietę
 UrlForSurvey=Adres URL do komunikowania się, aby uzyskać bezpośredni dostęp do sondowania
 PollOnChoice=Tworzysz ankietę zrobić testowych na ankiecie. Wprowadź wszystkie możliwe opcje do ankiety:
 CreateSurveyDate=Tworzenie datę ankieta
-CreateSurveyStandard=Tworzenie standardowej ankieta
+CreateSurveyStandard=Tworzenie standardowej ankiety
 CheckBox=Proste pole wyboru
 YesNoList=Lista (pusty / tak / nie)
 PourContreList=Lista (pusty / za / przeciw)
 AddNewColumn=Dodaj nową kolumnę
-TitleChoice=Etykieta wybór
-ExportSpreadsheet=Wynik Eksport arkusza kalkulacyjnego
-ExpireDate=Limit daty
+TitleChoice=Etykieta wyboru
+ExportSpreadsheet=Eksport arkusza z wynikami
+ExpireDate=Końcowa data
 NbOfSurveys=Ilość ankiet
 NbOfVoters=Ilość głosujących
 SurveyResults=Wyniki
@@ -58,3 +58,4 @@ MoreChoices=Wprowadź więcej możliwości dla głosujących
 SurveyExpiredInfo=Ankieta została zamknięta lub upłynął termin ważności oddawania głosów.
 EmailSomeoneVoted=% S napełnił linię. Możesz znaleźć ankietę na link:% s
 ShowSurvey=Pokaż ankietę
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/pl_PL/orders.lang b/htdocs/langs/pl_PL/orders.lang
index 84a22ed7218..6e62ec4aa9d 100644
--- a/htdocs/langs/pl_PL/orders.lang
+++ b/htdocs/langs/pl_PL/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Obszar zamówień klientów
-SuppliersOrdersArea=Obszar zamówień od dostawców
+SuppliersOrdersArea=Purchase orders area
 OrderCard=Karta zamówienia
 OrderId=ID zamówienia
 Order=Zamówienie
@@ -9,22 +9,22 @@ Orders=Zamówienia
 OrderLine=Pozycja w zamówieniu
 OrderDate=Data zamówienia
 OrderDateShort=Data zamówienia
-OrderToProcess=Celem przetwarzania
+OrderToProcess=Zamówienia do przetworzenia
 NewOrder=Nowe zamówienie
 ToOrder=Stwórz zamówienie
 MakeOrder=Stwórz zamówienie
-SupplierOrder=Zamówienie dostawcy
-SuppliersOrders=Zamówienia dostawców
-SuppliersOrdersRunning=Aktualne zamówienia dostawców
+SupplierOrder=Zamówienie
+SuppliersOrders=Zamówienia
+SuppliersOrdersRunning=Aktualne zamówienia
 CustomerOrder=Zamówienie klienta
 CustomersOrders=Zamówienia klienta
 CustomersOrdersRunning=Aktualne zamówienia klienta
-CustomersOrdersAndOrdersLines=Zamówienia klienta i linia zamówienia
+CustomersOrdersAndOrdersLines=Zamówienia klienta i pozycje zamówienia
 OrdersDeliveredToBill=Customer orders delivered to bill
 OrdersToBill=Dostarczone zamówienia klienta
 OrdersInProcess=Zamówienia klienta w przygotowaniu
 OrdersToProcess=Zamówienia klienta do przygotowania
-SuppliersOrdersToProcess=Zamówienia dostawcy do przygotowania
+SuppliersOrdersToProcess=Zamówienia do przetworzenia
 StatusOrderCanceledShort=Anulowano
 StatusOrderDraftShort=Szkic
 StatusOrderValidatedShort=Zatwierdzone
@@ -38,7 +38,7 @@ StatusOrderToBillShort=Dostarczone
 StatusOrderApprovedShort=Zatwierdzone
 StatusOrderRefusedShort=Odmowa
 StatusOrderBilledShort=Rozliczone
-StatusOrderToProcessShort=Aby proces
+StatusOrderToProcessShort=Do przetworzenia
 StatusOrderReceivedPartiallyShort=Częściowo otrzymano
 StatusOrderReceivedAllShort=Produkty otrzymane
 StatusOrderCanceled=Odwołane
@@ -55,13 +55,13 @@ StatusOrderReceivedPartially=Częściowo otrzymano
 StatusOrderReceivedAll=Wszystkie produkty otrzymane
 ShippingExist=Przesyłka istnieje
 QtyOrdered=Zamówiona ilość
-ProductQtyInDraft=Ilość produktów w projektach zamówień
-ProductQtyInDraftOrWaitingApproved=Ilość produktów w projekcie lub zatwierdzonych zamówień, jeszcze nie zamówione
+ProductQtyInDraft=Ilość produktów w szkicach zamówień
+ProductQtyInDraftOrWaitingApproved=Ilość produktów w szkicach lub zatwierdzonych zamówieniach, jeszcze nie zamówione
 MenuOrdersToBill=Zamówienia dostarczono
-MenuOrdersToBill2=Rozliczanych zamówienia
+MenuOrdersToBill2=Rozliczone zamówienia
 ShipProduct=Statek produktu
 CreateOrder=Utwórz zamówienie
-RefuseOrder=Odmówić celu
+RefuseOrder=Odrzucone zamówienia
 ApproveOrder=Zatwierdź zamówienie
 Approve2Order=Zatwierdza porządek (drugi poziom)
 ValidateOrder=Zatwierdź zamówienie
@@ -75,20 +75,20 @@ ShowOrder=Pokaż zamówienie
 OrdersOpened=Zamówienia do przygotowania
 NoDraftOrders=Brak projektów zamówień
 NoOrder=Brak zamówienia
-NoSupplierOrder=Brak zamówień od dostawców
-LastOrders=Ostatnich %s zamówień klienta
-LastCustomerOrders=Ostatnich %s zamówień klienta
-LastSupplierOrders=Latest %s supplier orders
+NoSupplierOrder=Brak zamówień
+LastOrders=Ostatnie %s zamówień klienta
+LastCustomerOrders=Ostatnie %s zamówienia klienta
+LastSupplierOrders=Ostatnie %s zamówienia
 LastModifiedOrders=Ostatnie %s zmodyfikowane zamówienia
 AllOrders=Wszystkie zamówienia
 NbOfOrders=Liczba zleceń
 OrdersStatistics=Statystyki zamówień
-OrdersStatisticsSuppliers=Statystyki zamówień dostawców
+OrdersStatisticsSuppliers=Statystyki zamówień
 NumberOfOrdersByMonth=Liczba zamówień na miesiąc
 AmountOfOrdersByMonthHT=Kwota zamówień na miesiąc (netto)
 ListOfOrders=Lista zamówień
 CloseOrder=Zamknij zamówienie
-ConfirmCloseOrder=Czy jesteś pewien, że chcesz ustawić to zamówienie jako dostarczone? Po dostarczeniu zamówienia można je wystawić na fakturę.
+ConfirmCloseOrder=Czy jesteś pewien, że chcesz ustawić to zamówienie jako dostarczone? Po dostarczeniu zamówienia można je ustawić na rozliczone.
 ConfirmDeleteOrder=Czy jesteś pewien, że chcesz usunąć to zamówienie?
 ConfirmValidateOrder=Czy jesteś pewien, że chcesz potwierdzić to zamówienie pod nazwą <b>%s</b>?
 ConfirmUnvalidateOrder=Jesteś pewien, że chcesz przywrócić to zamówienie <b>%s</b> do statusu wersji roboczej?
@@ -97,39 +97,39 @@ ConfirmMakeOrder=Jesteś pewien, że chcesz potwierdzić to zamówienie z datą
 GenerateBill=Generuj fakturę
 ClassifyShipped=Oznacz jako dostarczone
 DraftOrders=Szkic zamówień
-DraftSuppliersOrders=Szkic zamówień do dostawców
+DraftSuppliersOrders=Szkice zamówień
 OnProcessOrders=Zamówienia w przygotowaniu
 RefOrder=Nr referencyjny zamówienia
-RefCustomerOrder=Numer referencyjny zamówienia dla klienta
-RefOrderSupplier=Ref. order for supplier
-RefOrderSupplierShort=Ref. order supplier
+RefCustomerOrder=Powiązane zamówienia dla klienta
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=Wyślij zamówienie pocztą
-ActionsOnOrder=Lista działań zamówienia
+ActionsOnOrder=Zdarzenia dla zamówienia
 NoArticleOfTypeProduct=Nr artykułu typu "produktu", więc nie shippable artykule tej kolejności
 OrderMode=Sposób złożenia zamówienia
-AuthorRequest=Wniosek autora
+AuthorRequest=Autor wniosku
 UserWithApproveOrderGrant=Useres przyznane z "zatwierdza zamówienia zgody.
-PaymentOrderRef=Płatność celu %s
+PaymentOrderRef=Płatność do zamówienia %s
 CloneOrder=Powiel zamówienie
 ConfirmCloneOrder=Jesteś pewien, że chcesz zduplikować zamówienie <b>%s</b>?
 DispatchSupplierOrder=%s Odbiór aby dostawca
-FirstApprovalAlreadyDone=Pierwsze zatwierdzenie już zrobione
+FirstApprovalAlreadyDone=Wykonano pierwsze zatwierdzenie
 SecondApprovalAlreadyDone=Wykonano drugie zatwierdzenie
-SupplierOrderReceivedInDolibarr=Supplier order %s received %s
-SupplierOrderSubmitedInDolibarr=Supplier order %s submited
-SupplierOrderClassifiedBilled=Supplier order %s set billed
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Inne zamówienia
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Przedstawiciela w ślad za zamówienie klienta
 TypeContact_commande_internal_SHIPPING=Przedstawiciela w ślad za koszty
-TypeContact_commande_external_BILLING=kontakt faktury klienta
-TypeContact_commande_external_SHIPPING=kontakt koszty klientów
+TypeContact_commande_external_BILLING=Kontakt dla faktury klienta
+TypeContact_commande_external_SHIPPING=Kontakt klienta dla wysyłki 
 TypeContact_commande_external_CUSTOMER=kontakt klienta w ślad za zamówienie
-TypeContact_order_supplier_internal_SALESREPFOLL=Przedstawiciela w ślad za zamówienie dostawca
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Przedstawiciela w ślad za koszty
-TypeContact_order_supplier_external_BILLING=Kontakt z dostawcą faktury
-TypeContact_order_supplier_external_SHIPPING=kontakt koszty dostawcy
-TypeContact_order_supplier_external_CUSTOMER=Kontakt z dostawcą w sprawie faktury
+TypeContact_order_supplier_external_BILLING=Kontakt do faktury sprzedawcy
+TypeContact_order_supplier_external_SHIPPING=Kontakt z dostawcą
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Stała COMMANDE_SUPPLIER_ADDON nie zdefiniowane
 Error_COMMANDE_ADDON_NotDefined=Stała COMMANDE_ADDON nie zdefiniowane
 Error_OrderNotChecked=Nie wybrano zamówienia do faktury
@@ -146,13 +146,13 @@ PDFProformaDescription=Pełna faktura proforma (logo ...)
 CreateInvoiceForThisCustomer=Zamówienia na banknoty
 NoOrdersToInvoice=Brak zleceń rozliczanych
 CloseProcessedOrdersAutomatically=Sklasyfikować "przetwarzane" wszystkie wybrane zamówienia.
-OrderCreation=Stworzenie Zamówienie
+OrderCreation=Tworzenie zamówienia
 Ordered=Zamówione
 OrderCreated=Twoje zamówienia zostały utworzone
-OrderFail=Błąd podczas tworzenia się zamówień
+OrderFail=Podczas tworzenia zamówienia wystąpił błąd
 CreateOrders=Tworzenie zamówień
 ToBillSeveralOrderSelectCustomer=Aby utworzyć fakturę za kilka rzędów, kliknij pierwszy na klienta, a następnie wybrać "% s".
 OptionToSetOrderBilledNotEnabled=Option (from module Workflow) to set order to 'Billed' automatically when invoice is validated is off, so you will have to set status of order to 'Billed' manually.
 IfValidateInvoiceIsNoOrderStayUnbilled=If invoice validation is 'No', the order will remain to status 'Unbilled' until the invoice is validated.
-CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
+CloseReceivedSupplierOrdersAutomatically=Zamknij zamówienie do "%s" automatycznie jeżeli wszystkie produkty są odebrane
 SetShippingMode=Set shipping mode
diff --git a/htdocs/langs/pl_PL/other.lang b/htdocs/langs/pl_PL/other.lang
index ba496722260..1dc66a37a8a 100644
--- a/htdocs/langs/pl_PL/other.lang
+++ b/htdocs/langs/pl_PL/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=Plik jest za duży
 PleaseBePatient=Proszę o cierpliwość...
 NewPassword=New password
 ResetPassword=Resetuj hasło
-RequestToResetPasswordReceived=Wniosek o zmianę hasła Dolibarr został odebrany
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=To są twoje nowe klucze do logowania
 NewKeyWillBe=Twój nowy klucz, aby zalogować się do programu będzie
 ClickHereToGoTo=Kliknij tutaj, aby przejść do %s
@@ -233,6 +233,8 @@ PermissionsDelete=Uprawnienia usunięte
 YourPasswordMustHaveAtLeastXChars=Twoje hasło musi składać się z <strong>%s</strong> znaków
 YourPasswordHasBeenReset=Twoje hasło zostało zresetowane pomyślnie
 ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=Wywóz obszarze
 AvailableFormats=Dostępne formaty
diff --git a/htdocs/langs/pl_PL/paypal.lang b/htdocs/langs/pl_PL/paypal.lang
index 15dad691e4f..09b66e628a1 100644
--- a/htdocs/langs/pl_PL/paypal.lang
+++ b/htdocs/langs/pl_PL/paypal.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal konfiguracji modułu
 PaypalDesc=Ten moduł oferuję stronę pozwalającą na płatności w systemie <a href="http://www.paypal.com" target="_blank">PayPal</a> przez klientów. Moduł może być wykorzystany do bezpłatnych płatności lub do płatności za określone obiekty Dolibarr (faktury, zamówienie itp.)
-PaypalOrCBDoPayment=Pay with Paypal (Credit Card or Paypal)
+PaypalOrCBDoPayment=Płać z PayPal (karta kredytowa lub PayPal)
 PaypalDoPayment=Zapłać z PayPal
 PAYPAL_API_SANDBOX=Tryb testu / sandbox
 PAYPAL_API_USER=API użytkownika
@@ -11,16 +11,16 @@ PAYPAL_SSLVERSION=Wersja Curl SSL
 PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Oferta płatności "integralnej" (Karta kredytowa+Paypal) lub tylko "Paypal"
 PaypalModeIntegral=Integralny
 PaypalModeOnlyPaypal=Tylko PayPal
-ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
+ONLINE_PAYMENT_CSS_URL=Opcjonalny link do arkusza stylów CSS dla strony płatności online
 ThisIsTransactionId=Jest to id transakcji: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Dodaj link do płatności PayPal podczas wysyłania dokumentów za pośrednictwem email
-PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.<br><br>%s<br><br>
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
-NewOnlinePaymentReceived=New online payment received
+PredefinedMailContentLink=Możesz kliknąć na poniższy link, aby dokonać swojej płatności, jeżeli jeszcze tego nie zrobiłeś.<br><br>%s<br><br>
+YouAreCurrentlyInSandboxMode=Aktualnie korzystasz z trybu "sandbox" %s
+NewOnlinePaymentReceived=Otrzymano nową płatność online
 NewOnlinePaymentFailed=New online payment tried but failed
 ONLINE_PAYMENT_SENDEMAIL=Napisz e-mail, aby poinformować po płatności (sukces lub nie)
 ReturnURLAfterPayment=Zwróć adres URL po dokonaniu płatności
-ValidationOfOnlinePaymentFailed=Validation of online payment failed
+ValidationOfOnlinePaymentFailed=Niepowodzenie potwierdzenia płatności online
 PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
 SetExpressCheckoutAPICallFailed=Wywołanie API poprzez SetExpressCheckout nie powiodło się
 DoExpressCheckoutPaymentAPICallFailed=Wywołanie API poprzez DoExpressCheckoutPayment nie powiodło się.
@@ -28,8 +28,8 @@ DetailedErrorMessage=Szczegółowa informacja o błędzie
 ShortErrorMessage=Krotka informacja o błędzie
 ErrorCode=Kod błędu
 ErrorSeverityCode=Kod ważności błędu
-OnlinePaymentSystem=Online payment system
+OnlinePaymentSystem=System płatności online
 PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import Paypal payments
+PaypalImportPayment=Importuj płatności PayPal
 PostActionAfterPayment=Post actions after payments
 ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/pl_PL/productbatch.lang b/htdocs/langs/pl_PL/productbatch.lang
index 24b6a920a45..35d92225276 100644
--- a/htdocs/langs/pl_PL/productbatch.lang
+++ b/htdocs/langs/pl_PL/productbatch.lang
@@ -16,9 +16,9 @@ printEatby=Wykorzystaj po: %s
 printSellby=Sprzedaj po: %s
 printQty=Ilość: %d
 AddDispatchBatchLine=Dodaj linię dla przedłużenia wysyłki
-WhenProductBatchModuleOnOptionAreForced=Kiedy moduł Grupa produktów/Numer Seryjny jest włączony, automatyczne zwiększanie/zmniejszanie stanu magazynowego jest wymuszone do zatwierdzenia wysyłki oraz odbioru osobistego i nie może zostać zmienione. Inne opcje mogą zostać zmienione dowolnie.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=Ten produkt nie używa lotu/numeru seryjnego
 ProductLotSetup=Konfiguracja modułu lot/seria
 ShowCurrentStockOfLot=Pokaż aktualny zapas dla pasy produkt/lot
 ShowLogOfMovementIfLot=Pokaż historię przesunięć dla pary produkt/lot
-StockDetailPerBatch=Stock detail per lot
+StockDetailPerBatch=Szczegóły zapasu po locie
diff --git a/htdocs/langs/pl_PL/products.lang b/htdocs/langs/pl_PL/products.lang
index d3a4b1e36d9..43413f87445 100644
--- a/htdocs/langs/pl_PL/products.lang
+++ b/htdocs/langs/pl_PL/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=Nowa cena
 MinPrice=Minimalna cena sprzedaży
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=Cena sprzedaży nie może być niższa niż minimalna dopuszczalna dla tego produktu (%s bez podatku). Ten komunikat może się również pojawić po wpisaniu zbyt wysokiego rabatu.
 ContractStatusClosed=Zamknięte
 ErrorProductAlreadyExists=Produkt o numerze referencyjnym %s już istnieje.
@@ -155,7 +156,7 @@ BuyingPrices=Cena zakupu
 CustomerPrices=Ceny klienta
 SuppliersPrices=Ceny dostawcy
 SuppliersPricesOfProductsOrServices=Ceny dostawcy (produktów lub usług)
-CustomCode=Customs/Commodity/HS code
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=Kraj pochodzenia
 Nature=Natura
 ShortLabel=Krótka etykieta
diff --git a/htdocs/langs/pl_PL/projects.lang b/htdocs/langs/pl_PL/projects.lang
index 813eeb8415e..2d656d757e8 100644
--- a/htdocs/langs/pl_PL/projects.lang
+++ b/htdocs/langs/pl_PL/projects.lang
@@ -77,6 +77,7 @@ Time=Czas
 ListOfTasks=Lista zadań
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Idź do listy zadań
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=Lista ofert handlowcych związanych z projektem
 ListOrdersAssociatedProject=Lista zamówień klientów powiązanych z projektem
@@ -226,4 +227,4 @@ AllowCommentOnProject=Allow user comments on projects
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/pl_PL/stocks.lang b/htdocs/langs/pl_PL/stocks.lang
index 32d2364844e..1d731afe30d 100644
--- a/htdocs/langs/pl_PL/stocks.lang
+++ b/htdocs/langs/pl_PL/stocks.lang
@@ -203,3 +203,4 @@ RegulateStock=Regulate Stock
 ListInventory=Lista
 StockSupportServices=Stock management support services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/pl_PL/stripe.lang b/htdocs/langs/pl_PL/stripe.lang
index 571aae3f971..006e378f965 100644
--- a/htdocs/langs/pl_PL/stripe.lang
+++ b/htdocs/langs/pl_PL/stripe.lang
@@ -58,8 +58,8 @@ NameOnCard=Name on card
 CardNumber=Card Number
 ExpiryDate=Expiry Date
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/pl_PL/supplier_proposal.lang b/htdocs/langs/pl_PL/supplier_proposal.lang
index e63f6f97914..aa3c3e60638 100644
--- a/htdocs/langs/pl_PL/supplier_proposal.lang
+++ b/htdocs/langs/pl_PL/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Oferty handlowe dostawcy
-supplier_proposalDESC=Zarządzaj zapytaniami o cenę do dostawców
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
 SupplierProposalNew=Nowe zapytanie o cenę
 CommRequest=Zapytanie o cenę
 CommRequests=Zapytania o cenę
 SearchRequest=Znajdź zapytanie
 DraftRequests=Projekt zapytania
-SupplierProposalsDraft=Szkic oferty do dostawcy
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=Ostatnie %s zapytań o cenę
 RequestsOpened=Otwórz zapytanie o cenę
-SupplierProposalArea=Obszar ofert dostawcy
-SupplierProposalShort=Oferta dostawcy
-SupplierProposals=Oferty dostawcy
-SupplierProposalsShort=Oferty dostawcy
+SupplierProposalArea=Vendor proposals area
+SupplierProposalShort=Vendor proposal
+SupplierProposals=Propozycje dostawcy
+SupplierProposalsShort=Propozycje dostawcy
 NewAskPrice=Nowe zapytanie o cenę
 ShowSupplierProposal=Pokaż zapytanie o cenę
 AddSupplierProposal=Stwórz zapytanie o cenę
-SupplierProposalRefFourn=Referencja dostawcy
+SupplierProposalRefFourn=Vendor ref
 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>?
@@ -47,9 +47,9 @@ 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=Lista wniosków wniosku dostawca
-ListSupplierProposalsAssociatedProject=Lista propozycji dostawców związanych z projektem
-SupplierProposalsToClose=Oferty dostawcy do zamknięcia
-SupplierProposalsToProcess=Zamówienia dostawcy do przetworzenia
+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=Ostatnie %s zapytań o cenę
 AllPriceRequests=Wszystkie zapytania
diff --git a/htdocs/langs/pl_PL/suppliers.lang b/htdocs/langs/pl_PL/suppliers.lang
index 4a5228c95a7..e6b7942c0fb 100644
--- a/htdocs/langs/pl_PL/suppliers.lang
+++ b/htdocs/langs/pl_PL/suppliers.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - suppliers
 Suppliers=Dostawcy
-SuppliersInvoice=Faktury dostawców
-ShowSupplierInvoice=Pokaż faktury od dostawcy
+SuppliersInvoice=Faktura dostawcy
+ShowSupplierInvoice=Pokaż fakturę dostawcy
 NewSupplier=Nowy dostawca
 History=Historia
 ListOfSuppliers=Lista dostawców
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Niektóre podprodukty nie mają zdefiniowanych cen
 AddSupplierPrice=Dodaj cenę zakupu
 ChangeSupplierPrice=Zmień cenę zakupu
-SupplierPrices=Ceny dostawcy
+SupplierPrices=Ceny dostawców
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Ten dostawca jest już powiązany z referencją: %s
-NoRecordedSuppliers=Nie zarejestrowano żadnych dostawców
+NoRecordedSuppliers=No vendor recorded
 SupplierPayment=Płatność dostawcy
-SuppliersArea=Strefa dostawców
-RefSupplierShort=Nr ref. dostawcy
+SuppliersArea=Obszar dostawcy
+RefSupplierShort=Ref. vendor
 Availability=Dostępność
-ExportDataset_fournisseur_1=Faktury dostawcy i pozycje na fakturach
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
 ExportDataset_fournisseur_2=Faktury i płatności dostawcy
-ExportDataset_fournisseur_3=Zamówienia dostawcy i pozycje na zamówieniu
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=Zatwierdź to zamówienie
 ConfirmApproveThisOrder=Czy zaakceptować zamówienie <b>%s</b>?
 DenyingThisOrder=Odrzuć to zamówienie
 ConfirmDenyingThisOrder=Czy odrzucić zamówienie <b>%s</b>?
 ConfirmCancelThisOrder=Czy anulować zamówienie <b>%s</b>?
-AddSupplierOrder=Stwórz zamówienie dla dostawcy
-AddSupplierInvoice=Stwórz fakturę dostawcy
-ListOfSupplierProductForSupplier=Wykaz produktów i cen dostawcy <b>%s</b>
-SentToSuppliers=Wysyłane do dostawców
-ListOfSupplierOrders=Lista zamówień dostawców
-MenuOrdersSupplierToBill=Zamówienia dostawca do faktury
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Opóźnienie dostawy w dniach
 DescNbDaysToDelivery=Największe opóźnienie dostawy wśród produktów z tego zamówienia
-SupplierReputation=Reputacja dostawcy
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Nie zamawiaj
 NotTheGoodQualitySupplier=Zła jakość
 ReputationForThisProduct=Reputation
 BuyerName=Nazwa kupującego
 AllProductServicePrices=All product / service prices
 AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=Ceny dostawcy
+BuyingPriceNumShort=Ceny dostawców
diff --git a/htdocs/langs/pl_PL/website.lang b/htdocs/langs/pl_PL/website.lang
index b0f6347c139..a5d18f9bc77 100644
--- a/htdocs/langs/pl_PL/website.lang
+++ b/htdocs/langs/pl_PL/website.lang
@@ -73,7 +73,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
diff --git a/htdocs/langs/pl_PL/workflow.lang b/htdocs/langs/pl_PL/workflow.lang
index 084dbf53e7f..f33d455c02a 100644
--- a/htdocs/langs/pl_PL/workflow.lang
+++ b/htdocs/langs/pl_PL/workflow.lang
@@ -3,18 +3,18 @@ WorkflowSetup=Konfiguracja modułu przepływu pracy
 WorkflowDesc=Moduł ten jest przeznaczony do zmiany zachowania automatycznych działań na język aplikacji. Domyślnie pracy jest otwarty (można robić rzeczy w określonej kolejności). Możesz włączyć automatyczne czynności, które są zainteresowane.
 ThereIsNoWorkflowToModify=Nie ma zmiany workflow dostępne z aktywnych modułów.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed (new order will have same amount than proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatycznie stwórz zamówienie klienta po podpisaniu propozycji handlowej (nowe zamówienie będzie miało taką samą kwotę jak oferta)
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (new invoice will have same amount than proposal)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatycznie stwórz fakturę dla klienta po zatwierdzeniu kontraktu
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed (new invoice will have same amount than order)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer order is set to billed (and if amount of the order is same than total amount of signed linked proposals)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Sklasyfikuj powiązaną(e) propozycje handlowe jako zafakturowane, gdy zamówienie klienta jest ustawione jako zafakturowane (i jeśli kwota zamówienia jest taka sama, jak całkowita kwota podpisanych powiązanych propozycji)
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of signed linked proposals)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
-AutomaticCreation=Automatic creation
-AutomaticClassification=Automatic classification
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+AutomaticCreation=Automatyczne utworzenie
+AutomaticClassification=Automatyczne zaklasyfikowanie
diff --git a/htdocs/langs/pt_BR/accountancy.lang b/htdocs/langs/pt_BR/accountancy.lang
index c2ccee48ee2..0a627492c4e 100644
--- a/htdocs/langs/pt_BR/accountancy.lang
+++ b/htdocs/langs/pt_BR/accountancy.lang
@@ -29,10 +29,8 @@ DetailByAccount=Mostrar detalhes por conta
 AccountWithNonZeroValues=Contas com valores não zerados
 ListOfAccounts=Lista de contas
 MainAccountForCustomersNotDefined=Conta contábil principal para clientes não definidos na configuração
-MainAccountForSuppliersNotDefined=Conta contábil principal para fornecedores 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
-AccountancyArea=Área da Contabilidade
 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...
 AccountancyAreaDescActionOnceBis=Os próximos passos devem ser feitos para economizar tempo no futuro, sugerindo-lhe a conta de contabilidade padrão correta ao fazer a reviravolta (gravação de registros em Livros de Registros e contabilidade geral)
@@ -69,7 +67,6 @@ MenuProductsAccounts=Contas de produto
 ProductsBinding=Contas dos produtos
 Ventilation=Vinculando para as contas
 CustomersVentilation=Vinculando as faturas do cliente
-SuppliersVentilation=Vinculando as faturas do fornecedor
 ExpenseReportsVentilation=Relatório de despesas obrigatórias
 WriteBookKeeping=Transações no Livro Razão
 Bookkeeping=Razão
@@ -132,7 +129,6 @@ BankAccountNotDefined=Conta para o banco não definida
 ListeMvts=Lista de movimentações
 ErrorDebitCredit=Débito e Crédito não pode ter valor preenchido ao mesmo tempo
 AddCompteFromBK=Adicionar contas contábeis ao grupo
-DescThirdPartyReport=Consulte aqui a lista dos terceiros, clientes e fornecedores, e as suas contas contábeis
 ListAccounts=Lista das contas contábeis
 UnknownAccountForThirdparty=Conta de terceiros desconhecida. Usaremos %s
 UnknownAccountForThirdpartyBlocking=Conta de terceiros desconhecida. Erro de bloqueio
@@ -147,8 +143,6 @@ DescVentilMore=Na maioria dos casos, se você usa produtos ou serviços pré-def
 DescVentilDoneCustomer=Consulte aqui a lista com as linhas das faturas dos clientes e a conta da Contabilidade dos seus produtos
 DescVentilTodoCustomer=Linhas da fatura ainda não vinculadas à conta da Contabilidade do produto
 ChangeAccount=Mudar a conta da Contabilidade do produto/serviço para as linhas selecionadas com a seguinte conta da Contabilidade
-DescVentilSupplier=Consulte aqui a lista das linhas da fatura do fornecedor vinculadas ou ainda não vinculadas a uma conta da Contabilidade de um produto
-DescVentilDoneSupplier=Consulte aqui a lista das linhas de faturas de fornecedores e sua conta de contabilidade
 DescVentilTodoExpenseReport=Relatórios de linhas de despesas de ligação já não estão vinculadas com uma conta contábil com taxa
 DescVentilExpenseReport=Consulte aqui a lista de relatório de linhas de despesas vinculadas (ou não) a uma conta contábil com taxa
 DescVentilExpenseReportMore=Se você configurar a conta contábil no tipo de relatórios de linha de despesas, o aplicativo poderá fazer toda a vinculação entre seus relatórios de linhas de despesas e a conta contábil do seu plano de contas, com apenas um clique com o botão <strong> "%s" </strong>. Se a conta não foi definida no dicionário de tarifas ou se você ainda possui algumas linhas não vinculadas a nenhuma conta, você terá que fazer uma ligação manual no menu "<strong> %s </strong>".
@@ -156,7 +150,6 @@ DescVentilDoneExpenseReport=Consulte aqui a lista dos relatórios de linha de de
 ValidateHistory=Vincular Automaticamente
 AutomaticBindingDone=Vinculação automática realizada
 ErrorAccountancyCodeIsAlreadyUse=Erro, você não pode excluir esta conta contábil, pois ela esta em uso
-MvtNotCorrectlyBalanced=Existem diferenças nos movimentos . Crédito = %s. Débito = %s
 GeneralLedgerIsWritten=As transações estão escritas no Razão
 NoNewRecordSaved=Não há mais registro para lançar
 ListOfProductsWithoutAccountingAccount=Lista de produtos não vinculados a qualquer conta da Contabilidade
diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang
index e4533bbbd8d..73902b33581 100644
--- a/htdocs/langs/pt_BR/admin.lang
+++ b/htdocs/langs/pt_BR/admin.lang
@@ -46,7 +46,6 @@ InternalUser=Usuário Interno
 ExternalUser=Usuário Externo
 InternalUsers=Usuários Internos
 ExternalUsers=Usuários Externos
-GUISetup=Aparência
 SetupArea=Configurações da Área
 UploadNewTemplate=Carregar novo(s) tema(s)
 FormToTestFileUploadForm=Formulário para teste de upload de arquivo
@@ -225,7 +224,6 @@ MAIN_MAIL_SMTP_SERVER=Servidor SMTP/SMTPS (Como padrão em php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Porta SMTP/SMTPS (Não definido no PHP nos sistemas tipo Unix)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Servidor SMTP/SMTPS (Não definido no PHP nos sistemas tipo Unix)
 MAIN_MAIL_EMAIL_FROM=E-mail de envio para os e-mails automáticos (Como padrão no php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email usado como 'Erros-Para' campo em e-mails enviados
 MAIN_MAIL_AUTOCOPY_TO=Enviar sistematicamente uma cópia carbono oculta de todos os e-mails enviados para
 MAIN_DISABLE_ALL_MAILS=Desabilitar todos os envios de e-mail (com o objetivo de teste ou demonstração)
 MAIN_MAIL_FORCE_SENDTO=Envie todos os e-mails para (em vez de destinatários reais, para fins de teste)
@@ -245,7 +243,6 @@ SubmitTranslationENUS=Se a tradução para este idioma não está completa ou vo
 ModuleSetup=Conf. do módulo
 ModulesSetup=Configuração de Módulos/Aplicativos
 ModuleFamilyCrm=Gestão de Relacionamento com o Cliente (CRM)
-ModuleFamilySrm=Gestor da Relação com o Fornecedor (SRM)
 ModuleFamilyProducts=Gestão de Produtos (GP)
 ModuleFamilyHr=Gestão de Recursos Humanos (RH)
 ModuleFamilyProjects=Projetos
@@ -316,7 +313,6 @@ SecurityToken=Chave para proteção das URLs
 NoSmsEngine=Sem gestor de envido de SMS disponível. Por default o gestor de envio de SMS não vêm instalado (porque depende de um fornecedor externo) mas você pode achar um em %s
 PDFDesc=Você pode configurar cada opção global relacionada com geração de PDF
 PDFAddressForging=Regras para forjar caixas de endereços
-HideAnyVATInformationOnPDF=Esconder todas as informações relacionadas com ICMS na geração de PDF
 HideLocalTaxOnPDF=Ocultar %s taxa na coluna de taxa de venda no PDF
 HideDescOnPDF=Esconder todas as descrições de produto na geração de PDF
 HideRefOnPDF=Esconder ref. dos produtos na geração de PDF
@@ -376,7 +372,6 @@ DisplayCompanyInfo=Exibir endereço da empresa
 DisplayCompanyManagers=Exibir nomes dos gerentes
 DisplayCompanyInfoAndManagers=Exibir o endereço da empresa e os nomes dos gerentes
 EnableAndSetupModuleCron=Se você deseja ter esta fatura recorrente sendo gerada automaticamente, o módulo *%s* deve estar habilitado e corretamente configurado. Do contrário, a geração de faturas deve ser feita manualmente a partir deste tema com o botão "Criar". Note que mesmo se você habilitar a geração automática, poderás ainda realizar a geração manual com segurança. A geração duplicada para um mesmo período não é possível.
-ModuleCompanyCodeAquarium=Retorna um código contábil composto por :<br>%s seguido por um código de um terceiro fornecedor para um código contábil para o fornecedor,<br>%s seguido de um código de cliente de terceiros para um código contábil de cliente.
 ModuleCompanyCodePanicum=Retornar um código contábil vazio
 ModuleCompanyCodeDigitaria=O código contábil depende de um código de terceiros. O código é composto pelo caractere "C" na primeira posição seguido pelos primeiros 5 caracteres do código de terceiros.
 Use3StepsApproval=Por padrão, os Pedidos de Compra necessitam ser criados e aprovados por 2 usuários diferentes (uma etapa para a criação e a outra etapa para a aprovação. Note que se o usuário possui ambas permissões para criar e aprovar, uma única etapa por usuário será suficiente). Você pode pedir, com esta opção, para introduzir uma terceira etapa para aprovação por outro usuário, se o montante for superior a um determinado valor (assim 3 etapas serão necessárias : 1=validação, 2=primeira aprovação e 3=segunda aprovação se o montante for suficiente). <br>Defina como vazio se uma aprovação (2 etapas) é suficiente, defina com um valor muito baixo (0.1) se uma segunda aprovação (3 etapas) é sempre exigida.
@@ -400,7 +395,6 @@ Module0Name=Usuários e grupos
 Module0Desc=Gerenciamento de Usuários / Funcionários e Grupos
 Module1Desc=Gerenciamento de empresas e contatos (clientes, prospecção, etc.)
 Module2Desc=Gestor Comercial
-Module10Desc=Relatório de Contabilidade Simples (jornais, rotação de estoque) baseado no conteúdo do banco de dados.
 Module20Desc=Gestor de Orçamentos
 Module22Name=E-Mails Massivos
 Module22Desc=Envio de E-Mails Massivos (spam)
@@ -452,8 +446,6 @@ Module330Desc=Gerenciamento de agendamentos
 Module400Name=Projetos
 Module400Desc=Gestão de projetos, oportunidades / espera e / ou tarefas. Você também pode atribuir qualquer elemento (fatura, ordem, proposta, intermediação, ...) a um projeto e obter uma visão panorâmica do projeto.
 Module410Desc=Integração do Webcalendar
-Module500Name=Taxas, Contribuições Sociais e Dividendos
-Module500Desc=Gestor Taxas, Contribuições Sociais e Dividentos
 Module510Name=Pagamento dos salários dos funcionários
 Module510Desc=Registrar e acompanhar o pagamento dos salários do seu empregado
 Module520Desc=Gestão dos empréstimos
@@ -465,18 +457,14 @@ Module610Desc=Permite a criação de variável de produtos com base em atributos
 Module700Name=Doações
 Module700Desc=Gestor de Doações
 Module770Desc=Gestão e reivindicação de relatórios de despesas (transporte, refeição, ...)
-Module1120Name=Fornecedor - proposta comercial
-Module1120Desc=Pedido fornecedor - proposta comercial e preços
 Module1200Desc=Integração Mantis
 Module1520Name=Geração de Documentos
 Module1520Desc=Geração de documentos via e-mail em massa
 Module1780Name=Categorias
-Module1780Desc=Gestor de Categorias (produtos, fornecedores e clientes)
 Module2000Desc=Permitir editar alguma área do texto usando um editor avançado (Baseado no CKEditor)
 Module2200Desc=Habilitar o uso de expressões matemáticas para os preços
 Module2300Desc=Gerenciamento dos trabalhos agendados (alias cron ou tabela chrono)
 Module2400Name=Eventos / Agenda
-Module2400Desc=Acompanhe os eventos realizados e futuros. Deixe o aplicativo registrar eventos automáticos para fins de rastreamento ou gravar eventos manuais ou reuniões.
 Module2500Name=SGBD / GCE
 Module2500Desc=Sistema de Gerenciamento de Documentos / Gerenciamento de Conteúdo Eletrônico. Organização automática de seus documentos gerados ou armazenados. Compartilhe-os quando precisar.
 Module2600Name=Serviços API/Web (Servidor SOAP)
@@ -502,7 +490,6 @@ Module50000Desc=Módulo para oferecer uma página de pagamento on-line aceitando
 Module50100Name=Ponto de Vendas
 Module50100Desc=Módulo ponto de vendas (PDV)
 Module50200Desc=Módulo para oferecer uma página de pagamento on-line aceitando pagamentos usando o PayPal (cartão de crédito ou crédito PayPal). Isso pode ser usado para permitir que seus clientes façam pagamentos gratuitos ou para um pagamento em um determinado objeto Dolibarr (fatura, pedido, ...)
-Module50400Desc=Gerenciamento da contabilidade (entradas duplicadas, suporta livros contábeis gerais e auxiliares)
 Module54000Name=ImprimirIPP
 Module54000Desc=Imprima via Cups IPP
 Module55000Name=Pesquisa Aberta
@@ -866,9 +853,6 @@ Delays_MAIN_DELAY_MEMBERS=Prazo de tolerância (em dias) antes do aviso do atras
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Prazo de tolerância (em dias) antes do aviso de fazer depósitos de cheques
 Delays_MAIN_DELAY_EXPENSEREPORTS=Prazo de tolerância (em dias) antes do alerta para aprovação do relatório de despesas
 SetupDescription1=A área de configuração é para a definição dos parâmetros iniciais antes de se usar o Dolibarr.
-SetupDescription2=As duas etapas de configuração obrigatórias são as duas primeiras no menu de configuração à esquerda : %s página de configuração e %s página de configuração :
-SetupDescription3=Os parâmetros no menu <a href="%s">%s -> %s</a> são exigidos, pois os dados definidos são usados nas telas do Dolibarr e para personalizar o comportamento padrão do programa (para funções relacionadas ao país, por exemplo).
-SetupDescription4=Os parâmetros no menu <a href="%s">%s -> %s</a> são exigidos, pois o ERP/CRM Dolibarr é uma coleção de diversos módulos/aplicativos, todos mais ou menos independentes. Novas funções serão adicionadas aos menus para cada módulo que você ativar.
 SetupDescription5=Outros menu precisa entrar com parâmetros opcionais do gestor.
 LogEvents=Auditoría de segurança dos eventos
 Audit=Auditoría
@@ -882,7 +866,6 @@ LogEventDesc=Você pode habilitar aqui os logging para os eventos de segurança
 AreaForAdminOnly=Os parâmetros de configuração só podem ser definidos pelos <b>usuários administradores</b>.
 SystemInfoDesc=Informações do sistema está faltando informações, técnicas você consegue em modo de leitura e é visivel somente para administradores.
 SystemAreaForAdminOnly=Essa área é dísponivel apenas para administradores. Ninguém do Dolibarr pode diminuir essas permissões.
-CompanyFundationDesc=Editar nesta página toda a informação conhecida da companhia ou fundação que você precisa gerenciar (Para isto, clique no botão "Modificar" ou "Salvar" no rodapé da página).
 DisplayDesc=Você pode escolher cada parâmetro relacionado com a aparência do Dolibarr e testar aqui
 AvailableModules=App/Módulos disponíveis
 ToActivateModule=Para ativar os módulos, vá à área de configuração (Home->Configuração->Módulo).
@@ -992,11 +975,8 @@ UsersSetup=Configurações de módulo de usuários
 UserMailRequired=EMail é necessário para criação de um novo usuário
 HRMSetup=Configuração do módulo RH
 CompanySetup=Configurações de módulo das empresas
-CompanyCodeChecker=Módulo de geração e verificação de códigos de terceiros (cliente ou fornecedor)
-AccountCodeManager=Módulo para a geração do código contábil (cliente ou fornecedor)
 NotificationsDesc=A funcionalidade de notificações por e-mail lhe permite enviar silenciosamente e-mail automático para alguns eventos do Dolibarr. Os destinatários das notificações podem ser definidos:
 NotificationsDescUser=* por usuários, um usuário de cada vez.
-NotificationsDescContact=* por contatos de terceiros (clientes ou fornecedores), um contato de cada vez.
 NotificationsDescGlobal=* ou pela definição de um destinatário global para os e-mails na página de configuração do módulo.
 ModelModules=Temas de documentos
 DocumentModelOdt=Gerar documentos dos templates livres (Arquivos .ODT ou .ODS do libreoffice, KOffice, TextEdit, ...)
@@ -1024,14 +1004,8 @@ ProposalsPDFModules=Modelos de documentos para Orçamentos
 FreeLegalTextOnProposal=Texto livre em orçamentos
 WatermarkOnDraftProposal=Marca d'água no rascunho de orçamentos (nenhum se vazio)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Informar conta bancária de destino da proposta
-SupplierProposalSetup=Preço solicitado via fornecedor instalação de módulo
-SupplierProposalNumberingModules=Modelos de numeração das solicitações de preço aos fornecedores
-SupplierProposalPDFModules=Modelos de documentos de solicitação de preço aos fornecedores
-FreeLegalTextOnSupplierProposal=Texto livre sobre os pedidos de preços de fornecedores
-WatermarkOnDraftSupplierProposal=Marca d'água em projetos de ordem dos fornecedores (nenhum se estiver vazio)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Informar conta bancária de destino da proposta
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Solicitar Fonte de Armazenagem para o pedido
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Perguntar pela conta bancária de destino do pedido do fornecedor
 OrdersSetup=Configurações do gestor de pedidos
 OrdersNumberingModules=modelos de numeração de pedidos
 OrdersModelModule=Modelos de documentos de pedidos
@@ -1242,7 +1216,6 @@ OSCommerceErrorConnectOkButWrongDatabase=Conexão foi um sucesso mas o banco de
 OSCommerceTestOk=Conexão ao servidor '%s' no banco de dados '%s' com o usuário '%s' foi um sucesso.
 OSCommerceTestKo1=Conexão ao servidor '%s' foi um sucesso mas o banco de dados '%s' não foi alcançado.
 OSCommerceTestKo2=Conexão ao servidor '%s' com o usuário '%s' falhou.
-StockSetup=Configurações do módulo de estoque
 IfYouUsePointOfSaleCheckModule=Se você usar um módulo Ponto de Venda (POS módulo fornecido por padrão ou outro módulo externo), esta configuração pode ser ignorado pelo seu modulo ponto de Venda. A maioria modulo ponto de Vendas são projetados para criar imediatamente uma fatura e diminuir estoque por padrão tudo o que são opções aqui. Então, se você precisa ou não ter uma diminuição de ações quando registrar uma venda a partir do seu ponto de venda, verifique também a configuração do seu módulo POS.
 MenuDeleted=Menu Deletado
 NotTopTreeMenuPersonalized=Menus personalizados não conectados à uma entrada do menu superior
@@ -1328,8 +1301,6 @@ BankOrderESDesc=Ordem espanhola exibida
 ChequeReceiptsNumberingModule=Módulo de Numeração dos Comprovantes de Cheque
 MultiCompanySetup=Configurações do módulo multi-empresas
 SuppliersSetup=Configurações do módulo de fornecedores
-SuppliersCommandModel=Template completo de pedidos de fornecedores (logo...)
-SuppliersInvoiceModel=Template completo de faturas de fornecedores (logo...)
 SuppliersInvoiceNumberingModel=Modelo de numeração de faturas de fornecedores
 IfSetToYesDontForgetPermission=Se definido como sim, não se esqueça de fornecer permissões a grupos ou usuários autorizados para a segunda aprovação
 GeoIPMaxmindSetup=Configurações do módulo GeoIP Maxmind
@@ -1357,7 +1328,6 @@ NbIteConsecutive=Numero maximo dos mesmos caracteres repetidos
 NoAmbiCaracAutoGeneration=Não use caracteres ambíguos ("1","l","i","|","0","O") para a geração automática
 SalariesSetup=Configuração do módulo de salários
 SortOrder=Ordem de classificação
-TypePaymentDesc=0: Pagamento para Cliente, 1: Pagamento para Fornecedor, 2: Pagamentos para Clientes e Fornecedores
 IncludePath=Incluir caminho (definido na variável %s)
 ExpenseReportsSetup=Configuração do módulo de Relatórios de Despesas
 TemplatePDFExpenseReports=Modelos de documentos para gerar despesa documento de relatório
@@ -1404,17 +1374,10 @@ FixTZ=Consertar TimeZone
 FillFixTZOnlyIfRequired=Exemplo: +2 (preencher apenas se experimentou um problema)
 CurrentChecksum=Checksum corrente
 ForcedConstants=Valores constantes exigidos
-MailToSendProposal=Para enviar a proposta ao cliente
-MailToSendOrder=Para enviar pedido do cliente
-MailToSendInvoice=Para enviar fatura do cliente
-MailToSendShipment=Enviar envio
-MailToSendIntervention=Para enviar intervenção
-MailToSendSupplierRequestForQuotation=Para enviar a solicitação de cotação para fornecedor
-MailToSendSupplierOrder=Para enviar ordem fornecedor
-MailToSendSupplierInvoice=Para enviar fatura do fornecedor
-MailToThirdparty=Para enviar e-mail de uma página de terceiro
-MailToMember=Para enviar e-mail da página do membro
-MailToUser=Para enviar e-mail da página do usuário
+MailToSendProposal=Propostas de cliente
+MailToSendOrder=Pedidos de clientes
+MailToSendShipment=Fretes
+MailToUser=Usuários
 ByDefaultInList=Exibir como padrão na visualização em lista
 YouUseLastStableVersion=Você utiliza a última versão estável
 TitleExampleForMajorRelease=Exemplo de mensagem que você pode usar para anunciar esta importante versão (sinta-se à vontade para usar isso nos seus websites)
diff --git a/htdocs/langs/pt_BR/banks.lang b/htdocs/langs/pt_BR/banks.lang
index 41e59b35c22..ff300df0cb6 100644
--- a/htdocs/langs/pt_BR/banks.lang
+++ b/htdocs/langs/pt_BR/banks.lang
@@ -1,7 +1,5 @@
 # Dolibarr language file - Source file is en_US - banks
 MenuBankCash=Banco/Caixa
-MenuVariousPayment=Pagamentos diversos
-MenuNewVariousPayment=Novo pagamento diverso
 BankAccounts=Contas bancárias
 ShowAccount=Mostrar conta
 AccountRef=Ref. da conta financeira
@@ -129,8 +127,6 @@ BankAccountModelModule=Temas de documentos para as contas bancárias.
 DocumentModelSepaMandate=Tema do mandato SEPA. Útil somente para os países europeus na Comunidade Europeia.
 DocumentModelBan=Tema para imprimir a página com a informação BAN.
 NewVariousPayment=Novos pagamentos diversos
-VariousPayment=Pagamentos diversos
-VariousPayments=Pagamentos diversos
 ShowVariousPayment=Mostrar pagamentos diversos
 AddVariousPayment=Adicionar pagamentos diversos
 YourSEPAMandate=Seu mandato Área Única de Pagamentos em Euros
diff --git a/htdocs/langs/pt_BR/bills.lang b/htdocs/langs/pt_BR/bills.lang
index 7d7386131af..8f83350f623 100644
--- a/htdocs/langs/pt_BR/bills.lang
+++ b/htdocs/langs/pt_BR/bills.lang
@@ -1,11 +1,8 @@
 # Dolibarr language file - Source file is en_US - bills
-BillsCustomers=Faturas a clientes
 BillsCustomer=Fatura de cliente
-BillsSuppliers=Faturas de fornecedores
 BillsCustomersUnpaid=Faturas de clientes não pagos
 BillsCustomersUnpaidForCompany=Faturas de clientes não pagas para %s
 BillsSuppliersUnpaid=Faturas de fornecedores não pagos
-BillsSuppliersUnpaidForCompany=Faturas de fornecedores não pagas para %s
 BillsLate=Pagamentos atrasados
 BillsStatistics=Estatísticas de faturas de clientes
 BillsStatisticsSuppliers=Estatísticas faturas de Fornecedores
@@ -88,7 +85,6 @@ SearchASupplierInvoice=Procurar fatura de fornecedor
 SendRemindByMail=Enviar Lembrete por e-mail
 DoPayment=Digite o pagamento
 DoPaymentBack=Insira o reembolso
-ConvertToReduc=Converter em um desconto futuro
 ConvertExcessReceivedToReduc=Converta o excesso recebido em desconto futuro
 EnterPaymentReceivedFromCustomer=Entrar pagamento recebido de cliente
 EnterPaymentDueToCustomer=Realizar pagamento devido para cliente
@@ -98,7 +94,6 @@ BillStatus=Status de fatura
 StatusOfGeneratedInvoices=Situação das faturas geradas
 BillStatusDraft=Rascunho (precisa ser validada)
 BillStatusPaid=Pago
-BillStatusPaidBackOrConverted=Reembolso de nota de crédito ou convertido em desconto
 BillStatusConverted=Pago (Pronto para consumo na fatura final)
 BillStatusValidated=Validado (precisa ser pago)
 BillStatusStarted=Iniciado
@@ -244,7 +239,6 @@ CreditNoteDepositUse=A fatura deve ser validada para utilizar este tipo de créd
 NewGlobalDiscount=Novo desconto fixo
 NewRelativeDiscount=Novo desconto relativo
 DiscountOfferedBy=Concedido por
-DiscountAlreadyCounted=Descontos aplicados
 BillAddress=Endereço de cobrança
 HelpEscompte=Esse desconto é um desconto concedido para cliente porque o pagamento foi feito antes do prazo.
 HelpAbandonBadCustomer=Essa quantia foi abandonada (cliente mencionou a ser um mau cliente) e é considerado uma perca excepcional.
diff --git a/htdocs/langs/pt_BR/boxes.lang b/htdocs/langs/pt_BR/boxes.lang
index fddbf14a683..05315e638ca 100644
--- a/htdocs/langs/pt_BR/boxes.lang
+++ b/htdocs/langs/pt_BR/boxes.lang
@@ -5,12 +5,9 @@ BoxProductsAlertStock=Alertas de estoque para produtos
 BoxLastProductsInContract=Últimos %s produtos/serviços contratados
 BoxLastSupplierBills=Últimas faturas de fornecedor
 BoxLastCustomerBills=Últimas faturas a clientes
-BoxOldestUnpaidCustomerBills=Faturas a clientes não pagas mais antigas
 BoxOldestUnpaidSupplierBills=Faturas de fornecedor não pagas mais antigas
 BoxLastProposals=Últimas propostas comerciais
 BoxLastProspects=Últimos prospectos de cliente modificados
-BoxLastCustomers=Últimos clientes modificados
-BoxLastSuppliers=Últimos fornecedores modificados
 BoxLastCustomerOrders=Últimos pedidos de clientes
 BoxLastContacts=Últimos contatos/endereços
 BoxCurrentAccounts=Saldo das contas ativas
@@ -18,28 +15,18 @@ BoxTitleLastRssInfos=Últimas %s novidades de %s
 BoxTitleLastProducts=Últimos %s produtos/serviços modificados
 BoxTitleProductsAlertStock=Alerta nos produtos em estoque
 BoxTitleLastSuppliers=Últimos %s fornecedores registrados
-BoxTitleLastModifiedSuppliers=Últimos %s fornecedores modificados
-BoxTitleLastModifiedCustomers=Últimos %s clientes modificados
 BoxTitleLastCustomersOrProspects=Últimos %s clientes ou prospectos de cliente
 BoxTitleLastCustomerBills=Últimas notas de clientes %s
 BoxTitleLastSupplierBills=Últimas faturas de fornecedor %s
 BoxTitleLastModifiedProspects=Últimos %s prospectos de cliente modificados
-BoxTitleLastModifiedMembers=Últimos %s membros
-BoxTitleLastFicheInter=Últimas %s intervenções modificadas
 BoxTitleOldestUnpaidCustomerBills=Mais antigas %s faturas de clientes não pagos
 BoxTitleOldestUnpaidSupplierBills=Mais antigas %s faturas de fornecedores não pagos
 BoxTitleCurrentAccounts=Saldos das contas ativas
-BoxTitleLastModifiedContacts=Últimos %s contatos/endereços modificados
 BoxMyLastBookmarks=Meus últimos %s marcadores
 BoxOldestExpiredServices=Mais antigos serviços ativos expirados
 BoxLastExpiredServices=Ultimo %s dos contatos com serviço vencido ativo
-BoxTitleLastActionsToDo=Últimas %s ações a fazer
-BoxTitleLastContracts=Últimos %s contratos modificados
 BoxTitleLastModifiedDonations=Últimas %s doações modificadas
-BoxTitleLastModifiedExpenses=Últimos %s relatórios de despesas modificados
 BoxGlobalActivity=Atividade global (faturas, propostas, pedidos)
-BoxGoodCustomers=Bons clientes
-BoxTitleGoodCustomers=%s bons clientes
 FailedToRefreshDataInfoNotUpToDate=Falha na atualizacao do fulxo RSS. Ultima data da atualizacao: %s
 LastRefreshDate=Ultima data atualizacao
 NoRecordedBookmarks=Nenhum marcador definido.
diff --git a/htdocs/langs/pt_BR/commercial.lang b/htdocs/langs/pt_BR/commercial.lang
index 41a08423970..9f786a4ec70 100644
--- a/htdocs/langs/pt_BR/commercial.lang
+++ b/htdocs/langs/pt_BR/commercial.lang
@@ -45,8 +45,6 @@ ActionAC_REL=Enviar fatura de cliente por correio (lembrete)
 ActionAC_EMAILING=Enviar emails massivos
 ActionAC_COM=Enviar pedido de cliente por correio
 ActionAC_SHIP=Enviar frete por correio
-ActionAC_SUP_ORD=Enviar pedido de fornecedor por correio
-ActionAC_SUP_INV=Enviar fatura de fornecedor por correio
 ActionAC_OTH=Outros
 Stats=Estatísticas de vendas
 StatusProsp=Status de prospecto de cliente
diff --git a/htdocs/langs/pt_BR/companies.lang b/htdocs/langs/pt_BR/companies.lang
index a28c52e063e..b7a44346b8d 100644
--- a/htdocs/langs/pt_BR/companies.lang
+++ b/htdocs/langs/pt_BR/companies.lang
@@ -7,11 +7,7 @@ ConfirmDeleteContact=Você tem certeza que deseja excluir este contato e toda a
 MenuNewThirdParty=Novo terceiro
 MenuNewCustomer=Novo cliente
 MenuNewProspect=Novo prospecto de cliente
-MenuNewSupplier=Novo fornecedor
 MenuNewPrivateIndividual=Novo particular
-NewCompany=Nova empresa (prospecto de cliente, cliente, fornecedor)
-NewThirdParty=Novo terceiro (prospecto de cliente, cliente, fornecedor)
-CreateDolibarrThirdPartySupplier=Criar um terceiro (fornecedor)
 CreateThirdPartyOnly=Adicionar terceiro
 CreateThirdPartyAndContact=Criar um terceiro + um contato interno
 ProspectionArea=Área de prospecção
@@ -57,7 +53,6 @@ Town=Município
 Web=Website
 DefaultLang=Idioma ordinário
 CopyAddressFromSoc=Preencher o endereço com os dados do terceiro
-ThirdpartyNotCustomerNotSupplierSoNoRef=Terceiro sem ser cliente ou fornecedor, nenhum objeto de referência disponível
 PaymentBankAccount=Pagamento conta bancária
 OverAllOrders=Pedidos
 OverAllSupplierProposals=Solicitações de preço
@@ -70,9 +65,7 @@ LocalTax2IsNotUsedES=Não é usado IRPF
 TypeLocaltax1ES=RE Tipo
 TypeLocaltax2ES=IRPF Tipo
 WrongCustomerCode=Código de cliente inválido
-WrongSupplierCode=Código de fornecedor inválido
 CustomerCodeModel=Modelo de código de cliente
-SupplierCodeModel=Modelo de código de fornecedor
 ProfId1Short=ID prof. 1
 ProfId2Short=ID prof. 2
 ProfId3Short=ID prof. 3
@@ -140,13 +133,9 @@ AddThirdParty=Adicionar terceiro
 DeleteACompany=Excluir empresa
 PersonalInformations=Dados pessoais
 CustomerCode=Código de cliente
-SupplierCode=Código de fornecedor
 CustomerCodeShort=Código de cliente
-SupplierCodeShort=Código de fornecedor
 CustomerCodeDesc=Código de cliente, único para todos os clientes
-SupplierCodeDesc=Código de fornecedor, único para todos os fornecedores
 RequiredIfCustomer=Necessário se o terceiro for um cliente ou um possível cliente
-RequiredIfSupplier=Necessário se o terceiro for um fornecedor
 ValidityControledByModule=Validação controlada pelo módulo
 ThisIsModuleRules=Esta é a regra é para esse módulo
 ProspectToContact=Prospecto de cliente a contactar
@@ -171,7 +160,6 @@ NewContactAddress=Novo contato/endereço
 MyContacts=Meus contatos
 CapitalOf=Capital de %s
 EditCompany=Editar empresa
-ThisUserIsNot=Esse usuário não é um possível cliente, cliente ou fornecedor
 VATIntraCheckDesc=Esse link <b>%s</b> permite perguntar ao serviço de verificação da VAT europeia. Acesso externo a internet é necessário para o serviço.
 VATIntraCheckableOnEUSite=Verificar taxa VAT no site da comissão europeia
 VATIntraManualCheck=Você pode também verificar manualmente no site europeu <a href="%s" target="_blank">%s</a>
@@ -211,7 +199,6 @@ ImportDataset_company_1=Terceiros (Empresas / Fundações / Pessoas físicas) e
 PriceLevel=Faixa de preço
 DeliveryAddress=Endereço de entrega
 AddAddress=Adicionar endereço
-SupplierCategory=Categoria de fornecedor
 DeleteFile=Excluir arquivo
 ConfirmDeleteFile=Você tem certeza que deseja deletar esse arquivo?
 AllocateCommercial=Designado para representante comercial
@@ -222,7 +209,6 @@ YouMustAssignUserMailFirst=Você deve criar um e-mail para este usuário para po
 YouMustCreateContactFirst=Para estar apto a adicionar notificações por e-mail, você deve primeiramente definir contatos com e-mails válidos para o terceiro
 ListProspectsShort=Lista de prospectos de cliente
 ThirdPartiesArea=Área de terceiros
-LastModifiedThirdParties=Últimos %s terceiros modificados
 UniqueThirdParties=Total de terceiros
 ActivityCeased=Inativo
 ThirdPartyIsClosed=O terceiro está fechado
@@ -230,7 +216,6 @@ ProductsIntoElements=Lista de produtos/serviços em %s
 CurrentOutstandingBill=Notas aberta correntes
 OutstandingBill=Conta excelente
 OutstandingBillReached=Máx. para dívida a ser alcançado
-MonkeyNumRefModelDesc=Retorna um número no formato %syymm-nnnn para código de cliente e %syymm-nnnn para código de fornecedor onde yy é o ano, mm é o mês e nnnn é uma sequência numerica crescente (não repete, não retorna no zero).
 LeopardNumRefModelDesc=O código é livre. Esse código pode ser modificado a qualquer hora.
 ManagingDirectors=Nome do Representante(CEO,Diretor,Presidente...)
 MergeOriginThirdparty=Duplicar terceiros (terceiros que deseja excluir)
@@ -238,4 +223,3 @@ MergeThirdparties=Mesclar terceiros
 ConfirmMergeThirdparties=Tem certeza de que deseja juntar esse terceiro no atual? Todos os objetos vinculados (faturas, pedidos, ...) serão movidos para o terceiro atual, então a terceira parte será excluída.
 SaleRepresentativeLogin=Login para o representante de vendas
 SaleRepresentativeLastname=Sobrenome do representante de vendas
-NewCustomerSupplierCodeProposed=Código sugerido para o novo cliente ou fornecedor está duplicado
diff --git a/htdocs/langs/pt_BR/compta.lang b/htdocs/langs/pt_BR/compta.lang
index 4bf63e5466b..f5aefa010ef 100644
--- a/htdocs/langs/pt_BR/compta.lang
+++ b/htdocs/langs/pt_BR/compta.lang
@@ -15,7 +15,6 @@ Accountparent=Conta principal
 Accountsparent=Conta principal
 Income=Rendimentos
 MenuReportInOut=Rendimentos/Despesas
-ReportInOut=Saldo de receitas e despesas
 ReportTurnover=Faturamento
 PaymentsNotLinkedToInvoice=pagamentos vinculados a Nenhuma fatura, por o que nenhum Fornecedor
 PaymentsNotLinkedToUser=pagamentos não vinculados a um usuário
@@ -24,10 +23,8 @@ AccountingResult=Resultado contábil
 BalanceBefore=Balanço (antes)
 Piece=Doc. contábil
 AmountHTVATRealPaid=líquido pago
-VATReceived=Imposto recebido
 VATToCollect=Compras fiscais
-VATSummary=balanço de impostos
-VATPaid=Imposto pago
+VATBalance=balanço de impostos
 LT1Summary=Resumo da taxa 2
 LT2Summary=Resumo taxa 3
 LT1SummaryES=RE Balançete
@@ -90,7 +87,6 @@ ShowVatPayment=Ver Pagamentos ICMS
 TotalToPay=Total a pagar
 BalanceVisibilityDependsOnSortAndFilters=O saldo é visível nessa lista somente se a tabela for ordenada ascendendo em %s e filtrada por 1 conta bancária
 CustomerAccountancyCode=Código contábil do cliente
-SupplierAccountancyCode=Código contábil do fornecedor
 CustomerAccountancyCodeShort=Cod. cont. cli.
 SupplierAccountancyCodeShort=Cod. cont. forn.
 AccountNumber=Número da conta
@@ -166,13 +162,11 @@ ToCreateAPredefinedInvoice=Para criar um tema para fatura, crie uma fatura padr
 LinkedOrder=Linque para o pedido
 CalculationRuleDesc=Para calcular o total do VAT, há dois métodos: <br> Método 1 é arredondamento cuba em cada linha, em seguida, soma-los. <br> Método 2 é somando tudo cuba em cada linha, em seguida, o arredondamento resultado. <br> Resultado final pode difere de alguns centavos. O modo padrão é o <b>modo% s.</b>
 CalculationRuleDescSupplier=De acordo com o fornecedor, escolher o método adequado aplicar mesma regra de cálculo e obter mesmo resultado esperado pelo seu fornecedor.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Relatório Volume de negócios por produto, quando se usa um modo de <b>contabilidade de caixa</b> não é relevante. Este relatório está disponível somente quando utilizar o modo de <b>contabilidade engajamento</b> (ver configuração do módulo de contabilidade).
 CalculationMode=Forma de cálculo
 AccountancyJournal=código do Livro de Registro contábil
 ACCOUNTING_VAT_PAY_ACCOUNT=Conta da contabilidade padrão para o pagamento de ICMS
 ACCOUNTING_ACCOUNT_CUSTOMER=Conta contábil usada para terceiros de clientes
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=A conta contábil dedicada definida no cartão de terceiros será usada somente para o uso exclusivo do Sub Livro de Registro. Este será usado para o Razão Geral e como valor padrão da contabilidade do Sub Livro de Registro se a conta de acesso ao cliente dedicada em terceiros não estiver definida.
-ACCOUNTING_ACCOUNT_SUPPLIER=Conta contábil utilizada para fornecedores de terceiros
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=A conta contábil dedicada definida no cartão de terceiros será usada somente para o uso exclusivo do Sub Livro de registro. Este será usado para o Razão Geral e como valor padrão da contabilidade de Sub livro de registro se a conta de participação de fornecedores dedicada em terceiros não estiver definida.
 CloneTax=Clonar uma taxa social / fiscal
 ConfirmCloneTax=Confirme o clone de um pagamento de taxa social / fiscal
diff --git a/htdocs/langs/pt_BR/cron.lang b/htdocs/langs/pt_BR/cron.lang
index a038e71268d..03ac6c7b79c 100644
--- a/htdocs/langs/pt_BR/cron.lang
+++ b/htdocs/langs/pt_BR/cron.lang
@@ -13,7 +13,6 @@ CronExplainHowToRunWin=Em ambiente Microsoft (tm)  Windows,  Você PODE USAR Fer
 CronMethodDoesNotExists=A classe %s não contém método %s algum
 CronJobDefDesc=Os perfis de trabalho do Cron são definidos no arquivo do descritor do módulo. Quando o módulo é ativado, eles são carregados e disponíveis para que você possa administrar os trabalhos no menu de ferramentas de administração %s.
 CronJobProfiles=Lista de perfis de tarefa cron predefinidas
-EnabledAndDisabled=Ativado e desativado
 CronLastOutput=Saída da última execução
 CronLastResult=Código do último resultado
 CronList=As tarefas agendadas
@@ -23,14 +22,10 @@ CronExecute=Lançar Tarefas agendadas
 CronConfirmExecute=Você tem certeza que deseja executar agora estas tarefas agendadas?
 CronInfo=O módulo de Tarefa Agendada permite agendar tarefas para executá-las automaticamente. As tarefas também podem ser iniciadas manualmente.
 CronNone=Nenhum
-CronDtStart=Não antes
 CronDtEnd=Não depois
 CronDtNextLaunch=Próxima execução
-CronDtLastLaunch=Data de início da última execução
-CronDtLastResult=Data final da última execução
 CronNoJobs=Nenhuma tarefa registrada
 CronNbRun=Nr. execuçao
-CronEach=Cada
 JobFinished=Trabalho iniciado e terminado
 CronAdd=Adicionar tarefa
 CronEvery=Executar cada tarefa
diff --git a/htdocs/langs/pt_BR/dict.lang b/htdocs/langs/pt_BR/dict.lang
index a5d5e5873e6..5b29464fbbf 100644
--- a/htdocs/langs/pt_BR/dict.lang
+++ b/htdocs/langs/pt_BR/dict.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - dict
 CountryBE=Bélgica
-CountryIT=Itália
 CountryCH=Suíça
 CountryDZ=Argélia
 CountryCA=Canadá
diff --git a/htdocs/langs/pt_BR/ecm.lang b/htdocs/langs/pt_BR/ecm.lang
index b37cab38257..9c25161a213 100644
--- a/htdocs/langs/pt_BR/ecm.lang
+++ b/htdocs/langs/pt_BR/ecm.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - ecm
 ECMNbOfDocs=Nr. de documentos
+ECMSection=Pasta
+ECMSectionManual=Pasta manual
 ECMRoot=Raiz ECM
 ECMNewSection=Criar pasta
 ECMAddSection=Adicionar pasta
@@ -26,9 +28,7 @@ ShowECMSection=Exibir pasta
 DeleteSection=Apagar pasta
 ConfirmDeleteSection=Por favor confirmar a remocao do diretorio <b>%s</b>?
 ECMDirectoryForFiles=Relação de pasta para arquivos
-CannotRemoveDirectoryContainsFiles=Não foi possível apagar, porque contém alguns arquivos
 ECMFileManager=Gerenciador de arquivos
-ECMSelectASection=Selecione uma pasta na árvore a esquerda...
 DirNotSynchronizedSyncFirst=Este diretório parece ser criado ou modificado fora do módulo ECM. Você deve clicar no botão "Sincronizar" primeiro para sincronizar o disco do banco de dados para obter o conteúdo desse diretório.
 ReSyncListOfDir=Sincronizar lista de diretórios
 HashOfFileContent=Hash do conteúdo do arquivo
diff --git a/htdocs/langs/pt_BR/errors.lang b/htdocs/langs/pt_BR/errors.lang
index 1e40071d95c..f2dd85d0117 100644
--- a/htdocs/langs/pt_BR/errors.lang
+++ b/htdocs/langs/pt_BR/errors.lang
@@ -22,8 +22,6 @@ ErrorBadBarCodeSyntax=Bad sintaxe para código de barras. Pode ser que você def
 ErrorCustomerCodeRequired=Código de cliente necessário
 ErrorBarCodeRequired=Código de barras necessário
 ErrorBarCodeAlreadyUsed=Código de barras já utilizado
-ErrorBadSupplierCodeSyntax=Sintaxe inadequada para o código de fornecedor
-ErrorSupplierCodeRequired=Código de fornecedor necessário
 ErrorBadParameters=Parâmetros inadequados
 ErrorBadValueForParameter=Valor incorreto '%s' para o parâmetro '%s'
 ErrorBadImageFormat=Arquivo imagem de formato não suportado (Seu PHP não suporta funções para converter neste formato)
@@ -73,7 +71,6 @@ ErrorsOnXLines=Erros no/s registro(s) de origem <b>%s</b>
 ErrorFileIsInfectedWithAVirus=O antivírus não foi capaz de atestar o arquivo (o arquivo pode estar infectado por um vírus)
 ErrorSpecialCharNotAllowedForField=O campo "%s" não aceita caracteres especiais
 ErrorNumRefModel=Uma referência existe no banco de dados (% s) e não é compatível com esta regra de numeração. Remover registro ou referência renomeado para ativar este módulo.
-ErrorQtyTooLowForThisSupplier=Quantidade insuficiente para este fornecedor
 ErrorModuleSetupNotComplete=A configuração do módulo parece estar incompleta. Vá para Início >> Configuração >> Módulos para completá-la.
 ErrorBadMaskFailedToLocatePosOfSequence=Erro, máscara sem número de sequência
 ErrorBadMaskBadRazMonth=Erro, valor de redefinição ruim
@@ -151,7 +148,6 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Má definição da matriz Menu N
 ErrorSavingChanges=Ocorreu um erro ao salvar as alterações
 ErrorWarehouseRequiredIntoShipmentLine=É exigido um armazém na linha para a remessa
 ErrorFileMustHaveFormat=O arquivo deve ter o formato %s
-ErrorSupplierCountryIsNotDefined=Este fornecedor não possui o país definido. Corrija isto primeiro.
 ErrorsThirdpartyMerge=Falha em mesclar os dois registros. Solicitação cancelada.
 ErrorModuleNotFound=O arquivo do módulo não foi encontrado.
 WarningPasswordSetWithNoAccount=A senha foi definida para esse membro. No entanto, nenhuma conta de usuário foi criada. Portanto, esta senha é armazenada, mas não pode ser usado para acessar Dolibarr. Ele pode ser usado por um módulo / interface externa, mas se você não precisa definir qualquer login nem palavra-passe para um membro, você pode desabilitar a opção "Gerenciar um login para cada membro" da configuração do módulo-Membro. Se você precisa para gerenciar um login, mas não precisa de qualquer senha, você pode manter este campo em branco para evitar este aviso. Nota: E-mail pode também ser utilizado como uma entre o membro se está ligado a um utilizador.
diff --git a/htdocs/langs/pt_BR/exports.lang b/htdocs/langs/pt_BR/exports.lang
index 7512f5f8883..7eed4f12f5d 100644
--- a/htdocs/langs/pt_BR/exports.lang
+++ b/htdocs/langs/pt_BR/exports.lang
@@ -1,7 +1,6 @@
 # Dolibarr language file - Source file is en_US - exports
 ExportsArea=Área de exportações
 ImportArea=Área de importação
-NewExport=Nova exportação
 NewImport=Nova importação
 ExportableDatas=Conjunto de dados que podem ser exportados
 ImportableDatas=Conjunto de dados que podem ser importados
diff --git a/htdocs/langs/pt_BR/install.lang b/htdocs/langs/pt_BR/install.lang
index 8f3cda7ce34..92be724e94d 100644
--- a/htdocs/langs/pt_BR/install.lang
+++ b/htdocs/langs/pt_BR/install.lang
@@ -50,7 +50,6 @@ CheckToCreateUser=Caixa de seleção se o proprietário do banco de dados não e
 DatabaseRootLoginDescription=Login do usuário que possui permissão para criar novas bases de dados ou de novos usuários em banco de dados, inútil se o seu banco de dados e seu banco de dados já existe login (como quando você está hospedado por um provedor de hospedagem da web).
 KeepEmptyIfNoPassword=Deixar em branco se o usuário não tiver password
 SaveConfigurationFile=Gravar configuração
-ServerConnection=Conexão ao servidor
 DatabaseCreation=Criação da base de dados
 CreateDatabaseObjects=Criação dos objetos na base de dados...
 ReferenceDataLoading=Carregando Dados de base...
@@ -75,7 +74,6 @@ AdminLoginAlreadyExists=Dolibarr conta administrador <b>' %s'</b> já existe.
 FailedToCreateAdminLogin=Falha na criacao da conta administrador do Dolibarr.
 WarningRemoveInstallDir=Atenção, por razões de segurança, uma vez que a instalação ou atualização estiver completa, você deve remover o <b>diretório</b> de <b>instalação ou renomeá-lo para install.lock a fim de evitar o seu uso malicioso.</b>
 ChoosedMigrateScript=Migrar script selecionado
-DatabaseMigration=Estrutura de migração de dados
 ProcessMigrateScript=Processamento de Script
 ChooseYourSetupMode=Escolha o seu modo de configuração e clique em "Iniciar" ...
 FreshInstall=Nova instalação
diff --git a/htdocs/langs/pt_BR/ldap.lang b/htdocs/langs/pt_BR/ldap.lang
index fdfb449bcfb..e7a65590bb4 100644
--- a/htdocs/langs/pt_BR/ldap.lang
+++ b/htdocs/langs/pt_BR/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Senha do Domínio
 YouMustChangePassNextLogon=A senha de <b>%s</b> ao domínio <b>%s</b> deve de ser modificada.
 UserMustChangePassNextLogon=O usuário deve alterar de senha na próxima login
 LDAPInformationsForThisContact=Informação da base de dados LDAP deste contato
diff --git a/htdocs/langs/pt_BR/loan.lang b/htdocs/langs/pt_BR/loan.lang
index 9b0697f018f..9ba5a3276ef 100644
--- a/htdocs/langs/pt_BR/loan.lang
+++ b/htdocs/langs/pt_BR/loan.lang
@@ -12,31 +12,8 @@ ConfirmDeleteLoan=Confirme a exclusão deste empréstimo
 LoanDeleted=Empréstimo excluído com sucesso
 ConfirmPayLoan=Confirmar este empréstimo como pago
 LoanPaid=Empréstimo pago
-LoanCalc=Calculadora de Empréstimos Bancários
-PurchaseFinanceInfo=Informações de Compras e Financiamentos
-SalePriceOfAsset=Preço de venda de ativos
-PercentageDown=Percentagem de Down
-LengthOfMortgage=Período do empréstimo
-AnnualInterestRate=Taxa de juros anual
-ExplainCalculations=Explique Cálculos
-ShowMeCalculationsAndAmortization=Mostre-me os cálculos e amortização
-MortgagePaymentInformation=Informação do pagamento de hipoteca
-DownPayment=Pagamento Inicial
-DownPaymentDesc=<b>Pagamento inicial</b> = O preço da casa multiplicado pelo percentual dividido por 100 (para 5% tem-se como resultado 5/100 ou 0.05)
-InterestRateDesc=A <b>taxa de juros</b> = O percentual de juros anual dividido por 100
-MonthlyFactorDesc=<b>Fator mensal</b> = Resultado da seguinte fórmula
-MonthlyInterestRateDesc=A <b>taxa de juros mensal</b> = A taxa de juro anual dividido por 12 (para os 12 meses em um ano)
-MonthTermDesc=O <b>termo mensal</b> do empréstimo em meses = Número de anos do empréstimo tomado multiplicado por 12
-MonthlyPaymentDesc=O pagamento mensal é descoberto com a seguinte fórmula
-AmortizationPaymentDesc=A <a href="#amortization">amortização</a> demonstra o quanto do seu pagamento mensal  destina-se a juros do banco e quanto refere-se ao pagamento do pirncipal do seu empréstimo.
-AmountFinanced=Valor Financiado
-AmortizationMonthlyPaymentOverYears=Amortização de pagamento mensal: <b>%s%</b>de  %s ao longo dos anos
-LoanCalcDesc=Esta <b>calculadora de hipoteca</b> pode ser usada para mostrar os pagamentos mensais de um empréstimo, com base no montante contratado, no prazo desejado para o pagamento e na taxa de juros.<br> Esta calculadora inclui também o PMI (Private Mortgage Insurance - Seguro de Hipoteca Privada) para empréstimos onde mais de 20%% são usados para a entrada. Foram também consideradas as taxas municipais (IPTU), e seus efeitos no pagamento mensal total da hipoteca.<br>
-GoToInterest=%s será destinado a JUROS
-GoToPrincipal=%s será destinado ao PRINCIPAL
-YouWillSpend=Você gastará %s no ano de %s
 ListLoanAssociatedProject=Lista de empréstimos associados ao projeto
-AddLoan=Criar empréstimo
+InterestAmount=Juro
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Capital contabilístico por padrão
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Interesse contabilístico por padrão
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Seguro contabilístico por padrão
diff --git a/htdocs/langs/pt_BR/main.lang b/htdocs/langs/pt_BR/main.lang
index dc6fd38c407..68f99b64b5e 100644
--- a/htdocs/langs/pt_BR/main.lang
+++ b/htdocs/langs/pt_BR/main.lang
@@ -123,7 +123,6 @@ NumberByMonth=Numero por mes
 Limit=Límite
 Logout=Sair
 NoLogoutProcessWithAuthMode=No recurso de desconexão aplicativo com modo de autenticação
-Connection=Login
 HourStart=Comece hora
 DateAndHour=Data e hora
 DateEnd=Data de término
@@ -201,7 +200,6 @@ VATNPR=Valor taxa NPR
 Module=Modulo/Aplicacao
 OtherStatistics=Outras estatisticas
 Favorite=Favorito
-RefSupplier=Ref. Fornecedor
 RefPayment=Ref. Pagamento
 Comment=Comentario
 Comments=Comentarios
@@ -227,7 +225,6 @@ Categories=Tags / categorias
 Category=Tag / categoria
 to=para
 ApprovedBy2=Aprovado pelo (segunda aprovação)
-ByUsers=Por usuário
 LateDesc=O atraso na definição se o registro é tardio ou não, depende da sua configuração. Peça ao seu Administrador para alterar o atraso no menu Início - Configuração - Alertas.
 DeletePicture=Apagar foto
 ConfirmDeletePicture=Confirmar eliminação de fotografias
@@ -261,9 +258,7 @@ Referers=Itens correlatos
 Uncheck=Desmarque
 Entities=Entidadees
 CustomerPreview=Historico Cliente
-SupplierPreview=Historico Fornecedor
 ShowCustomerPreview=Ver Historico Cliente
-ShowSupplierPreview=Ver Historico Fornecedor
 SeeAll=Ver tudo
 SendByMail=Enviado por e-mail
 MailSentBy=Mail enviado por
@@ -388,12 +383,8 @@ Select2LoadingMoreResults=Carregando mais resultados...
 Select2SearchInProgress=Busca em andamento...
 SearchIntoContacts=Contatos
 SearchIntoUsers=Usuários
-SearchIntoCustomerInvoices=Faturas a clientes
-SearchIntoSupplierInvoices=Faturas de fornecedores
 SearchIntoCustomerOrders=Pedidos de clientes
-SearchIntoSupplierOrders=Pedidos a fornecedores
 SearchIntoCustomerProposals=Propostas de cliente
-SearchIntoSupplierProposals=Propostas a fornecedor
 SearchIntoContracts=Contratos
 SearchIntoCustomerShipments=Remessas do cliente
 CommentLink=Comentarios
diff --git a/htdocs/langs/pt_BR/margins.lang b/htdocs/langs/pt_BR/margins.lang
index dccb194f19a..a5f3383c627 100644
--- a/htdocs/langs/pt_BR/margins.lang
+++ b/htdocs/langs/pt_BR/margins.lang
@@ -16,10 +16,8 @@ ForceBuyingPriceIfNullDetails=Se o preço de compra / custo não definido, e ess
 MARGIN_METHODE_FOR_DISCOUNT=Metodologia de margem para descontos globais
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Define se um desconto global e tratado como o produto, serviço, ou somente sob o sub-total na margem.
 MARGIN_TYPE=Compra / Preço de custo sugerido por padrão para cálculo da margem de
-MargeType1=Margem de melhor preço com fornecedor
 MargeType2=Margem sobre o Preço Médio Ponderado (PMP)
 MargeType3=Margem sobre o preço de custo
-MarginTypeDesc=* Margem de melhor preço de compra = Preço de venda - o melhor preço com fornecedor definido na ficha de produto <br> * margem sobre o preço médio ponderado (WAP) = Preço de VENDA - produto Preço Médio Ponderado (WAP) ou melhor preço de fornecedor se WAP ainda não definido <br> * Margem sobre o preço de custo = preço de VENDA - preço de custo definido na ficha de produto ou WAP se o preço de custo não definido, ou melhor preço fornecedor, se ainda não WAP definido
 AgentContactType=Tipo contato do agente comercial
 AgentContactTypeDetails=Defina o tipo de contato (conectado coma as faturas) sera usado para o relatorio de margem dos representantes
 rateMustBeNumeric=Rata deve ser um valor numerico
diff --git a/htdocs/langs/pt_BR/members.lang b/htdocs/langs/pt_BR/members.lang
index d5e28dffb28..8c6f4f2bd83 100644
--- a/htdocs/langs/pt_BR/members.lang
+++ b/htdocs/langs/pt_BR/members.lang
@@ -55,7 +55,6 @@ FollowingLinksArePublic=os vínculos seguintes são páginas acessiveis a todos
 PublicMemberList=Lista público de Membros
 ExportDataset_member_1=Membros e Filiações
 LastMembersModified=Últimos %s membros modificados
-LastSubscriptionsModified=Últimas %s subscrições modificadas
 PublicMemberCard=Ficha pública membro
 SubscriptionNotRecorded=Subscrição não registrada
 AddSubscription=Criar subscripção
diff --git a/htdocs/langs/pt_BR/orders.lang b/htdocs/langs/pt_BR/orders.lang
index 4f897c6aec2..178bb8c6cb5 100644
--- a/htdocs/langs/pt_BR/orders.lang
+++ b/htdocs/langs/pt_BR/orders.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Área de Pedidos de Clientes
-SuppliersOrdersArea=Área de Pedidos a Fornecedores
 OrderCard=Ficha Pedido
 OrderId=ID Pedido
 Order=Pedido
@@ -13,24 +12,25 @@ OrderToProcess=Pedido a processar
 NewOrder=Novo Pedido
 ToOrder=Realizar Pedido
 MakeOrder=Realizar Pedido
-SupplierOrder=Pedido a Fornecedor
-SuppliersOrders=Pedidos a Fornecedores
-SuppliersOrdersRunning=Pedidos a Fornecedores em Curso
-CustomerOrder=Pedido de Cliente
-CustomersOrders=Pedidos de clientes
+CustomerOrder=Pedido do Cliente
+CustomersOrders=Pedidos de Clientes
 CustomersOrdersRunning=Pedidos dos clientes atuais
 CustomersOrdersAndOrdersLines=Pedidos de clientes e linhas de pedidos
 OrdersDeliveredToBill=Pedidos de clientes entregues na conta
 OrdersToBill=Pedidos dos clientes entregue
 OrdersInProcess=Pedidos de cliente em processo
 OrdersToProcess=Pedidos de cliente a processar
-SuppliersOrdersToProcess=Pedidos a fornecedor a processar
 StatusOrderSent=Entrega encaminhada
 StatusOrderOnProcessShort=Pedido
 StatusOrderToProcessShort=A processar
+StatusOrderReceivedPartiallyShort=Recebido Parcialmente
+StatusOrderDraft=Rascunho (a Confirmar)
+StatusOrderValidated=Validado
 StatusOrderOnProcess=Pedido - Aguardando Recebimento
 StatusOrderOnProcessWithValidation=Ordenada - recepção Standby ou validação
 StatusOrderToBill=A Faturar
+StatusOrderRefused=Reprovado
+StatusOrderReceivedPartially=Recebido Parcialmente
 StatusOrderReceivedAll=Todos os produtos recebidos
 ShippingExist=Existe envio
 QtyOrdered=Quant. Pedida
@@ -53,15 +53,12 @@ ShowOrder=Mostrar Pedido
 OrdersOpened=Pedidos a processar
 NoDraftOrders=Não há projetos de pedidos
 NoOrder=Sem pedidos
-NoSupplierOrder=Sem pedido de suprimento
 LastOrders=Últimos %s pedidos de cliente
 LastCustomerOrders=Últimos %s pedidos de cliente
-LastSupplierOrders=Últimos %s pedidos a fornecedores
 LastModifiedOrders=Últimos %s pedidos modificados
 AllOrders=Todos os Pedidos
 NbOfOrders=Número de Pedidos
 OrdersStatistics=Estatísticas de pedidos
-OrdersStatisticsSuppliers=Estatísticas de Pedidos a Fornecedores
 NumberOfOrdersByMonth=Número de Pedidos por Mês
 AmountOfOrdersByMonthHT=Numero de pedidos por mes (sem impostos)
 ListOfOrders=Lista de Pedidos
@@ -75,12 +72,9 @@ ConfirmMakeOrder=Você tem certeza que deseja confirmar que fez este pedido em <
 GenerateBill=Faturar
 ClassifyShipped=Clasificar entregue
 DraftOrders=Rascunhos de Pedidos
-DraftSuppliersOrders=Rascunho de pedidos para fornecedor
 OnProcessOrders=Pedidos em Processo
 RefOrder=Ref. Pedido
 RefCustomerOrder=Ref. pedido por cliente
-RefOrderSupplier=Ref. ordem por fonecedor
-RefOrderSupplierShort=Ref. Encomendar fornecedor
 SendOrderByMail=Enviar pedido por e-mail
 ActionsOnOrder=Ações sobre o pedido
 NoArticleOfTypeProduct=Não existe artigos de tipo 'produto' e por tanto expedidos neste pedido
@@ -92,19 +86,12 @@ ConfirmCloneOrder=Você tem certeza que deseja clonar este pedido, o <b>%s</b>?
 DispatchSupplierOrder=Receber pedido de fornecedor %s
 FirstApprovalAlreadyDone=A primeira aprovação já feito
 SecondApprovalAlreadyDone=Segundo aprovação já feito
-SupplierOrderReceivedInDolibarr=Pedido a fornecedor %s recebido %s
-SupplierOrderSubmitedInDolibarr=Pedido a fornecedor %s submetido
-SupplierOrderClassifiedBilled=Pedido a fornecedor %s conjunto faturado
 TypeContact_commande_internal_SALESREPFOLL=Responsável do seguimento do pedido do cliente
 TypeContact_commande_internal_SHIPPING=Representante seguindo o envio
 TypeContact_commande_external_BILLING=Contato fatura cliente
 TypeContact_commande_external_SHIPPING=Contato envio cliente
 TypeContact_commande_external_CUSTOMER=Contato cliente seguindo o pedido
-TypeContact_order_supplier_internal_SALESREPFOLL=Representante seguindo o pedido do fornecedor
 TypeContact_order_supplier_internal_SHIPPING=Representante seguindo o envio
-TypeContact_order_supplier_external_BILLING=Contato fatura fornecedor
-TypeContact_order_supplier_external_SHIPPING=Contato envio fornecedor
-TypeContact_order_supplier_external_CUSTOMER=Contato fornecedor seguindo o pedido
 Error_OrderNotChecked=Nenhum pedido seleçionado para se faturar
 OrderByEMail=E-mail
 PDFEinsteinDescription=Modelo de pedido completo (logo...)
diff --git a/htdocs/langs/pt_BR/other.lang b/htdocs/langs/pt_BR/other.lang
index a06dc426a08..25a7ab19281 100644
--- a/htdocs/langs/pt_BR/other.lang
+++ b/htdocs/langs/pt_BR/other.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - other
-SecurityCode=Código de segurança
 Tools=Ferramentas
 Birthday=Aniversário
 DateToBirth=Data de nascimento
@@ -115,7 +114,6 @@ StartUpload=Iniciar o "upload"
 CancelUpload=Cancelar o "upload"
 FileIsTooBig=Tamanho do arquivo grande de mais
 PleaseBePatient=Por favor aguarde....
-RequestToResetPasswordReceived=Recebemos a pedido de mudar a sua senha do Dolibarr
 NewKeyIs=Estas sao as suas novas chaves de acesso
 NewKeyWillBe=Sua nova chave de acesso do software sera
 ClickHereToGoTo=Clickar aqui para ir a %s
diff --git a/htdocs/langs/pt_BR/productbatch.lang b/htdocs/langs/pt_BR/productbatch.lang
index 9656f370eb8..3482315dc9c 100644
--- a/htdocs/langs/pt_BR/productbatch.lang
+++ b/htdocs/langs/pt_BR/productbatch.lang
@@ -13,7 +13,6 @@ printEatby=Compra-por: %s
 printSellby=Venda-por: %s
 printQty=Qtde: %d
 AddDispatchBatchLine=Adicione uma linha para Shelf Life expedição
-WhenProductBatchModuleOnOptionAreForced=Quando o módulo Lote / Série está ativado, o modo automático de aumento / diminuição do estoque é forçado a enviar e o envio manual para recepção e não pode ser editado. Outras opções podem ser definidas como você deseja.
 ProductDoesNotUseBatchSerial=Este produto não utiliza Lote / número de série
 ProductLotSetup=Configuração do módulo lote/nº de série
 ShowCurrentStockOfLot=Exibir o estoque atual para o produto/lote
diff --git a/htdocs/langs/pt_BR/products.lang b/htdocs/langs/pt_BR/products.lang
index 6d3c9f15095..d20684b990a 100644
--- a/htdocs/langs/pt_BR/products.lang
+++ b/htdocs/langs/pt_BR/products.lang
@@ -15,7 +15,6 @@ MassBarcodeInit=Inicialização de código de barras.
 MassBarcodeInitDesc=Esta página pode ser usado para inicializar um código de barras em objetos que não têm código de barras definidas. Verifique antes que a instalação do módulo de código de barras é completa.
 ProductsOnSellAndOnBuy=Produtos para venda e para compra
 ServicesOnSellAndOnBuy=Serviços para venda e compra
-LastModifiedProductsAndServices=Últimos %s produtos/serviços modificados
 LastRecordedProducts=Últimos %s produtos gravados
 LastRecordedServices=Últimos %s serviços gravados
 CardProduct0=Ficha do Produto
diff --git a/htdocs/langs/pt_BR/projects.lang b/htdocs/langs/pt_BR/projects.lang
index 35c4b80b39f..3f1f3882f44 100644
--- a/htdocs/langs/pt_BR/projects.lang
+++ b/htdocs/langs/pt_BR/projects.lang
@@ -34,7 +34,6 @@ TimesSpent=Dispêndio de tempo
 RefTask=Ref. da tarefa
 TaskTimeSpent=Dispêndio de tempo com tarefas
 TaskTimeUser=Usuário
-TasksOnOpenedProject=Tarefas em projetos abertos
 NewTimeSpent=Dispêndio de tempo
 MyTimeSpent=Meu dispêndio de tempo
 TaskDateEnd=Data final da tarefa
@@ -91,7 +90,6 @@ TaskCreatedInDolibarr=Tarefa %s criada
 TaskModifiedInDolibarr=Tarefa %s alterada
 TaskDeletedInDolibarr=Tarefa %s excluída
 OpportunityStatusShort=Est. da oprtnd.
-OpportunityProbability=Probabilidade da oportunidade
 OpportunityProbabilityShort=Prob. oport.
 OpportunityAmount=Montante de oportunidades
 OpportunityAmountShort=Montante de oport.
@@ -130,7 +128,6 @@ IdTaskTime=Horário do ID da tarefa
 YouCanCompleteRef=Se você deseja completar a referência com alguma informação (para usar como filtro de busca), recomenda-se a adição do carácter "-" para separação, desta forma a numeração automática ainda funcionará corretamente para os próximos projetos. Por exemplo: %s-ABC. Você também pode preferir adicionar chaves de busca no rótulo. Mas a melhor prática pode ser adicionar um campo dedicado, também chamado de atributos complementares.
 OnlyOpportunitiesShort=Somente oportunidades
 OpenedOpportunitiesShort=Oportunidades em andamento
-NotAnOpportunityShort=Não é uma oportunidade
 OpportunityTotalAmount=Montante total de oportunidades
 OpportunityPonderatedAmount=Montante de oportunidades ponderadas
 OpportunityPonderatedAmountDesc=Montante de oportunidades ponderadas com probalidade
diff --git a/htdocs/langs/pt_BR/receiptprinter.lang b/htdocs/langs/pt_BR/receiptprinter.lang
index 6cff8032b5a..388cbde764a 100644
--- a/htdocs/langs/pt_BR/receiptprinter.lang
+++ b/htdocs/langs/pt_BR/receiptprinter.lang
@@ -4,12 +4,10 @@ PrinterAdded=Impressora %s adicionada
 PrinterUpdated=Impressora %s atualizada
 PrinterDeleted=Impressora %s excluída
 TestSentToPrinter=Teste enviado para a impressora %s
-ReceiptPrinter=Impressoras de recibo
 ReceiptPrinterDesc=Configuração das impressoras de recibo
 ReceiptPrinterTemplateDesc=Configuração do Tema
 ReceiptPrinterTypeDesc=Descrição do tipo de Impressora de Recibo
 ReceiptPrinterProfileDesc=Descrição do Perfil da Impressora de Recibo
-ListPrinters=Lista de Impressoras
 SetupReceiptTemplate=Configuração do Tema
 CONNECTOR_DUMMY=Impressora Virtual
 CONNECTOR_NETWORK_PRINT=Impressora de rede
@@ -18,9 +16,7 @@ CONNECTOR_WINDOWS_PRINT=Impressora local do Windows
 CONNECTOR_DUMMY_HELP=Impressora Falsa para teste, não imprime nada
 CONNECTOR_WINDOWS_PRINT_HELP=LPT1, COM1, smb://FooUser:secret@nomedocomputador/grupodetrabalho/Impressora do Recibo
 PROFILE_DEFAULT=Perfil Padrão
-PROFILE_SIMPLE=Perfil Simples
 PROFILE_EPOSTEP=Perfil Epos Tep
-PROFILE_P822D=Perfil P822D
 PROFILE_STAR=Perfil Star
 PROFILE_DEFAULT_HELP=Perfil Padrão disponível para impressoras Epson
 PROFILE_SIMPLE_HELP=Perfil Simples Sem Imagens
diff --git a/htdocs/langs/pt_BR/stocks.lang b/htdocs/langs/pt_BR/stocks.lang
index a35c12c60e4..a18e1cc1e68 100644
--- a/htdocs/langs/pt_BR/stocks.lang
+++ b/htdocs/langs/pt_BR/stocks.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - stocks
-Warehouse=Armazém
 NewWarehouse=Novo armazém / setor de armazenagem
 MenuNewWarehouse=Novo armazém
 WarehouseSource=Armazém de origem
@@ -18,7 +17,6 @@ ErrorWarehouseRefRequired=A referência do armazém é necessária
 ListOfWarehouses=Lista de armazéns
 ListOfStockMovements=Lista de movimentações de estoque
 StocksArea=Setor de armazenagem
-NumberOfDifferentProducts=Número de produtos diferentes
 NumberOfProducts=Número total de produtos
 CorrectStock=Corrigir estoque
 StockTransfer=Banco de transferência
diff --git a/htdocs/langs/pt_BR/supplier_proposal.lang b/htdocs/langs/pt_BR/supplier_proposal.lang
index 3886169ed9b..8987ca9dc25 100644
--- a/htdocs/langs/pt_BR/supplier_proposal.lang
+++ b/htdocs/langs/pt_BR/supplier_proposal.lang
@@ -1,22 +1,14 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Propostas comerciais a fornecedor
-supplier_proposalDESC=Gerir solicitações de preço a fornecedores
 SupplierProposalNew=Nova solicitação de preço
 CommRequest=Solicitação de preço
 CommRequests=Solicitações de preço
 SearchRequest=Procurar uma solicitação
 DraftRequests=Minutas de solicitação
-SupplierProposalsDraft=Minutas de propostas a fornecedor
 LastModifiedRequests=Últimas %s solicitações de preço modificadas
 RequestsOpened=Solicitações de preço em aberto
-SupplierProposalArea=Área de propostas a fornecedor
-SupplierProposalShort=Proposta a fornecedor
-SupplierProposals=Propostas a fornecedor
-SupplierProposalsShort=Propostas a fornecedor
 NewAskPrice=Nova solicitação de preço
 ShowSupplierProposal=Mostrar solicitação de preço
 AddSupplierProposal=Criar uma solicitação de preço
-SupplierProposalRefFourn=Ref. fornecedor
 SupplierProposalDate=Data de entrega
 SupplierProposalRefFournNotice=Antes de fechar como "Aceita", é melhor verificar as referências dos fornecedores.
 ConfirmValidateAsk=Você tem certeza que deseja validar esta solicitação de preço sob o nome de <b>%s</b>?
@@ -46,9 +38,5 @@ 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)
 DefaultModelSupplierProposalClosed=Tema padrão quando fechando uma solicitação de preço (recusada)
-ListOfSupplierProposals=Lista de solicitações de proposta a fornecedor
-ListSupplierProposalsAssociatedProject=Lista de propostas de fornecedores associadas ao projeto
-SupplierProposalsToClose=Propostas a fornecedor a encerrar
-SupplierProposalsToProcess=Propostas a fornecedor a tratar
 LastSupplierProposals=Últimos %s preços solicitados
 AllPriceRequests=Todas as solicitações
diff --git a/htdocs/langs/pt_BR/suppliers.lang b/htdocs/langs/pt_BR/suppliers.lang
index d839fae2b3d..ff80027fe85 100644
--- a/htdocs/langs/pt_BR/suppliers.lang
+++ b/htdocs/langs/pt_BR/suppliers.lang
@@ -1,25 +1,17 @@
 # Dolibarr language file - Source file is en_US - suppliers
-ShowSupplierInvoice=Mostrar Fatura de Suprimentos
 TotalBuyingPriceMinShort=Total de precos de compra dos subprodutos
 TotalSellingPriceMinShort=Total de preços de venda de sub-produtos
 SomeSubProductHaveNoPrices=Algums dos sub-produtos nao tem um preco definido
 ChangeSupplierPrice=Modificar preço de compra
-SupplierPrices=Fornecedor preços
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Esta referencia de fornecedor ja esta asociada com a referenca: %s
 Availability=Entrega
-ExportDataset_fournisseur_1=Faturas de Fornecedores e Linhas de Fatura
-ExportDataset_fournisseur_2=Faturas Fornecedores e Pagamentos
-ExportDataset_fournisseur_3=Ordems de fornecedor e linhas de ordem
 ConfirmApproveThisOrder=Tem certeza que deseja aprovar o pedido <b>%s</b>?
 DenyingThisOrder=Negar esta pedido
 ConfirmDenyingThisOrder=Você tem certeza que deseja negar este pedido <b>%s</b>?
 ConfirmCancelThisOrder=Você tem certeza que deseja cancelar este pedido <b>%s</b>?
-AddSupplierInvoice=Criar Fatura do Fornecedor
-SentToSuppliers=Enviado para fornecedores
-ListOfSupplierOrders=Lista de pedidos do fornecedor
-MenuOrdersSupplierToBill=Pedidos a se faturar do foprnecedor
 NbDaysToDelivery=Atraso de entrega em dias
 DescNbDaysToDelivery=O maior atraso de entregar os produtos a partir deste fim
 DoNotOrderThisProductToThisSupplier=Não pedir
 NotTheGoodQualitySupplier=Qualidade inadequada
-BuyingPriceNumShort=Fornecedor preços
+AllProductServicePrices=Todos os preços dos produtos / serviços
+AllProductReferencesOfSupplier=Todas as referências de produtos / serviços do fornecedor
diff --git a/htdocs/langs/pt_BR/trips.lang b/htdocs/langs/pt_BR/trips.lang
index 85bc9ffd643..d2320cfec13 100644
--- a/htdocs/langs/pt_BR/trips.lang
+++ b/htdocs/langs/pt_BR/trips.lang
@@ -1,14 +1,10 @@
 # Dolibarr language file - Source file is en_US - trips
-ShowExpenseReport=Mostrar relatório de despesas
 Trips=Os relatórios de despesas
 TripsAndExpenses=Relatórios de despesas
 TripsAndExpensesStatistics=Estatísticas de relatórios de despesas
 TripCard=Despesa de cartão de relatório
-AddTrip=Criar relatório de despesas
 TypeFees=Tipos de benefício
-ShowTrip=Mostrar relatório de despesas
 LastExpenseReports=Últimos relatórios de despesas %s
-AllExpenseReports=Todos os relatórios de despesas
 CompanyVisited=Empresa / Organização visitada
 FeesKilometersOrAmout=Quantidade de quilômetros
 DeleteTrip=Excluir relatório de despesas
diff --git a/htdocs/langs/pt_BR/website.lang b/htdocs/langs/pt_BR/website.lang
index 3b03fc7f05e..3cf64eab259 100644
--- a/htdocs/langs/pt_BR/website.lang
+++ b/htdocs/langs/pt_BR/website.lang
@@ -2,7 +2,6 @@
 WebsiteSetupDesc=Crie aqui o numero de entradas ao website que você precisa. Depois entre no menu websites para editá-las.
 DeleteWebsite=Apagar website
 ConfirmDeleteWebsite=Você tem certeza que deseja apagar este web site. Todas as páginas e conteúdos serão removidos.
-WEBSITE_TYPE_CONTAINER=Tipo de página / recipiente
 WEBSITE_PAGE_EXAMPLE=Página da Web para usar como exemplo
 WEBSITE_PAGENAME=Nome da Página/Apelido
 WEBSITE_ALIASALT=Nomes / alias alternativos de página
@@ -68,7 +67,6 @@ AnotherContainer=Outro recipiente
 WEBSITE_USE_WEBSITE_ACCOUNTS=Habilitar a tabela da conta do site
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Ative a tabela para armazenar contas do site (login / pass) para cada site / terceira parte
 YouMustDefineTheHomePage=Você deve primeiro definir a Home page padrão
-OnlyEditionOfSourceForGrabbedContentFuture=Nota: somente uma edição da fonte HTML será possível quando um conteúdo da página for inculgado agarrando-o de uma página externa (o editor WYSIWYG não estará disponível)
 OnlyEditionOfSourceForGrabbedContent=Apenas uma edição de fonte HTML é possível quando o conteúdo foi extraído de um site externo
 GrabImagesInto=Pegue também imagens encontradas no css e na página.
 ImagesShouldBeSavedInto=As imagens devem ser salvas no diretório
diff --git a/htdocs/langs/pt_BR/withdrawals.lang b/htdocs/langs/pt_BR/withdrawals.lang
index b4b141da60f..e980da3eb0c 100644
--- a/htdocs/langs/pt_BR/withdrawals.lang
+++ b/htdocs/langs/pt_BR/withdrawals.lang
@@ -15,7 +15,6 @@ NotPossibleForThisStatusOfWithdrawReceiptORLine=Ainda não é possível. Retirar
 NbOfInvoiceToWithdraw=Nº da Nota Fiscal qualificada com ordem de débito direto
 NbOfInvoiceToWithdrawWithInfo=Nº da fatura do cliente com pedidos para pagamento por Débito direto com informação bancária definida
 InvoiceWaitingWithdraw=Fatura aguardando o Débito direto
-WithdrawsRefused=Débito direto recusado
 NoInvoiceToWithdraw=Nenhuma Nota Fiscal do cliente com aberto 'Ordem de débito direto' está aguardando. Vá na guia '%s' no cartão de Nota Fiscal para fazer um pedido.
 ResponsibleUser=Usuário Responsável dos Débitos Diretos
 WithdrawStatistics=Estatísticas do pagamento por Débito direto
diff --git a/htdocs/langs/pt_BR/workflow.lang b/htdocs/langs/pt_BR/workflow.lang
index 539d2368b49..3962126b57f 100644
--- a/htdocs/langs/pt_BR/workflow.lang
+++ b/htdocs/langs/pt_BR/workflow.lang
@@ -1,4 +1,13 @@
 # Dolibarr language file - Source file is en_US - workflow
+WorkflowSetup=Configuração do módulo de Fluxo de Trabalho
 WorkflowDesc=Este módulo é concebido para modificar o comportamento das ações automáticas para aplicação. Por padrão, o fluxo de trabalho está aberto (você pode fazer as coisas na ordem que você quiser). Você pode ativar as ações automáticas que você está interessado.
 ThereIsNoWorkflowToModify=Não há alterações do fluxo de trabalho disponíveis com os módulos ativados.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Crie automaticamente uma ordem de cliente após a assinatura de uma proposta comercial (a nova ordem terá o mesmo valor que a proposta)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Crie automaticamente uma fatura do cliente após a assinatura de uma proposta comercial (a nova fatura terá o mesmo valor que a proposta)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Criar automaticamente uma fatura de cliente depois que um contrato é validado
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Crie automaticamente uma fatura do cliente após a conclusão de uma ordem do cliente (a nova fatura terá o mesmo valor do que o pedido)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classifique a(s) proposta(s) de origem vinculada a faturada quando a ordem do cliente é definida como faturada (e se a quantidade da ordem for igual à quantidade total de propostas vinculadas assinadas)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classifique a(s) proposta(s) de origem vinculada a faturada quando a fatura do cliente é validada (e se o valor da fatura for igual ao montante total de propostas vinculadas assinadas)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classifique a(s) ordem(s) do cliente de origem vinculada a faturar quando a fatura do cliente é validada (e se o valor da fatura for igual ao montante total de pedidos vinculados)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classifique a(s) ordem(s) do cliente de origem vinculada a faturar quando a fatura do cliente é definida como paga (e se o valor da fatura for igual ao montante total de pedidos vinculados)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classifique a ordem do cliente de origem vinculada a ser enviada quando uma remessa é validada (e se a quantidade enviada por todas as remessas for o mesmo que na ordem de atualização)
diff --git a/htdocs/langs/pt_PT/accountancy.lang b/htdocs/langs/pt_PT/accountancy.lang
index 4a4ac0ea784..4405d82d287 100644
--- a/htdocs/langs/pt_PT/accountancy.lang
+++ b/htdocs/langs/pt_PT/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Contabilidade
 ACCOUNTING_EXPORT_SEPARATORCSV=Separador de coluna para o ficheiro exportadocc
 ACCOUNTING_EXPORT_DATE=Formato da data para o ficheiro exportado
 ACCOUNTING_EXPORT_PIECE=Exportar a referência da peça
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Accounts with non zero values
 ListOfAccounts=List of accounts
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers 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
 
-AccountancyArea=Área de contabilidade
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=O uso do módulo de contabilidade é feito em várias etapas:
 AccountancyAreaDescActionOnce=As seguintes ações são geralmente executadas apenas uma vez, ou uma vez por ano ...
 AccountancyAreaDescActionOnceBis=Os próximos passos devem ser efetuados para economizar tempo no futuro, sugerindo-lhe a conta contabilística padrão correta quando estiver a ser feito um registo no Livro Razão e nos Diários.
@@ -89,7 +90,7 @@ MenuProductsAccounts=Contas de produtos
 ProductsBinding=Contas de produtos
 Ventilation=Vinculação a contas
 CustomersVentilation=Associação à fatura do cliente
-SuppliersVentilation=Associação à fatura do fornecedor
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Vinculação do relatório de despesas
 CreateMvts=Criar nova transação
 UpdateMvts=Modificação de uma transação
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=Diário de compras
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Diário de diversos
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Diário de relatório de despesas
 ACCOUNTING_SOCIAL_JOURNAL=Diário social
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Conta contabilística de transferência
 ACCOUNTING_ACCOUNT_SUSPENSE=Conta contabilística de espera
@@ -185,11 +187,12 @@ ListeMvts=Lista de movimentos
 ErrorDebitCredit=Débito e crédito não pode ter um valor, ao mesmo tempo
 AddCompteFromBK=Adicionar contas contabilisticas ao grupo
 ReportThirdParty=Lista de contas de terceiros
-DescThirdPartyReport=Consulte aqui a lista de clientes e fornecedores e as suas contas contabilísticas
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=Lista de contas contabilísticas
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Group of account
 Pcgsubtype=Subgroup of account
@@ -198,14 +201,14 @@ PcgtypeDesc=Group and subgroup of account are used as predefined 'filter' and 'g
 TotalVente=Total de volume de negócios sem impostos
 TotalMarge=Margem total de vendas
 
-DescVentilCustomer=Consulte aqui a lista de linhas de faturas de clientes associados (ou não) a uma conta contabilística de produto
+DescVentilCustomer=Consulte aqui a lista de linhas de faturas a clientes associados (ou não) a uma conta contabilística de produto
 DescVentilMore=Na maioria dos casos, se você usar produtos ou serviços predefinidos e configurar o número de conta no cartão do produto/serviço, a aplicação será capaz de efetuar toda a vinculação entre a linhas das faturas e a conta contabilística do seu gráfico de contas através de um clique no botão <strong>"%s"</strong>. Se a conta não for configurada no cartão do produto/serviço or se você tiver algumas linhas não vinculadas a uma conta, então terá de efetuar a vinculação manual a partir do menu "<strong>%s</strong>".
-DescVentilDoneCustomer=Consulte aqui a lista das linhas de faturas de clientes e as suas contas de contabilísticas de produto
+DescVentilDoneCustomer=Consulte aqui a lista das linhas de faturas a clientes e as suas contas de contabilísticas de produto
 DescVentilTodoCustomer=Vincular linhas da fatura que não estejam vinculadas a uma conta contabilística de produto
 ChangeAccount=Alterar a conta contabilística de produto/serviço para as linhas selecionadas com a seguinte conta contabilística:
 Vide=-
-DescVentilSupplier=Consulte aqui a lista de linhas de faturas de fornecedor associadas ou não, a uma conta contabilística de produto
-DescVentilDoneSupplier=Consulte aqui a lista das linhas das faturas e a conta contabilística do fornecedor
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Vincule as linhas do relatórios de despesas de não vinculados a um honorário de uma conta de contabilística
 DescVentilExpenseReport=Consulte aqui a lista de linhas do relatório de despesas vinculadas (ou não) a um honorário da conta contabilística
 DescVentilExpenseReportMore=Se configurar a conta contabilística de acordo com o tipo de linha de relatório de despesa, a aplicação será capaz de efetuar toda a vinculação entre as linhas do seu relatório de despesas e a conta contabilística do seu gráfico de contas através de um único clique no botão <strong>"%s"</strong>. Se a conta não foi configurada no dicionário de honorários ou se você tem algumas linhas não vinculadas, então terá de efetuar a vinculação manuel no menu "<strong>%s</strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Vincular automaticamente
 AutomaticBindingDone=Vinculação automática efetuada
 
 ErrorAccountancyCodeIsAlreadyUse=Erro, não pode apagar esta conta contabilística porque está a ser utilizada
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Cartão de vinculação
 GeneralLedgerIsWritten=As transações são escritas no Livro Razão
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -293,4 +296,9 @@ Binded=Linhas vinculadas
 ToBind=Linhas a vincular
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index f32f9c7f7a4..f2be6450c9d 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -32,8 +32,8 @@ PurgeSessions=Limpeza das sessões
 ConfirmPurgeSessions=Deseja mesmo limpar todas as sessões? Isto irá desassociar todos os utilizadores (exceto você).
 NoSessionListWithThisHandler=O utilizador para guardar a sessão configurado no seu PHP não permite listar todas as sessões em execução.
 LockNewSessions=Bloquear novas ligações
-ConfirmLockNewSessions=Tem a certeza que pretende restringir qualquer nova ligação Dolibarr para si? Depois disso, só o utilizador <b>%s</b> poderá ligar.
-UnlockNewSessions=Remover bloqueio de ligação
+ConfirmLockNewSessions=Tem a certeza que pretende restringir qualquer nova conexão Dolibarr para si? Depois disso, só o utilizador <b>%s</b> poderá ligar.
+UnlockNewSessions=Remover bloqueio de conexão
 YourSession=A sua sessão
 Sessions=Sessão de utilizadores
 WebUserGroup=Utilizador/grupo do servidor da Web
@@ -49,7 +49,7 @@ InternalUser=Utilizador interno
 ExternalUser=Utilizador externo
 InternalUsers=Utilizadores internos
 ExternalUsers=Utilizadores externos
-GUISetup=Exibir
+GUISetup=Aparência
 SetupArea=Área de configuração
 UploadNewTemplate=Carregar novo(s) modelo(s)
 FormToTestFileUploadForm=Formulário para testar o envio de ficheiro (de acordo com a configuração)
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=Servidor SMTP/SMTPS (Por predefinição no php.ini: <b>%s<
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Porta do servidor SMTP (Não definido em PHP em sistemas de tipo Unix)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Servidor SMTP/SMTPS (Não definido em PHP em sistemas de tipo Unix)
 MAIN_MAIL_EMAIL_FROM=Email do emissor para envios email automáticos (Por defeito em php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Remetente de email usado para emails enviados que retornaram erro
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= Enviar sistematicamente uma cópia carbono de todos os emails enviados para
 MAIN_DISABLE_ALL_MAILS=Desativar globalmente todo o envio de emails (para fins de teste ou demonstrações)
 MAIN_MAIL_FORCE_SENDTO=Enviar todos os e-mails para (em vez de enviar para destinatários reais, para fins de teste)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=Método de envio de emails
 MAIN_MAIL_SMTPS_ID=ID SMTP, se necessário a autenticação
 MAIN_MAIL_SMTPS_PW=Palavra-passe de SMTP, se necessário a autenticação
@@ -291,7 +292,7 @@ ModuleSetup=Configuração do módulo
 ModulesSetup=Módulos/Aplicação - Configuração
 ModuleFamilyBase=Sistema
 ModuleFamilyCrm=Gestão do Relacionamento com o Cliente (CRM)
-ModuleFamilySrm=Gestão de Relacionamento com o Fornecedor (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Gestão de Productos (PM)
 ModuleFamilyHr=Gestão de Recursos Humanos (HR)
 ModuleFamilyProjects=Projetos/Trabalho cooperativo
@@ -373,7 +374,8 @@ NoSmsEngine=Nenhum mecanismo de envio de SMS disponível. Mecanismos de SMS, nã
 PDF=PDF
 PDFDesc=Você pode definir cada uma das opções globais relacionadas com a criação de PDF
 PDFAddressForging=Regras para criar caixas de endereço
-HideAnyVATInformationOnPDF=Ocultar todas as informações relativas ao IVA em PDF gerado
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Regras para %s
 HideLocalTaxOnPDF=Ocultar taxa %s na coluna de impostos do PDF
 HideDescOnPDF=Ocultar a descrição dos produtos no PDF gerado
@@ -412,7 +414,7 @@ ExtrafieldCheckBoxFromList=Caixas de marcação da tabela
 ExtrafieldLink=Vincular a um objeto
 ComputedFormula=Campo calculado
 ComputedFormulaDesc=Você pode inserir aqui uma fórmula usando outras propriedades do objeto ou qualquer codificação PHP para obter um valor calculado dinâmico. Você pode usar todas as fórmulas compatíveis com PHP, incluindo o "?" operador de condição e seguinte objeto global: <strong>$db, $conf, $langs, $mysoc, $user, $object.</strong><br><strong>AVISO</strong>: Somente algumas propriedades de $object podem estar disponíveis. Se você precisa de propriedades não carregadas, basta buscar o objeto na sua fórmula, como no segundo exemplo. <br>Usando um campo calculado significa que você não pode entrar qualquer valor da interface. Além disso, se houver um erro de sintaxe, a fórmula pode retornar nada.<br><br> Exemplo de fórmula: <br>$object-> id <10? round ($object-> id / 2, 2): ($object-> id + 2 * $user-> id) * (int) substr($mysoc-> zip, 1, 2) <br><br>Exemplo para recarregar o objeto <br>(($reloadedobj = new Societe ($db)) && ($reloadedobj->fetch($obj-> id? $obj-> id: ($obj-> rowid? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options ['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Outro exemplo de fórmula para forçar a carga do objeto e seu objeto pai:<br> (($reloadedobj = new Task ($db)) && ($reloadedobj->fetch ($object-> id)> 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj-> fetch($reloadedobj->fk_project)> 0)) ? $secondloadedobj->ref: 'Projeto pai não encontrado'
-ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
+ExtrafieldParamHelpPassword=Manter este campo vazio significa que o valor será armazenado sem ser encriptado (campo deve ser escondido apenas com estrela na tela). <br> Defina aqui o valor 'auto' para usar a regra de encriptação predefinida ao registar palavras-passe na base de dados (o valor lido será o apenas hash, não há maneira de recuperar o valor original)
 ExtrafieldParamHelpselect=A lista de parâmetros tem seguir o seguinte esquema chave,valor (no qual a chave não pode ser '0')<br><br> por exemplo: <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>Para que a lista dependa noutra lista de atributos complementares:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>Para que a lista dependa doutra lista:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=A lista de valores tem de seguir o seguinte esquema chave,valor (onde a chave não pode ser '0')<br><br> por exemplo:<br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=A lista de valores tem de seguir o seguinte esquema chave,valor (onde a chave não pode ser '0')<br><br> por exemplo:<br>1,value1<br>2,value2<br>3,value3<br>...
@@ -445,13 +447,14 @@ DisplayCompanyInfo=Exibir morada da empresa
 DisplayCompanyManagers=Mostrar nomes dos gestores
 DisplayCompanyInfoAndManagers=Exibir a morada da empresa e menus de gestor
 EnableAndSetupModuleCron=Se você deseja que esta fatura periódica seja gerada automaticamente, o módulo *1 %s* deve ser habilitado e configurado corretamente. Caso contrário, a geração de faturas deve ser feita manualmente a partir deste modelo com o botão * Criar *. Observe que, mesmo que você tenha ativado a geração automática, você ainda pode iniciar com segurança a geração manual. A geração de duplicatas para o mesmo período não é possível.
-ModuleCompanyCodeAquarium=Retorno de um código de contabilidade construído por: <br>%s seguido do código de fornecedor de terceiros para um código de contabilidade do fornecedor, <br>%s seguido do código de cliente de terceiros para um código de contabilidade do cliente.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Retornar um código de contabilidade vazio.
 ModuleCompanyCodeDigitaria=O código de contabilidade depende do código de terceiros. O código é composto pelo caractere "C" na primeira posição seguida pelos primeiros 5 caracteres do código de terceiros.
 Use3StepsApproval=Por padrão, as ordens de compra precisam ser criadas e aprovadas por 2 usuários diferentes (um passo / usuário para criar e um passo / usuário para aprovar. Note que, se o usuário tiver permissão para criar e aprovar, um passo / usuário será suficiente) . Você pode solicitar esta opção para introduzir uma terceira etapa / aprovação do usuário, se o valor for superior a um valor dedicado (então serão necessárias 3 etapas: 1 = validação, 2 = primeira aprovação e 3 = segunda aprovação se a quantidade for suficiente). 1 <br>Defina isto como vazio se uma aprovação (2 etapas) for suficiente, ajuste-o para um valor muito baixo (0,1) se uma segunda aprovação (3 etapas) for sempre necessária.
 UseDoubleApproval=Utilizar uma aprovação de 3 etapas quando o valor (sem impostos) for superior a...
 WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
-WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
+WarningPHPMail2=Se o seu serviço de e-mail SMTP restringir o cliente de e-mail a alguns endereços IP (muito raro), utilize o seguinte endereço IP da sua instalação Dolibarr: <strong>%s</strong>.
 ClickToShowDescription=Clique para mostrar a descrição
 DependsOn=Este módulo depende do(s) módulo(s)
 RequiredBy=Este módulo é necessário para o(s) módulo(s)
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Defina isto como 1 se desejar anexar o documento principa
 FilesAttachedToEmail=Anexar ficheiro
 SendEmailsReminders=Envie lembretes da agenda por e-mails
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=Utilizadores e grupos
 Module0Desc=Gestão de Utilizadores / Funcionários e Grupos
@@ -479,7 +485,7 @@ Module1Desc=Gestão de terceiros (empresas, particulares) e contactos
 Module2Name=Comercial
 Module2Desc=Gestão comercial
 Module10Name=Contabilidade
-Module10Desc=Relatórios simples de contabilidade (repartição das receitas e pagamentos) baseados no conteúdo da base de dados. Sem expedição.
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=Orçamentos
 Module20Desc=Gestão de orçamentos para clientes
 Module22Name=Emails em massa
@@ -546,8 +552,8 @@ Module400Name=Projetos/Oportunidades/Leads
 Module400Desc=Gestão de projetos, oportunidades/leads e/ou tarefas. Você também pode atribuir qualquer elemento (fatura, encomenda, orçamento, intervenção, ...) a um projeto e obter uma visão transversal do projeto.
 Module410Name=Webcalendar
 Module410Desc=Integração com Webcalendar
-Module500Name=Despesas especiais
-Module500Desc=Gestão de despesas especiais (impostos, impostos sociais ou ficais, dividendos)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Pagamento dos salários dos empregados
 Module510Desc=Registe e dê seguimento aos pagamentos dos salários dos seus funcionários
 Module520Name=Empréstimo
@@ -561,14 +567,14 @@ Module700Name=Donativos
 Module700Desc=Gestão de donativos
 Module770Name=Relatórios de despesas
 Module770Desc=Gestão e reivindicação de relatórios de despesas (deslocação, refeição, ...)
-Module1120Name=Orçamentos de fornecedores
-Module1120Desc=Pedir orçamentos e preços de fornecedores
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Integração com Mantis
 Module1520Name=Criação de documentos
 Module1520Desc=Produção do documento da emails em massa
 Module1780Name=Etiquetas/Categorias
-Module1780Desc=Criar etiquetas/categoria (produtos, clientes, fornecedores, contactos ou membros)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=Editor WYSIWYG
 Module2000Desc=Permitir a edição de texto utilizando um editor avançado (baseado no CKEditor)
 Module2200Name=Preços dinâmicos
@@ -576,7 +582,7 @@ Module2200Desc=Permitir a utilização de expressões matemáticas para os preç
 Module2300Name=Tarefas agendadas
 Module2300Desc=Gestão de trabalhos agendados (alias cron ou tabela chrono)
 Module2400Name=Eventos/Agenda
-Module2400Desc=Seguir eventos terminados e que estão para ocorrer. Permitir que a aplicação registe eventos automáticos ou eventos manuais ou encontros.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=SGD / GEC
 Module2500Desc=Sistema de Gestão de Documentos / Gestão de Conteúdo Eletrónico. Organização automática dos seus documentos gerados ou armazenados. Compartilhe-os quando precisar.
 Module2600Name=Serviços API/Web (servidor SOAP)
@@ -613,7 +619,7 @@ Module50100Desc=Modúlo de ponto de vendas (POS).
 Module50200Name=Paypal
 Module50200Desc=Modulo que permite pagina online de pagamento aceitando pagamentos utilisando PayPal (cartões de crédito ou crédito PayPal). Pode ser utilisado para permitir ao cliente para fazer pagamentos libre ou pagamentos ligados a objetos do Dolibarr (faturas, encomendas, ...)
 Module50400Name=Contabilidade (avançada)
-Module50400Desc=Gestão de contabilidade (dupla entrada, suporta registos gerais e auxiliares)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=PrintIPP
 Module54000Desc=impressão direta (sem abrir os documentos) usando a interface Cups IPP (A impressora deve ser visível a partir do servidor, e o CUPS deve estar instalado no servidor).
 Module55000Name=Votação ou Questionário
@@ -626,13 +632,13 @@ Module62000Name=Incoterm
 Module62000Desc=Adione funções para gerir Incoterm
 Module63000Name=Recursos
 Module63000Desc=Gerir recursos (impressoras, carros, ...) que pode partilhar em eventos
-Permission11=Consultar faturas de clientes
-Permission12=Criar/Modificar faturas de clientes
-Permission13=Invalidar faturas de clientes
-Permission14=Validar faturas de clientes
-Permission15=Enviar faturas de clientes por email
-Permission16=Emitir pagamentos para faturas de clientes
-Permission19=Eliminar faturas de clientes
+Permission11=Consultar faturas a clientes
+Permission12=Criar/modificar faturas a clientes
+Permission13=Invalidar faturas a clientes
+Permission14=Validar faturas a clientes
+Permission15=Enviar faturas a clientes por email
+Permission16=Emitir pagamentos para faturas a clientes
+Permission19=Eliminar faturas a clientes
 Permission21=Consultar orçamentos a clientes
 Permission22=Criar/Modificar orçamentos a clientes
 Permission24=Confirmar orçamentos a clientes
@@ -1027,15 +1033,15 @@ Delays_MAIN_DELAY_PROPALS_TO_BILL=Tolerância (em dias) antes da emissão do ale
 Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerância de atraso (em dias) antes da emissão de um alerta para serviços por ativar
 Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerância de atraso (em dias) antes da emissão de um alerta para serviços expirados
 Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerância de atraso (em dias) antes da emissão de um alerta para faturas de fornecedores por pagar
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerância de atraso (em dias) antes da emissão de um alerta para faturas de clientes por pagar
+Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerância de atraso (em dias) antes da emissão de um alerta para faturas a clientes por pagar
 Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerância de atraso (em dias) antes da emissão de um alerta para reconcilizações bancárias pendentes
 Delays_MAIN_DELAY_MEMBERS=Tolerância de atraso (em dias) antes da emissão de um alerta para atrasos de pagamentos para taxas de associação
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerância de atraso (em dias) antes da emissão de um alerta para depósitos em cheques, por efetuar
 Delays_MAIN_DELAY_EXPENSEREPORTS=Atraso de tolerância (em dias) antes da emissão de um alerta para relatórios de despesas por aprovar
 SetupDescription1=A área de configuração é para parâmetros de configuração iniciais, antes do primeiro uso do Dolibarr
-SetupDescription2=Os passos de configuração mais importantes são as duas primeiras entradas no menu de configuração à esquerda: a página de configuração de %s e a página de configuração %s
-SetupDescription3=Os parâmetros no menu <a href="%s">%s -> %s</a> são de preenchimento obrigatório, isto porque estes dados são utilizados em várias páginas do Dolibarr e personalizam o comportamento do software (para funcionalidades relacionadas com o país, por exemplo).
-SetupDescription4=Os parâmetros no menu <a href="%s">%s -> %s</a> são de preenchimento obrigatório, isto porque o Dolibarr não é um CRM/ERP monolítico mas sim uma coleção de vários módulos interdependentes. Novas funcionalidades serão adicionadas aos menus por cada módulo que ative.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=Outros itens do menu, gerir parâmetros opcionais.
 LogEvents=Eventos de auditoria da segurança
 Audit=Auditoria
@@ -1054,8 +1060,9 @@ LogEventDesc=Pode ativar o registo de eventos de segurança Dolibarr aqui. Os ad
 AreaForAdminOnly=Os parâmetros de configuração só podem ser definidos pelos <b>utilizadores administradores</b>.
 SystemInfoDesc=Esta informação do sistema é uma informação técnica acessível só para leitura dos administradores.
 SystemAreaForAdminOnly=Esta área só é acessível aos utilizadores administradores. Nenhuma permissão do Dolibarr permite reduzir esta limitação.
-CompanyFundationDesc=Nesta página modifique toda a informação relacionada com a empresa ou fundação que você gere (para isso, clique em no botão "Modificar" ou "Guardar" no fim da página)
-AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
+AccountantDesc=Edite, nesta página, todas as informações conhecidas relacionadas com o seu contabilista
+AccountantFileNumber=File number
 DisplayDesc=Pode encontrar aqui todos os parâmetros relacionados com a aparência do Dolibarr
 AvailableModules=Aplicações/módulos disponíveis
 ToActivateModule=Para ativar módulos, aceder à área de configuração (Configuração->Módulos).
@@ -1188,11 +1195,11 @@ UserMailRequired=O email é obrigatório para poder criar um novo utilizador
 HRMSetup=Configuração do módulo "GRH"
 ##### Company setup #####
 CompanySetup=Configuração do módulo "Empresas"
-CompanyCodeChecker=Módulo para criação e verificação dos códigos de terceiros (clientes ou fornecedores)
-AccountCodeManager=Módulo para criação de código de contabilidade (cliente ou fornecedor)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=O funcionalidade "Notificações por email" permite que você envie mensagens automáticas para alguns eventos Dolibarr. Os destinatários das notificações podem ser definidos:
 NotificationsDescUser=* por utilizador, um utilizador de cada vez
-NotificationsDescContact=* por contactos de terceiros (clientes ou fornecedores), um contacto de cada vez
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* ou definindo o recipiente de emails global no página de configuração do módulo
 ModelModules=Documentos modelos
 DocumentModelOdt=Crie documentos a partir dos modelos OpenDocuments (ficheiros .ODT ou .ODS para o KOffice, OpenOffice, TextEdit,...)
@@ -1203,6 +1210,9 @@ MustBeUnique=Deve ser único?
 MustBeMandatory=Obrigatório para criar terceiros?
 MustBeInvoiceMandatory=Obrigatório para validar faturas?
 TechnicalServicesProvided=Serviços técnicos fornecidos
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Uma hiperligação de exportação para o formato <b>%s</b> está disponivel na seguinte hiperligação: %s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=Texto livre em orçamentos para clientes
 WatermarkOnDraftProposal=Marca d'água em rascunhos de orçamentos para clientes (nenhuma não preenchido)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Pedir conta bancária destinatária do orçamento
 ##### SupplierProposal #####
-SupplierProposalSetup=Configuração do módulo "Solicitações de preço a fornecedores"
-SupplierProposalNumberingModules=Modelos de numeração para solicitações de preços a fornecedores
-SupplierProposalPDFModules=Modelos de documentos para solicitações de preços a fornecedores
-FreeLegalTextOnSupplierProposal=Texto livre em solicitações de preços a fornecedores
-WatermarkOnDraftSupplierProposal=Marca d'água nos documentos rascunho de solicitações de preços a fornecedores (nenhuma se vazio)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Pedir conta bancária destinatária da solicitação de preço
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Pedir qual o armazém origem para a encomenda
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Pedir conta bancária destinatária para encomendas a fornecedores
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=Configuração do módulo "Encomendas"
 OrdersNumberingModules=Modelos de numeração de encomendas
@@ -1324,7 +1334,7 @@ LDAPGroupObjectClassList=Lista de objectClass
 LDAPGroupObjectClassListExample=Lista de objectClass que definem os atributos de registo (ex: top,groupOfUniqueNames)
 LDAPContactObjectClassList=Lista de objectClass
 LDAPContactObjectClassListExample=Lista de objectClass que definem os atributos de registo (ex: top,inetOrgPerson or top,user for active directory)
-LDAPTestConnect=Testar a ligação LDAP
+LDAPTestConnect=Testar conexão LDAP
 LDAPTestSynchroContact=Teste a sincronização de contactos
 LDAPTestSynchroUser=Testar a sincronização de utilizadores
 LDAPTestSynchroGroup=Testar a sincronização de grupos
@@ -1333,11 +1343,11 @@ LDAPTestSynchroMemberType=Sincronização do tipo de membro do teste
 LDAPTestSearch= Testar pesquisa LDAP
 LDAPSynchroOK=Teste de sincronização realizado com sucesso
 LDAPSynchroKO=O teste de sincronização falhou
-LDAPSynchroKOMayBePermissions=O teste de sincronização falhou. Verifique se ligação ao servidor está correctamente configurada e que permite atualizações LDAP
-LDAPTCPConnectOK=Ligação TCP ao servidor LDAP efectuada com sucesso (Servidor=%s, Porta=%s)
-LDAPTCPConnectKO=Falha de ligação TCP ao servidor LDAP (Servidor=%s, Porta=%s)
+LDAPSynchroKOMayBePermissions=O teste de sincronização falhou. Verifique se a conexão ao servidor está corretamente configurada e que permite atualizações LDAP
+LDAPTCPConnectOK=Conexão TCP ao servidor LDAP efetuada com sucesso (Servidor=%s, Porta=%s)
+LDAPTCPConnectKO=Falha de conexão TCP ao servidor LDAP (Servidor=%s, Porta=%s)
 LDAPBindOK=Conexão/Autenticação ao servidor LDAP efetuada com êxito (Servidor=%s, Porta=%s, Admin=%s, Palavra passe=%s)
-LDAPBindKO=A ligação/autenticação ao servidor LDAP falhou (Servidor=%s, Porta=%s, Administrador=%s, Palavra-passe=%s)
+LDAPBindKO=A conexão/autenticação ao servidor LDAP falhou (Servidor=%s, Porta=%s, Administrador=%s, Palavra-passe=%s)
 LDAPSetupForVersion3=Servidor LDAP configurado para a versão 3
 LDAPSetupForVersion2=Servidor LDAP configurado para a versão 2
 LDAPDolibarrMapping=Mapeamento Dolibarr
@@ -1450,7 +1460,7 @@ ErrorUnknownSyslogConstant=A constante %s não é uma constante Syslog conhecida
 OnlyWindowsLOG_USER=O Windows apenas suporta LOG_USER
 CompressSyslogs=Compressão e backup de ficheiros syslog
 SyslogFileNumberOfSaves=Backups de registos
-ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure o trabalho agendado de limpeza para definir a frequência do registo da cópia de segurança
 ##### Donations #####
 DonationsSetup=Configuração do módulo "Donativos"
 DonationsReceiptModel=Modelo de recibo de donativo
@@ -1510,12 +1520,12 @@ FCKeditorForMailing= Criação/Edição WYSIWIG para emails em massa (Ferramenta
 FCKeditorForUserSignature=Criação/Edição WYSIWIG da assinatura do utilizador
 FCKeditorForMail=Criação/Edição WYSIWIG para todo o correio (exceto Ferramentas->eMailling)
 ##### OSCommerce 1 #####
-OSCommerceErrorConnectOkButWrongDatabase=A ligação foi establecida, mas a base de dados não parece ser de OSCommerce (A chave %s não foi encontrada na tabela %s).
-OSCommerceTestOk=A ligação ao servidor '%s' à base de dados '%s' através do utilizador '%s' foi efetuada com sucesso.
-OSCommerceTestKo1=A ligação ao servidor '%s' foi efetuada com sucesso, no entanto não foi possível comunicar com a base de dados '%s'.
-OSCommerceTestKo2=A ligação ao servidor '%s' através do utilizador '%s'  não foi possível.
+OSCommerceErrorConnectOkButWrongDatabase=A conexão foi estabelecida, mas a base de dados não parece ser de OSCommerce (A chave %s não foi encontrada na tabela %s).
+OSCommerceTestOk=A conexão ao servidor '%s', à base de dados '%s' através do utilizador '%s' foi efetuada com sucesso.
+OSCommerceTestKo1=A conexão ao servidor '%s' foi efetuada com sucesso, no entanto não foi possível comunicar com a base de dados '%s'.
+OSCommerceTestKo2=A conexão ao servidor '%s' através do utilizador '%s'  não foi possível.
 ##### Stock #####
-StockSetup=Configuração do módulo "Armazém"
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=Se você utiliza um módulo de Ponto de Venda (o módulo POS/PDV fornecido por defeito ou outro módulo externo), esta configuração pode ser ignorada pelo seu módulo de Ponto de Venda. A maioria dos módulos de pontos de venda são desenhados para criar imediatamente uma fatura e diminuir o stock por defeito, qualquer que seja a opção aqui. Se você precisar ou não ter uma diminuição de stock ao registar uma venda no seu ponto de venda, verifique também a configuração do seu módulo POS/PDV.
 ##### Menu #####
 MenuDeleted=Menu eliminado
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Módulo de numeração para recibos de pagamento e
 MultiCompanySetup=Configuração do módulo "Multi-empresa"
 ##### Suppliers #####
 SuppliersSetup=Configuração do módulo "Fornecedor"
-SuppliersCommandModel=Modelo completo de encomenda a fornecedor (logo...)
-SuppliersInvoiceModel=Modelo completo de fatura do fornecedor (logo. ..)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Modelos de numeração de faturas de fornecedores
 IfSetToYesDontForgetPermission=Se definido a "sim", não se esqueça de atribuir permissões a utilizadores ou grupos de utilizadores que possam efetuar a segunda aprovação
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=Em criação automática de referências não utilize
 SalariesSetup=Configuração do módulo "Salários"
 SortOrder=Ordenação
 Format=Formato
-TypePaymentDesc=0:Tipo de pagamento de cliente, 1:Tipo de pagamento de fornecedor, 2:Tipo de pagamento de clientes e fornecedores
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Caminho para o dirétorio "include" (definido na variável %s)
 ExpenseReportsSetup=Configuração do módulo "Relatórios de Despesas"
 TemplatePDFExpenseReports=Modelos de documentos para a produção de relatórios de despesa 
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Instalação de um módulo externo da
 ConfFileMustContainCustom=Instalar ou construir um módulo externo do aplicativo precisa salvar os arquivos do módulo no diretório. <strong>%s</strong>Para que este diretório seja processado pelo Dolibarr, você deve configurar seu <strong>conf/conf.php</strong> para adicionar as 2 linhas diretivas:<br><strong> $dolibarr_main_url_root_alt ='/ custom';</strong><br><strong> $dolibarr_main_document_root_alt='%s/ custom';</strong>
 HighlightLinesOnMouseHover=Realçar as linhas da tabela quando o rato passar sobre elas
 HighlightLinesColor=Realçar a cor da linha quando o rato passa por cima (manter vazio para não realçar)
-TextTitleColor=Cor do título da página
+TextTitleColor=Text color of Page title
 LinkColor=Cor dos links
 PressF5AfterChangingThis=Pressione CTRL+F5 no teclado ou limpe a cache do navegador depois de mudar este valor de forma a gravar as alterações
 NotSupportedByAllThemes=Funciona com os temas predefinidos, pode não ser suportado por temas externos
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=Cor de fundo para o menu no topo
 TopMenuDisableImages=Ocultar imagens no menu do topo
 LeftMenuBackgroundColor=Cor de fundo para o menu à esquerda
 BackgroundTableTitleColor=A cor do fundo para a linha de título das tabelas
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=A cor do fundo para as linhas ímpares da tabela
 BackgroundTableLineEvenColor=Cor de fundo para linhas pares da tabela
 MinimumNoticePeriod=Período mínimo de notificação (o seu pedido de licença deve ser feito antes deste período)
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=Exemplo: +2 (preencha somente se experienciar problemas)
 ExpectedChecksum=Checksum esperado
 CurrentChecksum=Checksum atual
 ForcedConstants=Valores de constantes necessários
-MailToSendProposal=Orçamento para cliente a enviar
-MailToSendOrder=Para enviar a encomenda do cliente por e-mail
-MailToSendInvoice=Para enviar a fatura do cliente por e-mail
-MailToSendShipment=Para enviar a expedição por e-mail
-MailToSendIntervention=Para enviar a intervenção por e-mail
-MailToSendSupplierRequestForQuotation=Para enviar a solicitação de cotação ao fornecedor por e-mail
-MailToSendSupplierOrder=Para enviar a encomenda ao fornecedor por e-mail
-MailToSendSupplierInvoice=Para enviar a fatura emitida pelo fornecedor por e-mail
-MailToSendContract=Para enviar um contrato
-MailToThirdparty=Para enviar e-mail a partir da página dos terceiros
-MailToMember=Para enviar e-mails da página do membro
-MailToUser=Para enviar emails da página de usuário
-MailToProject= To send email from project page
+MailToSendProposal=Orçamentos
+MailToSendOrder=Encomendas de clientes
+MailToSendInvoice=Faturas a clientes
+MailToSendShipment=Envios
+MailToSendIntervention=Intervenções
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Ordens de compra
+MailToSendSupplierInvoice=Faturas do fornecedor
+MailToSendContract=Contratos
+MailToThirdparty=Terceiros
+MailToMember=Membros
+MailToUser=Utilizadores
+MailToProject=Projects page
 ByDefaultInList=Mostrar por padrão na vista de lista
 YouUseLastStableVersion=Você possui a última versão estável
 TitleExampleForMajorRelease=Exemplo de mensagem que você pode usar para anunciar esta versão principal (sinta-se livre para usá-la nas suas páginas da Internet)
@@ -1777,10 +1788,13 @@ MAIN_PDF_MARGIN_LEFT=Margem esquerda do PDF
 MAIN_PDF_MARGIN_RIGHT=Margem direita do PDF
 MAIN_PDF_MARGIN_TOP=Margem superior do PDF
 MAIN_PDF_MARGIN_BOTTOM=Margem inferior do PDF
-SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
+SetToYesIfGroupIsComputationOfOtherGroups=Defina isto como "sim" se este grupo for uma computação de outros grupos
+EnterCalculationRuleIfPreviousFieldIsYes=Insira a regra de cálculo no caso do campo anterior ter sido definido como "Sim" (por exemplo, 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Várias variantes de idiomas encontradas
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Configuração do módulo Recursos
 UseSearchToSelectResource=Utilizar um formulário de pesquisa para escolher um recurso (em vez de uma lista)
diff --git a/htdocs/langs/pt_PT/agenda.lang b/htdocs/langs/pt_PT/agenda.lang
index dfab731a37c..1f8ec7673cd 100644
--- a/htdocs/langs/pt_PT/agenda.lang
+++ b/htdocs/langs/pt_PT/agenda.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - agenda
-IdAgenda=ID do evento
+IdAgenda=Id. de evento
 Actions=Eventos
 Agenda=Agenda
 TMenuAgenda=Agenda
@@ -53,9 +53,9 @@ MemberValidatedInDolibarr=Membro %s, validado
 MemberModifiedInDolibarr=Membro %s modificado
 MemberResiliatedInDolibarr=Membro %s, terminado
 MemberDeletedInDolibarr=Membro %s, eliminado
-MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
-MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
-MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscrição %s do membro %s adicionada
+MemberSubscriptionModifiedInDolibarr=Subscrição %s do membro %s modificada
+MemberSubscriptionDeletedInDolibarr=Subscrição%s do membro %s eliminada
 ShipmentValidatedInDolibarr=Expedição %s, validada
 ShipmentClassifyClosedInDolibarr=Expedição %s, classificada como faturada
 ShipmentUnClassifyCloseddInDolibarr=Expedição %s, classificada como re-aberta
@@ -99,8 +99,8 @@ AgendaUrlOptions1=Também pode adicionar os seguintes parâmetros de filtro de s
 AgendaUrlOptions3=<b>logina=%s</b> para restringir a produção para as acções criadas pelo utilizador <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina =!%s</b> para restringir a saída às ações que não pertencem ao utilizador <b>%s</b>.
 AgendaUrlOptions4=<b>logint =%s</b> para restringir a saída às ações atribuídas ao utilizador <b>%s</b> (proprietário e outros).
-AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
-AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic event.
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> para que apenas obtenha eventos vinculados ao projeto <b>__PROJECT_ID__ </b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> para excluir o evento automático.
 AgendaShowBirthdayEvents=Mostrar aniversários dos contactos
 AgendaHideBirthdayEvents=Ocultar aniversários dos contactos
 Busy=Ocupado
@@ -112,7 +112,7 @@ ExportCal=Exportar calendário
 ExtSites=Importar calendários externos
 ExtSitesEnableThisTool=Mostrar calendários externos (definidos na configuração global) na agenda. Não afeta os calendários externos definidos pelos utilizadores.
 ExtSitesNbOfAgenda=Número de calendários
-AgendaExtNb=Calendar no. %s
+AgendaExtNb=Calendário n.º %s
 ExtSiteUrlAgenda=URL para aceder ao ficheiro .ical
 ExtSiteNoLabel=Sem Descrição
 VisibleTimeRange=Intervalo de tempo visível
diff --git a/htdocs/langs/pt_PT/banks.lang b/htdocs/langs/pt_PT/banks.lang
index 7ec0b128d7e..b511d7cc0e9 100644
--- a/htdocs/langs/pt_PT/banks.lang
+++ b/htdocs/langs/pt_PT/banks.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Banco
-MenuBankCash=Bancos/Caixas
-MenuVariousPayment=Miscellaneous payments
-MenuNewVariousPayment=New Miscellaneous payment
+MenuBankCash=Bancos / Caixas
+MenuVariousPayment=Pagamentos diversos
+MenuNewVariousPayment=Novo pagamento diverso
 BankName=Nome do banco
 FinancialAccount=Conta
 BankAccount=Conta bancária
@@ -31,10 +31,10 @@ Reconciliation=Conciliação
 RIB=Conta bancária
 IBAN=Número IBAN
 BIC=Número BIC/SWIFT
-SwiftValid=BIC/SWIFT valid
-SwiftVNotalid=BIC/SWIFT not valid
-IbanValid=BAN valid
-IbanNotValid=BAN not valid
+SwiftValid=BIC / SWIFT válido
+SwiftVNotalid=BIC/SWIFT inválido
+IbanValid=BAN válido
+IbanNotValid=BAN inválido
 StandingOrders=Encomendas de débito direto
 StandingOrder=Encomenda de Débito Direto
 AccountStatement=Extracto
@@ -156,8 +156,8 @@ BankAccountModelModule=Document templates for bank accounts
 DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
 NewVariousPayment=New miscellaneous payments
-VariousPayment=Miscellaneous payments
-VariousPayments=Miscellaneous payments
+VariousPayment=Pagamentos diversos
+VariousPayments=Pagamentos diversos
 ShowVariousPayment=Show miscellaneous payments
 AddVariousPayment=Add miscellaneous payments
 YourSEPAMandate=Your SEPA mandate
diff --git a/htdocs/langs/pt_PT/bills.lang b/htdocs/langs/pt_PT/bills.lang
index 718a93ca916..9502b4484b5 100644
--- a/htdocs/langs/pt_PT/bills.lang
+++ b/htdocs/langs/pt_PT/bills.lang
@@ -1,15 +1,15 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Fatura
 Bills=Faturas
-BillsCustomers=Faturas de Clientes
+BillsCustomers=Faturas a clientes
 BillsCustomer=Fatura de Cliente
-BillsSuppliers=Faturas de Fornecedores
+BillsSuppliers=Faturas de fornecedores
 BillsCustomersUnpaid=Faturas a receber de clientes
-BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
+BillsCustomersUnpaidForCompany=Faturas a clientes não pagas para %s
 BillsSuppliersUnpaid=Faturas a pagar de fornecedores
-BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s
+BillsSuppliersUnpaidForCompany=Faturas de fornecedores não pagas para %s
 BillsLate=Pagamentos em atraso
-BillsStatistics=Estatísticas das faturas de clientes
+BillsStatistics=Estatísticas das faturas a clientes
 BillsStatisticsSuppliers=Estatísticas das faturas de fornecedores
 DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping
 DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter.
@@ -52,7 +52,7 @@ Invoices=Faturas
 InvoiceLine=Linha da fatura
 InvoiceCustomer=Fatura de Cliente
 CustomerInvoice=Fatura de Cliente
-CustomersInvoices=Faturas de Clientes
+CustomersInvoices=Faturas a clientes
 SupplierInvoice=Fatura de Fornecedor
 SuppliersInvoices=Faturas de Fornecedores
 SupplierBill=Fatura de Fornecedor
@@ -109,7 +109,7 @@ CancelBill=Cancelar uma fatura
 SendRemindByMail=Enviar lembrete por E-mail
 DoPayment=Inserir pagamento
 DoPaymentBack=Inserir reembolso
-ConvertToReduc=Converter em desconto futuro
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Adicionar pagamento recebido de cliente
@@ -120,7 +120,7 @@ BillStatus=Estado da fatura
 StatusOfGeneratedInvoices=Estado das faturas geradas
 BillStatusDraft=Rascunho (precisa de ser validado)
 BillStatusPaid=Paga
-BillStatusPaidBackOrConverted=Reembolso por nota de crédito ou convertido em desconto
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Abandonada
 BillStatusValidated=Validado (precisa de ser paga)
@@ -163,13 +163,13 @@ LastBills=Últimas %s faturas
 LatestTemplateInvoices=Latest %s template invoices
 LatestCustomerTemplateInvoices=Latest %s customer template invoices
 LatestSupplierTemplateInvoices=Latest %s supplier template invoices
-LastCustomersBills=Últimas %s faturas de cliente
+LastCustomersBills=Últimas %s faturas a clientes
 LastSuppliersBills=Últimas %s faturas de fornecedor
 AllBills=Todas as faturas
 AllCustomerTemplateInvoices=All template invoices
 OtherBills=Outras faturas
 DraftBills=Faturas rascunho
-CustomersDraftInvoices=Faturas provisórias de cliente
+CustomersDraftInvoices=Faturas provisórias a cliente
 SuppliersDraftInvoices=Faturas provisórias de fornecedor
 Unpaid=Pendentes
 ConfirmDeleteBill=Tem a certeza que deseja eliminar esta fatura?
@@ -204,7 +204,7 @@ NumberOfBills=Nº de faturas
 NumberOfBillsByMonth=Nb de faturas por mês
 AmountOfBills=Montante das faturas
 AmountOfBillsByMonthHT=Quantidade de faturas por mês (sem IVA)
-ShowSocialContribution=Show social/fiscal tax
+ShowSocialContribution=Mostrar imposto social/fiscal
 ShowBill=Ver fatura
 ShowInvoice=Ver fatura
 ShowInvoiceReplace=Ver fatura retificativa
@@ -260,9 +260,9 @@ Repeatables=Modelos
 ChangeIntoRepeatableInvoice=Converter em fatura modelo
 CreateRepeatableInvoice=Criar fatura modelo
 CreateFromRepeatableInvoice=Criar a partir da fatura modelo
-CustomersInvoicesAndInvoiceLines=Faturas de clientes e linhas de faturas
-CustomersInvoicesAndPayments=Faturas de clientes e pagamentos
-ExportDataset_invoice_1=Faturas de clientes e linhas de faturas
+CustomersInvoicesAndInvoiceLines=Faturas a clientes e linhas de faturas
+CustomersInvoicesAndPayments=Faturas a clientes e pagamentos
+ExportDataset_invoice_1=Faturas a clientes e linhas de faturas
 ExportDataset_invoice_2=Faturas a clientes e pagamentos
 ProformaBill=Fatura pró-forma:
 Reduction=Redução
@@ -296,10 +296,10 @@ DiscountType=Discount type
 NoteReason=Nota/Motivo
 ReasonDiscount=Motivo
 DiscountOfferedBy=Acordado por
-DiscountStillRemaining=Descontos disponíveis
-DiscountAlreadyCounted=Descontos já utilizados
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+SupplierDiscounts=Vendors discounts
 BillAddress=Morada de faturação
 HelpEscompte=Este desconto é um desconto concedido ao cliente porque o pagamento foi feito antes do prazo.
 HelpAbandonBadCustomer=Este Montante é deixado (cliente julgado como devedor) e se considera como uma perda excepcional.
@@ -339,9 +339,15 @@ PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-FrequencyPer_d=Every %s days
-FrequencyPer_m=Every %s months
-FrequencyPer_y=Every %s years
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
+FrequencyPer_d=Cada %s dias
+FrequencyPer_m=Cada %s meses
+FrequencyPer_y=Cada %s anos
 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
@@ -390,10 +396,10 @@ VarAmount=Quantidade variável (%% total.)
 # PaymentType
 PaymentTypeVIR=Transferência bancária
 PaymentTypeShortVIR=Transferência bancária
-PaymentTypePRE=Direct debit payment order
-PaymentTypeShortPRE=Debit payment order
-PaymentTypeLIQ=Espécies
-PaymentTypeShortLIQ=Espécies
+PaymentTypePRE=Débito direto
+PaymentTypeShortPRE=Débito direto
+PaymentTypeLIQ=Numerário
+PaymentTypeShortLIQ=Numerário
 PaymentTypeCB=Cartão de crédito
 PaymentTypeShortCB=Cartão de crédito
 PaymentTypeCHQ=Cheque
@@ -421,7 +427,7 @@ RegulatedOn=Regulado em
 ChequeNumber=Cheque nº
 ChequeOrTransferNumber=Cheque/Transferência nº
 ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer transmitter
+ChequeMaker=Transmissor do Cheque/Transferência
 ChequeBank=Banco do cheque
 CheckBank=Verificar
 NetToBePaid=Quantia líquida a pagar
@@ -454,7 +460,7 @@ ChequeDeposits=Depósito de cheques
 Cheques=Cheques
 DepositId=Id deposit
 NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=Este(a) %s foi convertido em %s
+CreditNoteConvertedIntoDiscount=Esta nota de crédito %s, foi convertida no desconto %s
 UsBillingContactAsIncoiveRecipientIfExist=Utilizar a morada do contacto de cliente de faturação da fatura em vez da morada do Terceiro como destinatário das faturas
 ShowUnpaidAll=Mostrar todas as faturas não pagas
 ShowUnpaidLateOnly=Mostrar apenas faturas atrasadas não pagas
@@ -505,9 +511,14 @@ SituationAmount=Situation invoice amount(net)
 SituationDeduction=Situation subtraction
 ModifyAllLines=Modificar todas as linhas
 CreateNextSituationInvoice=Criar situação seguinte
-NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
+NotLastInCycle=Esta fatura não é a mais recente no ciclo e não deve ser modificada.
 DisabledBecauseNotLastInCycle=A situação seguinte já existe.
 DisabledBecauseFinal=Esta situação é final.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=Dom
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
 NoSituations=Sem situações abertas
 InvoiceSituationLast=Fatura geral e final
@@ -532,3 +543,4 @@ AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/pt_PT/bookmarks.lang b/htdocs/langs/pt_PT/bookmarks.lang
index b82edfa034b..ccf3ffe44c2 100644
--- a/htdocs/langs/pt_PT/bookmarks.lang
+++ b/htdocs/langs/pt_PT/bookmarks.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - marque pages
-AddThisPageToBookmarks=Adicionar a página atual aos marcadores
+AddThisPageToBookmarks=Adicionar página atual aos marcadores
 Bookmark=Marcador
 Bookmarks=Marcadores
 ListOfBookmarks=Lista de Marcadores
diff --git a/htdocs/langs/pt_PT/boxes.lang b/htdocs/langs/pt_PT/boxes.lang
index b5ebc4bacca..e459460261d 100644
--- a/htdocs/langs/pt_PT/boxes.lang
+++ b/htdocs/langs/pt_PT/boxes.lang
@@ -1,86 +1,86 @@
 # Dolibarr language file - Source file is en_US - boxes
-BoxLoginInformation=Login information
+BoxLoginInformation=Informação de sessão
 BoxLastRssInfos=Informação RSS
-BoxLastProducts=Os %s últimos produtos/serviços
+BoxLastProducts=Os %s produtos/serviços mais recentes
 BoxProductsAlertStock=Alertas de stock para produtos
 BoxLastProductsInContract=Os %s últimos produtos/serviços contratados
 BoxLastSupplierBills=Últimas faturas do fornecedor
 BoxLastCustomerBills=Últimas faturas do cliente
-BoxOldestUnpaidCustomerBills=Oldest unpaid customer invoices
-BoxOldestUnpaidSupplierBills=Oldest unpaid supplier invoices
+BoxOldestUnpaidCustomerBills=Faturas a clientes não pagas mais antigas
+BoxOldestUnpaidSupplierBills=Faturas de fornecedores não pagas mais antigas
 BoxLastProposals=Últimos orçamentos para clientes
-BoxLastProspects=Latest modified prospects
-BoxLastCustomers=Latest modified customers
-BoxLastSuppliers=Latest modified suppliers
-BoxLastCustomerOrders=Latest customer orders
+BoxLastProspects=Últimas prospeções modificadas
+BoxLastCustomers=Últimos clientes modificados
+BoxLastSuppliers=Últimos fornecedores modificados
+BoxLastCustomerOrders=Encomendas de clientes mais recentes
 BoxLastActions=Últimas ações
 BoxLastContracts=Últimos contratos
-BoxLastContacts=Latest contacts/addresses
+BoxLastContacts=Últimos contactos/endereços
 BoxLastMembers=Últimos membros
 BoxFicheInter=Últimas intervenções
 BoxCurrentAccounts=Saldo de abertura das contas
-BoxTitleLastRssInfos=Latest %s news from %s
+BoxTitleLastRssInfos=Últimas %s notícias de %s
 BoxTitleLastProducts=Os últimos %s produtos/serviços modificados
 BoxTitleProductsAlertStock=Produtos no alerta de stock
-BoxTitleLastSuppliers=Latest %s recorded suppliers
-BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
-BoxTitleLastModifiedCustomers=Latest %s modified customers
-BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Últimas %s faturas de clientes
+BoxTitleLastSuppliers=Últimos %s fornecedores registados
+BoxTitleLastModifiedSuppliers=Últimos %s fornecedores modificados 
+BoxTitleLastModifiedCustomers=Últimos %s clientes modificados 
+BoxTitleLastCustomersOrProspects=Últimos %s clientes ou prospeções
+BoxTitleLastCustomerBills=Últimas %s faturas a clientes
 BoxTitleLastSupplierBills=Últimas %s faturas de fornecedores
-BoxTitleLastModifiedProspects=Latest %s modified prospects
-BoxTitleLastModifiedMembers=Latest %s members
-BoxTitleLastFicheInter=Latest %s modified interventions
-BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
-BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
-BoxTitleCurrentAccounts=Open accounts balances
-BoxTitleLastModifiedContacts=Latest %s modified contacts/addresses
-BoxMyLastBookmarks=My latest %s bookmarks
+BoxTitleLastModifiedProspects=Últimas %s prospeções modificadas
+BoxTitleLastModifiedMembers=Últimos %s membros
+BoxTitleLastFicheInter=Últimas %s intervenções modificadas 
+BoxTitleOldestUnpaidCustomerBills=As %s mais antigas faturas a clientes não pagas 
+BoxTitleOldestUnpaidSupplierBills=As %s mais antigas faturas de fornecedores não pagas 
+BoxTitleCurrentAccounts=Saldos de contas abertos
+BoxTitleLastModifiedContacts=Últimos %s contatos/endereços modificados
+BoxMyLastBookmarks=Os meus %s últimos marcadores
 BoxOldestExpiredServices=Mais antigos ativos de serviços vencidos
-BoxLastExpiredServices=Latest %s oldest contacts with active expired services
-BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s modified contracts
-BoxTitleLastModifiedDonations=As %s últimos donativos modificados
-BoxTitleLastModifiedExpenses=Latest %s modified expense reports
+BoxLastExpiredServices=Últimos %s contactos mais antigos com serviços ativos expirados
+BoxTitleLastActionsToDo=Últimas %s ações a fazer
+BoxTitleLastContracts=Últimos %s contratos modificados
+BoxTitleLastModifiedDonations=Últimos %s donativos modificados
+BoxTitleLastModifiedExpenses=Últimos %s relatórios de despesas modificados
 BoxGlobalActivity=Atividade global (faturas, orçamentos, encomendas)
-BoxGoodCustomers=Good customers
-BoxTitleGoodCustomers=%s Good customers
-FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successfull refresh date: %s
-LastRefreshDate=Latest refresh date
+BoxGoodCustomers=Bons clientes
+BoxTitleGoodCustomers=%s bons clientes
+FailedToRefreshDataInfoNotUpToDate=Falha ao atualizar fluxo RSS. Última data de atualização bem-sucedida: %s
+LastRefreshDate=Última data de atualização
 NoRecordedBookmarks=Não existem marcadores definidos.
 ClickToAdd=Clique aqui para adicionar.
 NoRecordedCustomers=Nenhum cliente registado
 NoRecordedContacts=Nenhum contacto registado
 NoActionsToDo=Sem ações a realizar
-NoRecordedOrders=No recorded customer orders
+NoRecordedOrders=Nenhuma encomenda de clientes registada
 NoRecordedProposals=Sem orçamentos registados
-NoRecordedInvoices=No recorded customer invoices
-NoUnpaidCustomerBills=No unpaid customer invoices
-NoUnpaidSupplierBills=No unpaid supplier invoices
-NoModifiedSupplierBills=No recorded supplier invoices
+NoRecordedInvoices=Nenhuma fatura de cliente registada
+NoUnpaidCustomerBills=Nenhuma fatura de clientes pendente de pagamento
+NoUnpaidSupplierBills=Nenhuma fatura de fornecedores pendente de pagamento
+NoModifiedSupplierBills=Nenhuma fatura de fornecedores registada
 NoRecordedProducts=Nenhum produto/serviço registado
 NoRecordedProspects=Nenhuma prospecção registada
 NoContractedProducts=Não contractados produtos / serviços
 NoRecordedContracts=Sem contratos registrados
-NoRecordedInterventions=No recorded interventions
-BoxLatestSupplierOrders=Latest supplier orders
-NoSupplierOrder=No recorded supplier order
-BoxCustomersInvoicesPerMonth=Faturas de clientes por mês
-BoxSuppliersInvoicesPerMonth=Facturas de fornecedores por mês
+NoRecordedInterventions=Nenhuma intervenção registada
+BoxLatestSupplierOrders=Últimas notas de encomenda de fornecedores
+NoSupplierOrder=Nenhuma nota de encomenda de fornecedor registada
+BoxCustomersInvoicesPerMonth=Faturas a clientes por mês
+BoxSuppliersInvoicesPerMonth=Faturas de fornecedores por mês
 BoxCustomersOrdersPerMonth=Encomendas de clientes por mês
 BoxSuppliersOrdersPerMonth=Encomendas a fornecedores por mês
 BoxProposalsPerMonth=Orçamentos por mês
 NoTooLowStockProducts=Nenhum produto abaixo do limite mínimo de stock
 BoxProductDistribution=Distribuição de Produtos/Serviços
 BoxProductDistributionFor=Distribuição de %s para %s
-BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
-BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
-BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
-BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
-BoxTitleLastModifiedPropals=Os últimos %s orçamentos modificados
-ForCustomersInvoices=Facturas de Clientes
+BoxTitleLastModifiedSupplierBills=Últimas %s faturas de fornecedores modificadas 
+BoxTitleLatestModifiedSupplierOrders=Últimas%s notas de encomenda de fornecedores modificadas 
+BoxTitleLastModifiedCustomerBills=Últimas %s faturas a clientes modificadas 
+BoxTitleLastModifiedCustomerOrders=Últimas %sencomendas de clientes modificadas 
+BoxTitleLastModifiedPropals=Últimos %s orçamentos modificados
+ForCustomersInvoices=Faturas a clientes
 ForCustomersOrders=Encomendas de clientes
 ForProposals=Orçamentos
-LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard
-BoxAdded=Widget was added in your dashboard
+LastXMonthRolling=Balanço dos últimos %s meses
+ChooseBoxToAdd=Adicionar widget ao painel de controlo
+BoxAdded=O Widget foi adicionado ao seu painel
diff --git a/htdocs/langs/pt_PT/categories.lang b/htdocs/langs/pt_PT/categories.lang
index 5835c06ffcb..700bac37739 100644
--- a/htdocs/langs/pt_PT/categories.lang
+++ b/htdocs/langs/pt_PT/categories.lang
@@ -85,3 +85,4 @@ CategorieRecursivHelp=Se ativado, o produto também irá estar associado à cate
 AddProductServiceIntoCategory=Adicioanr o produto/serviço seguinte
 ShowCategory=Mostrar etiqueta/categoria
 ByDefaultInList=Por predefinição na lista
+ChooseCategory=Escolha a categoria
diff --git a/htdocs/langs/pt_PT/companies.lang b/htdocs/langs/pt_PT/companies.lang
index 8651f8a3cc4..015a6df222b 100644
--- a/htdocs/langs/pt_PT/companies.lang
+++ b/htdocs/langs/pt_PT/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Deseja eliminar este contacto e toda a sua informação?
 MenuNewThirdParty=Novo Terceiro
 MenuNewCustomer=Novo Cliente
 MenuNewProspect=Novo Potencial Cliente
-MenuNewSupplier=Novo Fornecedor
+MenuNewSupplier=Novo fornecedor
 MenuNewPrivateIndividual=Novo Particular
-NewCompany=Nova Empresa (Cliente Potencial, Cliente, Fornecedor)
-NewThirdParty=Novo Terceiro (Cliente Potencial, Cliente, Fornecedor)
-CreateDolibarrThirdPartySupplier=Criar entidade (fornecedor)
+NewCompany=Nova empresa (cliente potencial, cliente, fornecedor)
+NewThirdParty=Novo terceiro (prospeto, cliente, fornecedor)
+CreateDolibarrThirdPartySupplier=Criar um terceiro (fornecedor)
 CreateThirdPartyOnly=Criar terceiro
 CreateThirdPartyAndContact=Criar um terceiro e um dos seus contactos
 ProspectionArea=Área de prospeção
@@ -43,8 +43,8 @@ Individual=Particular
 ToCreateContactWithSameName=Isto irá criar automaticamente um contacto/morada com a mesma informação do terceiro. Na maioria dos casos, mesmo que o terceiro seja uma pessoa física, criar um terceiro apenas é suficiente.
 ParentCompany=Empresa-mãe
 Subsidiaries=Subsidiárias
-ReportByMonth=Report by month
-ReportByCustomers=Report by customer
+ReportByMonth=Relatório por mês
+ReportByCustomers=Relatório por cliente
 ReportByQuarter=Relatório por trimestre
 CivilityCode=Código cortesía
 RegisteredOffice=Domicilio social
@@ -76,12 +76,12 @@ Town=Localidade
 Web=Web
 Poste= Posição
 DefaultLang=Língua por omissão
-VATIsUsed=Sales tax is used
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
-VATIsNotUsed=Sales tax is not used
+VATIsUsed=Sujeito a IVA
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=Não sujeito a IVA
 CopyAddressFromSoc=Preencha a morada com a morada do terceiro
-ThirdpartyNotCustomerNotSupplierSoNoRef=O terceiro não é cliente nem fornecedor, não contém qualquer objeto de referência
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Conta bancária de pagamentos
 OverAllProposals=Orçamentos
 OverAllOrders=Encomendas
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=Tipo RE
 TypeLocaltax2ES=Tipo IRPF
 WrongCustomerCode=Código cliente incorrecto
-WrongSupplierCode=Código fornecedor incorrecto
+WrongSupplierCode=Código do fornecedor inválido
 CustomerCodeModel=Modelo de código cliente
-SupplierCodeModel=Modelo de código fornecedor
+SupplierCodeModel=Modelo de código de fornecedor
 Gencod=Código de barras
 ##### Professional ID #####
 ProfId1Short=ID Prof. 1
@@ -242,7 +242,7 @@ ProfId3TN=ID Prof. 3 (Código na Alfandega)
 ProfId4TN=ID Prof. 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id (FEIN)
+ProfId1US=ID Profissional (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -258,34 +258,34 @@ ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=Sales tax ID
-VATIntraShort=Tax ID
+VATIntra=Número de identificação para efeitos de IVA (VIES)
+VATIntraShort=Número de identificação para efeitos de IVA
 VATIntraSyntaxIsValid=Sintaxe Válida
-VATReturn=VAT return
+VATReturn=Retorno do IVA
 ProspectCustomer=Cliente Potencial/Cliente
 Prospect=Cliente Potencial
 CustomerCard=Ficha do cliente
 Customer=Cliente
 CustomerRelativeDiscount=Desconto Cliente Relativo
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Desconto relativo do fornecedor
 CustomerRelativeDiscountShort=Desconto Relativo
 CustomerAbsoluteDiscountShort=Desconto Fixo
 CompanyHasRelativeDiscount=Este cliente tem um desconto por defeito de <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Este cliente não tem descontos relativos por defeito
-HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
-HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
+HasRelativeDiscountFromSupplier=Você tem um desconto predefinido de <b> %s%%</b> deste fornecedor
+HasNoRelativeDiscountFromSupplier=Você não tem desconto relativo predefinido deste fornecedor
 CompanyHasAbsoluteDiscount=Este cliente ainda tem créditos de desconto ou depósitos para <b>%s </b>%s
 CompanyHasDownPaymentOrCommercialDiscount=Este cliente tem descontos disponíveis (comercial, pronto pagamento) para <b>%s</b>%s
 CompanyHasCreditNote=Este cliente ainda tem notas de crédito para <b>%s</b> %s
-HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
-HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
-HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
-HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
+HasNoAbsoluteDiscountFromSupplier=Você não tem desconto ou nota de crédito disponível neste fornecedor
+HasAbsoluteDiscountFromSupplier=Você tem descontos disponíveis (notas de créditos ou adiantamentos) para <b>%s</b> %s deste fornecedor
+HasDownPaymentOrCommercialDiscountFromSupplier=Você tem descontos disponíveis (comerciais, adiantamentos) para <b>%s</b> %s deste fornecedor
+HasCreditNoteFromSupplier=Você tem notas de crédito para <b>%s</b> %s deste fornecedor
 CompanyHasNoAbsoluteDiscount=Este cliente não tem mas descontos fixos disponiveis
-CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
-CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+CustomerAbsoluteDiscountAllUsers=Descontos absolutos de clientes (concedidos por todos os utilizadores)
+CustomerAbsoluteDiscountMy=Descontos absolutos de clientes (concedidos por si)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=Nenhuma
 Supplier=Fornecedor
 AddContact=Criar contacto
@@ -304,13 +304,13 @@ DeleteACompany=Eliminar uma Empresa
 PersonalInformations=Informação Pessoal
 AccountancyCode=Conta contabilistica
 CustomerCode=Código Cliente
-SupplierCode=Código Fornecedor
+SupplierCode=Código do fornecedor
 CustomerCodeShort=Código Cliente
-SupplierCodeShort=Código Fornecedor
+SupplierCodeShort=Código do fornecedor
 CustomerCodeDesc=Código único cliente para cada cliente
-SupplierCodeDesc=Código único fornecedor para cada fornecedor
+SupplierCodeDesc=Código do fornecedor, exclusivo para todos os fornecedores
 RequiredIfCustomer=Requerida se o Terceiro for Cliente ou Cliente Potencial
-RequiredIfSupplier=Requerida se o Terceiro for Fornecedor
+RequiredIfSupplier=Obrigatório se os terceiros forem fornecedores
 ValidityControledByModule=Validação Controlada pelo Módulo
 ThisIsModuleRules=Esta é a regra para este módulo
 ProspectToContact=Cliente Potencial a Contactar
@@ -338,7 +338,7 @@ MyContacts=Os Meus Contactos
 Capital=Capital
 CapitalOf=Capital Social de %s
 EditCompany=Modificar Empresa
-ThisUserIsNot=Este utilizador nem é um cliente potencial, nem um cliente, nem um fornecedor
+ThisUserIsNot=Este utilizador não é um cliente potencial, cliente ou fornecedor
 VATIntraCheck=Verificar
 VATIntraCheckDesc=o link <b>%s</b> permite consultar à serviço europeu de control de números de IVA intracomunitario. Requer acesso á internet para que o serviço funcione
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -390,13 +390,13 @@ NoDolibarrAccess=Sem Acesso
 ExportDataset_company_1=Terceiros (empresas/fundações/pessoas físicas) e propriedades
 ExportDataset_company_2=Contactos de Terceiro e Atributos
 ImportDataset_company_1=Terceiros (empresas/fundações/pessoas físicas) e propriedades
-ImportDataset_company_2=Contacts/Addresses (of third parties or not) and attributes
-ImportDataset_company_3=Bank accounts of third parties
-ImportDataset_company_4=Third parties/Sales representatives (Assign sales representatives users to companies)
+ImportDataset_company_2=Contactos/Endereços (de terceiros ou não) e atributos
+ImportDataset_company_3=Contas bancárias de terceiros
+ImportDataset_company_4=Terceiros/Representantes de vendas (atribuir utilizadores representantes de vendas a terceiros)
 PriceLevel=Nível de preços
 DeliveryAddress=Direcção de Envío
 AddAddress=Adicionar Direcção
-SupplierCategory=categoria Fornecedor
+SupplierCategory=Categoria do fornecedor
 JuridicalStatus200=Independente
 DeleteFile=Eliminar ficheiro
 ConfirmDeleteFile=Está seguro de querer eliminar este ficheiro?
@@ -410,7 +410,7 @@ ListSuppliersShort=Lista de fornecedores
 ListProspectsShort=Lista das perspectivas
 ListCustomersShort=Lista de clientes
 ThirdPartiesArea=Área de Terceiros e Contactos
-LastModifiedThirdParties=Os últimos %s terceiros modificados
+LastModifiedThirdParties=Últimos %s terceiros modificados
 UniqueThirdParties=Total de originais terceiros
 InActivity=Aberto
 ActivityCeased=Fechado
@@ -419,16 +419,16 @@ ProductsIntoElements=Lista de produto /serviços em %s
 CurrentOutstandingBill=Risco alcançado
 OutstandingBill=Montante máximo para faturas pendentes
 OutstandingBillReached=Montante máximo para faturas pendente foi alcançado
-OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Devolve um número baixo o formato %syymm-nnnn para os códigos de clientes e %syymm-nnnn para os códigos dos Fornecedores, donde yy é o ano, mm o mês e nnnn um contador sequêncial sem ruptura e sem Voltar a 0.
+OrderMinAmount=Quantidade mínima para encomenda
+MonkeyNumRefModelDesc=Devolve um número com formato %syymm-nnnn para os códigos clientes e %syymm-nnnn para os códigos de fornecedores, onde yy representa o ano, mm o mês e nnnn um contador sequencial que não quebra e não regressa a 0.
 LeopardNumRefModelDesc=Código de cliente/fornecedor livre sem verificação. pode ser modificado em qualquer momento.
 ManagingDirectors=Nome Diretor(es) (DE, diretor, presidente ...)
 MergeOriginThirdparty=Terceiro duplicado (terceiro que deseja eliminar)
 MergeThirdparties=Gerir terceiros
 ConfirmMergeThirdparties=Tem a certeza que pretende fundir este terceiro com o atual? Todos os objetos ligados a este serão movidos para o terceiro atual e depois o anterior será eliminado.
-ThirdpartiesMergeSuccess=Third parties have been merged
+ThirdpartiesMergeSuccess=Os terceiros foram fundidos
 SaleRepresentativeLogin=Nome de utilizador do representante de vendas
 SaleRepresentativeFirstname=Primeiro nome do representante de vendas
 SaleRepresentativeLastname=Último nome do representante de vendas
-ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
+ErrorThirdpartiesMerge=Houve um erro ao eliminar os terceiros. Por favor, verifique o registo. As alterações foram revertidas.
 NewCustomerSupplierCodeProposed=O código do cliente ou fornecedor sugerido encontra-se duplicado
diff --git a/htdocs/langs/pt_PT/compta.lang b/htdocs/langs/pt_PT/compta.lang
index b41e35a7e95..4513c0e35d2 100644
--- a/htdocs/langs/pt_PT/compta.lang
+++ b/htdocs/langs/pt_PT/compta.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - compta
-MenuFinancial=Faturação | Pagamentos
-TaxModuleSetupToModifyRules=Go to <a href="%s">Taxes module setup</a> to modify rules for calculation
+MenuFinancial=Faturação | Pagamento
+TaxModuleSetupToModifyRules=Ir para <a href="%s">configurar módulo de impostos</a> para modificar as regras de cálculo
 TaxModuleSetupToModifyRulesLT=Ir para <a href="%s">configurar Empresa</a> para modificar as regras de cálculo
 OptionMode=Opção de Gestão Contabilidade
 OptionModeTrue=Opção Depósitos/Despesas
@@ -13,29 +13,30 @@ LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using r
 Param=Parametrização
 RemainingAmountPayment=Valor restante do pagamento:
 Account=Conta
-Accountparent=Parent account
-Accountsparent=Parent accounts
+Accountparent=Conta pai
+Accountsparent=Contas pai
 Income=Depósitos
 Outcome=Despesas
 MenuReportInOut=Resultado / Exercício
-ReportInOut=Balance of income and expenses
+ReportInOut=Saldo de receitas e despesas
 ReportTurnover=Volume de Negócios
 PaymentsNotLinkedToInvoice=Pagamentos não vinculados a qualquer fatura, portanto não vinculados a terceiros
 PaymentsNotLinkedToUser=Pagamentos não vinculados a um utilizador
 Profit=Beneficio
 AccountingResult=Accounting result
-BalanceBefore=Balance (before)
+BalanceBefore=Saldo (antes)
 Balance=Saldo
 Debit=Débito
 Credit=Crédito
 Piece=Doc. Contabilístico
 AmountHTVATRealReceived=Total Recebido
 AmountHTVATRealPaid=Total Pago
-VATToPay=Tax sales
-VATReceived=Tax received
-VATToCollect=Tax purchases
-VATSummary=Tax Balance
-VATPaid=Tax paid
+VATToPay=Imposto a pagar
+VATReceived=Imposto recebido
+VATToCollect=Imposto a receber
+VATSummary=Tax monthly
+VATBalance=Resumo do imposto
+VATPaid=Imposto pago
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
 LT1SummaryES=RE Balance
@@ -63,29 +64,29 @@ LT2SupplierIN=SGST purchases
 VATCollected=IVA Recuperado
 ToPay=A pagar
 SpecialExpensesArea=Área para todos os pagamentos especiais
-SocialContribution=Social or fiscal tax
-SocialContributions=Social or fiscal taxes
+SocialContribution=Imposto social ou fiscal
+SocialContributions=Impostos sociais ou fiscais
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
 LabelContrib=Label contribution
 TypeContrib=Type contribution
 MenuSpecialExpenses=Despesas Especiais
 MenuTaxAndDividends=Impostos e Dividas
-MenuSocialContributions=Social/fiscal taxes
-MenuNewSocialContribution=New social/fiscal tax
-NewSocialContribution=New social/fiscal tax
+MenuSocialContributions=Impostos sociais/fiscais
+MenuNewSocialContribution=Novo imposto
+NewSocialContribution=Novo imposto social/fiscal
 AddSocialContribution=Add social/fiscal tax
-ContributionsToPay=Social/fiscal taxes to pay
+ContributionsToPay=Impostos sociais/fiscais por pagar
 AccountancyTreasuryArea=Área Contabilidade/Tesouraria
 NewPayment=Novo pagamento
 Payments=Pagamentos
 PaymentCustomerInvoice=Pagamento de fatura do cliente
-PaymentSupplierInvoice=Pagamento de fatura de fornecedor
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Pagamento da taxa social/fiscal
 PaymentVat=Pagamento IVA
 ListPayment=Lista de pagamentos
 ListOfCustomerPayments=Lista de pagamentos de clientes
-ListOfSupplierPayments=Lista de pagamentos a Fornecedores
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -100,17 +101,17 @@ LT1PaymentES=RE Payment
 LT1PaymentsES=RE Payments
 LT2PaymentES=Pagamento IRPF
 LT2PaymentsES=Pagamentos IRPF
-VATPayment=Sales tax payment
-VATPayments=Sales tax payments
+VATPayment=Pagamento de imposto sobre vendas
+VATPayments=Pagamentos de impostos sobre vendas
 VATRefund=Sales tax refund
 NewVATPayment=New sales tax payment
 Refund=Refund
-SocialContributionsPayments=Social/fiscal taxes payments
+SocialContributionsPayments=Pagamentos de impostos sociais/fiscais
 ShowVatPayment=Ver Pagamentos IVA
 TotalToPay=Total a Pagar
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
 CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
 SupplierAccountancyCodeShort=Sup. account. code
 AccountNumber=Número de conta
@@ -126,14 +127,14 @@ LastCheckReceiptShort=Latest %s check receipts
 NewCheckReceipt=Novo Cheque
 NewCheckDeposit=Novo Deposito
 NewCheckDepositOn=Criar Novo deposito na conta: %s
-NoWaitingChecks=No checks awaiting deposit.
+NoWaitingChecks=Nenhum cheque aguarda depósito.
 DateChequeReceived=Data da receção do cheque
 NbOfCheques=Nº de Cheques
-PaySocialContribution=Pay a social/fiscal tax
+PaySocialContribution=Pagar um imposto social/fiscal
 ConfirmPaySocialContribution=Tem certeza de que deseja classificar este imposto social ou fiscal como pago?
-DeleteSocialContribution=Delete a social or fiscal tax payment
+DeleteSocialContribution=Eliminar um pagamento de imposto social ou fiscal
 ConfirmDeleteSocialContribution=Tem certeza de que deseja eliminar este pagamento de imposto social/fiscal?
-ExportDataset_tax_1=Social and fiscal taxes and payments
+ExportDataset_tax_1=Impostos e pagamentos sociais e fiscais
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
 CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Relatório de terceiros IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -181,10 +184,10 @@ LT2ReportByQuartersES=Report by IRPF rate
 SeeVATReportInInputOutputMode=Ver o Relatório <b>%sIVA pago%s</b> para um modo de cálculo Standard
 SeeVATReportInDueDebtMode=Ver o Relatório <b>%sIVA devido%s</b> para um modo de cálculo com a Opção sobre o devido
 RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
-RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
+RulesVATInProducts=Para os ativos materiais, o relatório inclui o IVA recebido ou emitido com base na data do pagamento.
 RulesVATDueServices=- Para os serviços, o relatório inclui faturas de IVA devido, pago ou não, com base na data da fatura.
-RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
-OptionVatInfoModuleComptabilite=Nota: Para os bens materiais, seria necessário utilizar a data de entregas para ser mais justo.
+RulesVATDueProducts=- Para os ativos materiais, o relatório inclui as faturas de IVA, com base na data da fatura.
+OptionVatInfoModuleComptabilite=Nota: para os ativos materiais, seria necessário utilizar a data de entrega para ser mais justo.
 ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
 PercentOfInvoice=%%/fatura
 NotUsedForGoods=Não utilizados em bens
@@ -207,15 +210,16 @@ Pcg_version=Modelos de planos de contas
 Pcg_type=Pcg type
 Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
-ByProductsAndServices=Por produtos e serviços
+ByProductsAndServices=By product and service
 RefExt=Ref externa
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
-LinkedOrder=Hiperligação para encomendar
+LinkedOrder=Associar a encomenda
 Mode1=Método 1
 Mode2=Método 2
 CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
 CalculationRuleDescSupplier=According to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Modo de cálculo
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
@@ -235,10 +239,17 @@ 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=Impostos sociais/fiscais
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
 FiscalPeriod=Período de contabilidade
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/pt_PT/cron.lang b/htdocs/langs/pt_PT/cron.lang
index e45d875c28b..4f3f47748fe 100644
--- a/htdocs/langs/pt_PT/cron.lang
+++ b/htdocs/langs/pt_PT/cron.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - cron
 # About page
 # Right
-Permission23101 = Ler trabalho agendadocar
+Permission23101 = Ler trabalho 'Agendado'
 Permission23102 = Criar/atualizar trabalho agendado
 Permission23103 = Eliminar trabalho agendado
 Permission23104 = Executar Trabalho Agendado
@@ -17,7 +17,7 @@ CronMethodDoesNotExists=Class %s does not contains any method %s
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
 CronJobProfiles=List of predefined cron job profiles
 # Menu
-EnabledAndDisabled=Enabled and disabled
+EnabledAndDisabled=Ativado e desativado
 # Page list
 CronLastOutput=Latest run output
 CronLastResult=Latest result code
@@ -26,15 +26,15 @@ CronList=Tarefas agendadas
 CronDelete=Delete scheduled jobs
 CronConfirmDelete=Tem certeza de que deseja eliminar estes trabalhos agendados?
 CronExecute=Launch scheduled job
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
+CronConfirmExecute=Tem certeza de que deseja executar esses trabalhos agendados agora?
+CronInfo=Módulo de trabalhos agendados permite agendar trabalhos para executá-los automaticamente. Os trabalhos também podem ser iniciados manualmente.
 CronTask=Tarefa
 CronNone=Nenhuma
-CronDtStart=Not before
-CronDtEnd=Not after
+CronDtStart=Não antes
+CronDtEnd=Não após
 CronDtNextLaunch=Próximo execução
-CronDtLastLaunch=Start date of latest execution
-CronDtLastResult=End date of latest execution
+CronDtLastLaunch=Data de início da última execução
+CronDtLastResult=Data final da última execução
 CronFrequency=Frequência
 CronClass=Classe
 CronMethod=Método
@@ -44,7 +44,7 @@ CronPriority=Prioridade
 CronLabel=Etiqueta
 CronNbRun=N.º de Execução
 CronMaxRun=Max number launch
-CronEach=Every
+CronEach=Cada
 JobFinished=Terafa lançada e concluída
 #Page card
 CronAdd= Adicionar tarefas
diff --git a/htdocs/langs/pt_PT/deliveries.lang b/htdocs/langs/pt_PT/deliveries.lang
index e9e4a5d8ed2..b5a48c46ed5 100644
--- a/htdocs/langs/pt_PT/deliveries.lang
+++ b/htdocs/langs/pt_PT/deliveries.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - deliveries
-Delivery=Entrega
+Delivery=Distribuição
 DeliveryRef=Ref. de entrega
-DeliveryCard=Ficha da nota de receção
+DeliveryCard=Ficha de recibo
 DeliveryOrder=Ordem de entrega
 DeliveryDate=Data da entrega
 CreateDeliveryOrder=Gerar recibo de entrega
diff --git a/htdocs/langs/pt_PT/dict.lang b/htdocs/langs/pt_PT/dict.lang
index bec5916c1c4..546e2a129df 100644
--- a/htdocs/langs/pt_PT/dict.lang
+++ b/htdocs/langs/pt_PT/dict.lang
@@ -1,11 +1,12 @@
 # Dolibarr language file - Source file is en_US - dict
 CountryFR=França
 CountryBE=Belgica
-CountryIT=Italia
+CountryIT=Itália
 CountryES=Espanha
 CountryDE=Alemanha
 CountryCH=Suiça
-CountryGB=Grã-Bretanha
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=Reino Unido
 CountryUK=Reino Unido
 CountryIE=Irlanda
 CountryCN=China
diff --git a/htdocs/langs/pt_PT/ecm.lang b/htdocs/langs/pt_PT/ecm.lang
index 4d5e7fd6f10..61dd3535555 100644
--- a/htdocs/langs/pt_PT/ecm.lang
+++ b/htdocs/langs/pt_PT/ecm.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Nº de documentos na pasta
-ECMSection=Pasta
-ECMSectionManual=Pasta manual
+ECMNbOfDocs=N.º de documentos na diretoria
+ECMSection=Diretoria
+ECMSectionManual=Diretoria manual
 ECMSectionAuto=Pasta automática
 ECMSectionsManual=Pastas manuais
 ECMSectionsAuto=Pastas automáticas
@@ -39,9 +39,10 @@ ShowECMSection=Mostrar Pasta
 DeleteSection=Remover diretório
 ConfirmDeleteSection=Pode confirmar que deseja eliminar a pasta <b>%s</b>?
 ECMDirectoryForFiles=Pasta relativa para ficheiros
-CannotRemoveDirectoryContainsFiles=Não se pode eliminar porque contem ficheiros
+CannotRemoveDirectoryContainsFilesOrDirs=A remoção do diretório não foi possível porque contém ficheiros ou sub-diretórios
+CannotRemoveDirectoryContainsFiles=A remoção do diretório não foi possível porque contém ficheiros
 ECMFileManager=Explorador de Ficheiros
-ECMSelectASection=Seleccione uma pasta na árvore da esquerda
+ECMSelectASection=Selecione uma pasta na árvore...
 DirNotSynchronizedSyncFirst=Este diretório parece ter sido ser criado ou modificado fora do módulo GCE. Você deve clicar no botão "Voltar a sincronizar" primeiro para sincronizar o disco e a base de dados para obter o conteúdo desse diretório.
 ReSyncListOfDir=Voltar a sincronizar a lista de diretórios
 HashOfFileContent=Hash do conteúdo do ficheiro
diff --git a/htdocs/langs/pt_PT/errors.lang b/htdocs/langs/pt_PT/errors.lang
index dc1b4a4cfac..0c6d157d662 100644
--- a/htdocs/langs/pt_PT/errors.lang
+++ b/htdocs/langs/pt_PT/errors.lang
@@ -11,7 +11,7 @@ ErrorLoginAlreadyExists=O login %s já existe.
 ErrorGroupAlreadyExists=O grupo %s já existe.
 ErrorRecordNotFound=Registo não foi encontrado.
 ErrorFailToCopyFile=Ocorreu um erro ao copiar o ficheiro '<b>%s</b>' para '<b>%s</b>'.
-ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
+ErrorFailToCopyDir=A cópia da diretoria '<b>%s</b>' para '<b>%s</b>' falhou.
 ErrorFailToRenameFile=Ocorreu um erro ao mudar o nome do ficheiro '<b>%s</b>' para '<b>%s</b>'.
 ErrorFailToDeleteFile=Ocorreu um erro ao remover o ficheiro '<b>%s</b>'.
 ErrorFailToCreateFile=Ocorreu um erro ao criar o ficheiro '<b>%s</b>'.
@@ -28,13 +28,13 @@ ErrorProdIdIsMandatory=O %s é obrigatório
 ErrorBadCustomerCodeSyntax=A sintaxis do código cliente é incorrecta
 ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
 ErrorCustomerCodeRequired=Código cliente obrigatório
-ErrorBarCodeRequired=Bar code required
+ErrorBarCodeRequired=Código de barras obrigatório
 ErrorCustomerCodeAlreadyUsed=Código de cliente já utilizado
-ErrorBarCodeAlreadyUsed=Bar code already used
+ErrorBarCodeAlreadyUsed=Código de barras em utilização
 ErrorPrefixRequired=Prefixo obrigatório
-ErrorBadSupplierCodeSyntax=A sintaxis do código fornecedor é incorrecta
-ErrorSupplierCodeRequired=Código fornecedor obrigatório
-ErrorSupplierCodeAlreadyUsed=Código de fornecedor já utilizado
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Código de fornecedor obrigatório
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Parâmetros incorrectos
 ErrorBadValueForParameter=Valor errado '%s' para o parâmetro '%s'
 ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
@@ -87,7 +87,7 @@ ErrorsOnXLines=<b>%s</b> sobre as linhas das fontes de erros
 ErrorFileIsInfectedWithAVirus=O programa antivírus não foi capaz de validar o arquivo (arquivo pode ser infectado por um vírus)
 ErrorSpecialCharNotAllowedForField=Os caracteres especiais não são permitidos para o campo &quot;%s&quot;
 ErrorNumRefModel=Existe uma referência em banco de dados (%s) e não é compatível com esta regra de numeração. Remover registro ou renomeado de referência para ativar este módulo.
-ErrorQtyTooLowForThisSupplier=Quantidade muito baixa para este fornecedor ou sem preço definido sobre este produto para o fornecedor
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Erro na máscara
 ErrorBadMaskFailedToLocatePosOfSequence=Máscara de erro, sem número de seqüência
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
-ErrorSupplierCountryIsNotDefined=O país deste fornecedor não está definido, corrija na sua ficha
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
@@ -204,7 +204,7 @@ ErrorObjectMustHaveLinesToBeValidated=O objeto %s deve ter linhas para ser valid
 ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Only validated invoices can be sent using the "Send by email" mass action.
 ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a predefined product or not
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
-ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
+ErrorFileNotFoundWithSharedLink=Ficheiro não encontrado. É possível que a chave de partilha tenha sido modificada ou o ficheiro tenha sido removido recentemente.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
@@ -224,10 +224,10 @@ WarningCloseAlways=Warning, closing is done even if amount differs between sourc
 WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all pages showing the box.
 WarningClickToDialUserSetupNotComplete=A configuração das informações ClickToDial do seu utilizador não está completa (consulte o separador ClickToDial no sua ficha de utilizador).
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
-WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
+WarningPaymentDateLowerThanInvoiceDate=A data de pagamento (%s) é anterior à data da fatura (%s) para a fatura %s.
 WarningTooManyDataPleaseUseMoreFilters=Too many data (more than %s lines). Please use more filters or set the constant %s to a higher limit.
 WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while their hourly rate was not defined. A value of 0 %s per hour was used but this may result in wrong valuation of time spent.
-WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
+WarningYourLoginWasModifiedPleaseLogin=O seu login foi modificado. Por motivos de segurança, você terá que iniciar a sessão com seu novo login antes da próxima ação.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Aviso, o número de destinatários diferentes é limitado a <b> %s </b> ao usar as ações em massa em listas
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
diff --git a/htdocs/langs/pt_PT/exports.lang b/htdocs/langs/pt_PT/exports.lang
index a86557e89fb..4886e36e09b 100644
--- a/htdocs/langs/pt_PT/exports.lang
+++ b/htdocs/langs/pt_PT/exports.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - exports
-ExportsArea=Área de Exportação
+ExportsArea=Área de exportação
 ImportArea=Área de Importação
-NewExport=Nova Exportação
+NewExport=Nova exportação
 NewImport=Nova Importação
 ExportableDatas=Conjunto de dados exportáveis
 ImportableDatas=Conjunto de dados importáveis
@@ -44,7 +44,7 @@ LineDescription=Descrição da linha
 LineUnitPrice=Preço por unidade de linha
 LineVATRate=Taxa de IVA de linha
 LineQty=Quantidade de linha
-LineTotalHT=Montante líquido de impostos para a linha
+LineTotalHT=Montante sem IVA para a linha
 LineTotalTTC=Montante do imposto para a linha
 LineTotalVAT=Montante do IVA para a linha
 TypeOfLineServiceOrProduct=Tipo de linha (0= produto, serviço de 1=)
diff --git a/htdocs/langs/pt_PT/externalsite.lang b/htdocs/langs/pt_PT/externalsite.lang
index 87f941f8e43..b21c17df0bb 100644
--- a/htdocs/langs/pt_PT/externalsite.lang
+++ b/htdocs/langs/pt_PT/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Configurar ligação com site externo
-ExternalSiteURL=URL do site externo
+ExternalSiteSetup=Configurar ligação para site da Web externo
+ExternalSiteURL=URL do Site Externo
 ExternalSiteModuleNotComplete=O módulo Site Externo não está configurado correctamente.
 ExampleMyMenuEntry=Minha entrada de menu
diff --git a/htdocs/langs/pt_PT/ftp.lang b/htdocs/langs/pt_PT/ftp.lang
index 99dcd89649f..554d68c65f5 100644
--- a/htdocs/langs/pt_PT/ftp.lang
+++ b/htdocs/langs/pt_PT/ftp.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=Configuração do módulo de Cliente FTP
-NewFTPClient=Nova configuração de ligação FTP
+FTPClientSetup=Configurar módulo de Cliente FTP
+NewFTPClient=Nova configuração de ligação de FTP
 FTPArea=Área de FTP
 FTPAreaDesc=Este ecrã mostra o seu conteúdo de uma visualização do servidor FTP
 SetupOfFTPClientModuleNotComplete=A configuração do módulo de cliente FTP parece não estar concluída
diff --git a/htdocs/langs/pt_PT/install.lang b/htdocs/langs/pt_PT/install.lang
index 8c72882f2fa..0ccd537ed35 100644
--- a/htdocs/langs/pt_PT/install.lang
+++ b/htdocs/langs/pt_PT/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=O ficheiro de configuração <b>%s</b>
 ConfFileCouldBeCreated=Foi criado o ficheiro de configuração <b>%s</b>.
 ConfFileIsNotWritable=O ficheiro de configuração <b>%s</b> não é gravável. Verifique as permissões. Na primeira instalação, o seu servidor da Web tem de ter permissões de gravação para este ficheiro durante o processo de configuração ("chmod 666", por exemplo num SO, tal como o Unix).
 ConfFileIsWritable=O ficheiro de configuração <b>%s</b> é gravável.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Recarregar toda a informação do ficheiro de configuração.
 PHPSupportSessions=Este PHP suporta sessões.
 PHPSupportPOSTGETOk=Este PHP suporta variáveis GET e POST.
@@ -49,7 +50,7 @@ ServerPortDescription=A porta do servidor da base de dados. Mantenha em branco,
 DatabaseServer=Servidor da Base de Dados
 DatabaseName=Nome da Base de Dados
 DatabasePrefix=Tabela de prefixos da base de dados
-AdminLogin=Início de sessão para o administrador da base de dados Dolibarr. Deixar em branco se a ligação for efetuada como anónimo
+AdminLogin=Início de sessão para o administrador da base de dados Dolibarr.
 PasswordAgain=Contrassenha
 AdminPassword=A senha para o utilizador da base de dados Dolibarr.
 CreateDatabase=Criar base de dados
@@ -60,7 +61,7 @@ CheckToCreateUser=Selecione se o proprietário da base de dados não existir e d
 DatabaseRootLoginDescription=Início de sessão do utilizador autorizado para criar as novas bases de dados ou novos utilizadores, obrigatório se a sua base de dados ou o administrador já existirem.
 KeepEmptyIfNoPassword=Deixar em branco se o utilizador não tiver uma senha (evitar isto)
 SaveConfigurationFile=Guardar valores
-ServerConnection=Ligação ao Servidor
+ServerConnection=Conexão ao servidor
 DatabaseCreation=Criação da Base de Dados
 CreateDatabaseObjects=Criação dos objetos da base de dados
 ReferenceDataLoading=A carregar os dados de referência...
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Falha na criação da conta de Administrador do Dolibar
 WarningRemoveInstallDir=Aviso: por motivos de segurança, assim que a instalação ou a atualização estiverem completas, e para evitar novamente a utilização das ferramentas de instalação, deverá adicionar um ficheiro com o nome <b>install.lock</b> na diretoria de documentos Dolibarr, para evitar a sua utilização maliciosa.</b>
 FunctionNotAvailableInThisPHP=Não disponível neste PHP
 ChoosedMigrateScript=Escolhido migrar script
-DataMigration=Migração de dados
-DatabaseMigration=Migração da base de dados da estrutura
+DataMigration=Migração da base-de-dados (dados)
+DatabaseMigration=Migração da base-de-dados (estrutura + alguns dados)
 ProcessMigrateScript=Processamento do "Script"
 ChooseYourSetupMode=Escolha o seu modo de configuração e clique em "Iniciar"...
 FreshInstall=Instalação Nova
@@ -146,7 +147,7 @@ NothingToDo=Nada para fazer
 # upgrade
 MigrationFixData=Correção para os dados não normalizados
 MigrationOrder=Migração de dados para os clientes "ordens
-MigrationSupplierOrder=Migração de dados de Fornecedores' ordens
+MigrationSupplierOrder=Migração de dados para encomendas a fornecedores
 MigrationProposal=Data migrering for kommersielle forslag
 MigrationInvoice=Migração de dados para as faturas dos clientes
 MigrationContract=Migração de dados para os contratos
@@ -196,8 +197,8 @@ MigrationEvents=Migração dos eventos de forma a adicionar o criador do evento
 MigrationEventsContact=Migração dos eventos de forma a adicionar o contacto do evento à tabela de atribuições
 MigrationRemiseEntity=Atualize o valor do campo entity da tabela llx_societe_remise
 MigrationRemiseExceptEntity=Atualize o valor do campo entity da tabela llx_societe_remise_except
-MigrationUserRightsEntity=Update entity field value of llx_user_rights
-MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
+MigrationUserRightsEntity=Atualizar o valor do campo entidade de llx_user_rights
+MigrationUserGroupRightsEntity=Atualizar o valor do campo entidade de llx_usergroup_rights
 MigrationReloadModule=Recarregar módulo %s
 MigrationResetBlockedLog=Restabelecer o módulo BlockedLog para o algoritmo v7
 ShowNotAvailableOptions=Mostrar opções indisponíveis
diff --git a/htdocs/langs/pt_PT/ldap.lang b/htdocs/langs/pt_PT/ldap.lang
index b8a9f96ffa8..75bfce13a22 100644
--- a/htdocs/langs/pt_PT/ldap.lang
+++ b/htdocs/langs/pt_PT/ldap.lang
@@ -1,7 +1,6 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Palavra-passe do Dominio
-YouMustChangePassNextLogon=A palavra-passe de <b>%s</b> ao dominio <b>%s</b> deve de ser modificada.
-UserMustChangePassNextLogon=O utilizador deve alterar de palavra-passe na próxima ligação
+YouMustChangePassNextLogon=A palavra-passe para o utilizador <b>%s</b> no domínio <b>%s</b> deve de ser alterada.
+UserMustChangePassNextLogon=O utilizador deve alterar a palavra-passe no domínio %s
 LDAPInformationsForThisContact=Informação da base de dados LDAP deste contacto
 LDAPInformationsForThisUser=Informação da base de dados LDAP deste utilizador
 LDAPInformationsForThisGroup=Informação da base de dados LDAP deste grupo
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Tipo de membro sincronizado
 ContactSynchronized=Contato sincronizado
 ForceSynchronize=forçar sincronização Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Erro na leitura do anuario LDAP. Verificar a configuração do módulo LDAP e a acessibilidade do anuario.
+PasswordOfUserInLDAP=Palavra-passe do utilizador para LDAP
diff --git a/htdocs/langs/pt_PT/link.lang b/htdocs/langs/pt_PT/link.lang
index 27875af027a..7ff3b74a22c 100644
--- a/htdocs/langs/pt_PT/link.lang
+++ b/htdocs/langs/pt_PT/link.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - languages
-LinkANewFile=Link a novao ficheiro/documento
-LinkedFiles=Ficheiros e documento ligados
+LinkANewFile=Associar um novo ficheiro/documento
+LinkedFiles=Ficheiros e documentos associados
 NoLinkFound=Nenhumas ligações registadas
 LinkComplete=Os ficheiros foram ligados com sucesso
 ErrorFileNotLinked=Os ficheiros não puderam ser ligados
-LinkRemoved=A ligação %s foi removida
+LinkRemoved=A hiperligação %s foi removida
 ErrorFailedToDeleteLink= falhou a remoção da ligação '<b>%s</b>'
 ErrorFailedToUpdateLink= Falha na atualização de ligação '<b>%s</b>'
 URLToLink=URL para hiperligação
diff --git a/htdocs/langs/pt_PT/loan.lang b/htdocs/langs/pt_PT/loan.lang
index b6d37bcc0f1..5cbe72e27d6 100644
--- a/htdocs/langs/pt_PT/loan.lang
+++ b/htdocs/langs/pt_PT/loan.lang
@@ -10,46 +10,22 @@ LoanCapital=Capital
 Insurance=Seguro
 Interest=Juros
 Nbterms=Número de termos
-LoanAccountancyCapitalCode=Accounting account capital
+Term=Termos
+LoanAccountancyCapitalCode=Capital da conta de contabilidade
 LoanAccountancyInsuranceCode=Accounting account insurance
 LoanAccountancyInterestCode=Accounting account interest
 ConfirmDeleteLoan=Confirme a eliminação deste empréstimo
 LoanDeleted=Empréstimo Apagado Com Sucesso
 ConfirmPayLoan=Confirmar classificação deste empréstimo como pago
 LoanPaid=Empréstimo Liquidado
-# Calc
-LoanCalc=Bank Loans Calculator
-PurchaseFinanceInfo=Compra e Informação Financeira
-SalePriceOfAsset=Sale Price of Asset
-PercentageDown=Percentage Down
-LengthOfMortgage=Duration of loan
-AnnualInterestRate=Taxa de Juros Anual
-ExplainCalculations=Explain Calculations
-ShowMeCalculationsAndAmortization=Mostrar-me os cálculos e a amortização
-MortgagePaymentInformation=Informação do Pagamento da Hipoteca
-DownPayment=Adiantamento
-DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
-InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
-MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
-MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
-MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
-MonthlyPaymentDesc=The montly payment is figured out using the following formula
-AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
-AmountFinanced=Montante Financiado
-AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
-Totalsforyear=Totais para o ano
-MonthlyPayment=Pagamento Mensal
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
-GoToInterest=%s will go towards INTEREST
-GoToPrincipal=%s will go towards PRINCIPAL
-YouWillSpend=You will spend %s in year %s
 ListLoanAssociatedProject=List of loan associated with the project
-AddLoan=Create loan
+AddLoan=Criar empréstimo
+FinancialCommitment=Compromisso financeiro
+InterestAmount=Juros
+CapitalRemain=Capital restante
 # Admin
 ConfigLoan=Configuração do módulo de empréstimo
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-FinancialCommitment=Financial commitment
-CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
+CreateCalcSchedule=Editar compromisso financeiro
diff --git a/htdocs/langs/pt_PT/mailmanspip.lang b/htdocs/langs/pt_PT/mailmanspip.lang
index b5281393e4a..29eb943ad94 100644
--- a/htdocs/langs/pt_PT/mailmanspip.lang
+++ b/htdocs/langs/pt_PT/mailmanspip.lang
@@ -1,15 +1,15 @@
 # Dolibarr language file - Source file is en_US - mailmanspip
-MailmanSpipSetup=Mailman and SPIP module Setup
-MailmanTitle=Mailman mailing list system
-TestSubscribe=To test subscription to Mailman lists
-TestUnSubscribe=To test unsubscribe from Mailman lists
-MailmanCreationSuccess=Subscription test was executed successfully
-MailmanDeletionSuccess=Unsubscription test was executed successfully
-SynchroMailManEnabled=A Mailman update will be performed
+MailmanSpipSetup=Configurar módulo de Mailman e SPIP
+MailmanTitle=Sistema de listas do Mailman
+TestSubscribe=Para testar a subscrição a listas do Mailman
+TestUnSubscribe=Para testar a anulação da subscrição a listas do Mailman
+MailmanCreationSuccess=O teste de subscrição foi executado com sucesso
+MailmanDeletionSuccess=O teste de anulação de subscrição foi executado com sucesso
+SynchroMailManEnabled=Uma atualização do Mailman será executada
 SynchroSpipEnabled=Será efetuada uma atualização ao Spip
-DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password
-DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions
-DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions
+DescADHERENT_MAILMAN_ADMINPW=Palavra-passe de administrador do Mailman
+DescADHERENT_MAILMAN_URL=URL para subscrição do Mailman
+DescADHERENT_MAILMAN_UNSUB_URL=URL para anulação de subscrição do Mailman
 DescADHERENT_MAILMAN_LISTS=Lista(s) para a inscrição automática dos novos membros (separados por uma vírgula)
 SPIPTitle=Sistema de Gestão do Conteúdo SPIP
 DescADHERENT_SPIP_SERVEUR=Servidor SPIP
@@ -23,5 +23,5 @@ DeleteIntoSpip=Remover do SPIP
 DeleteIntoSpipConfirmation=Deseja remover este membro do SPIP?
 DeleteIntoSpipError=Falha ao remover o utilizador do SPIP
 SPIPConnectionFailed=Falha ao ligar ao SPIP
-SuccessToAddToMailmanList=%s successfully added to mailman list %s or SPIP database
-SuccessToRemoveToMailmanList=%s successfully removed from mailman list %s or SPIP database
+SuccessToAddToMailmanList=%s adicionado com sucesso à lista %s do Mailman ou à base-de-dados SPIP
+SuccessToRemoveToMailmanList=%s removido com sucesso da lista %s do Mailman ou da base-de-dados SPIP
diff --git a/htdocs/langs/pt_PT/mails.lang b/htdocs/langs/pt_PT/mails.lang
index cb4b529d48a..ee313b17aec 100644
--- a/htdocs/langs/pt_PT/mails.lang
+++ b/htdocs/langs/pt_PT/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Remetente
 MailErrorsTo=Erros a
 MailReply=Responder a
 MailTo=Destinatario(s)
+MailToUsers=Para utilizador(es)
 MailCC=Cópia a
+MailToCCUsers=Copiar para utilizador(es)
 MailCCC=Adicionar Cópia a
 MailTopic=Assunto do e-mail
 MailText=Mensagem
@@ -35,7 +37,7 @@ MailingStatusSentPartialy=Enviado parcialmente
 MailingStatusSentCompletely=Enviado completamente
 MailingStatusError=Erro
 MailingStatusNotSent=Não enviado
-MailSuccessfulySent=Email (from %s to %s) successfully accepted for delivery
+MailSuccessfulySent=Email (de %s para %s) aceite com sucesso para entrega
 MailingSuccessfullyValidated=Mailing validado com sucesso
 MailUnsubcribe=Cancelar Subscrição
 MailingStatusNotContact=Não contactar
@@ -164,4 +166,4 @@ InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Informação
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
index bdf5f6acfc2..a06b007b0d2 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=Parâmetro %s não definido
 ErrorUnknown=Erro desconhecido
 ErrorSQL=Erro de SQL
 ErrorLogoFileNotFound=O ficheiro logo '%s' não se encontra
-ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
+ErrorGoToGlobalSetup=Vá à configuração 'Empresa/Organização' para corrigir este problema
 ErrorGoToModuleSetup=Ir á configuração do módulo para corrigir
 ErrorFailedToSendMail=Erro ao envio do e-mail (emissor=%s, destinatário=%s)
 ErrorFileNotUploaded=Não foi possivel transferir o ficheiro
@@ -64,14 +64,14 @@ ErrorNoVATRateDefinedForSellerCountry=Erro, nenhum tipo de IVA definido para o p
 ErrorNoSocialContributionForSellerCountry=Erro, nenhum tipo de contribuição social definida para o país %s.
 ErrorFailedToSaveFile=Erro, o registo do ficheiro falhou.
 ErrorCannotAddThisParentWarehouse=Está a tentar adicionar um armazém pai que já é filho do armazém atual
-MaxNbOfRecordPerPage=Max number of record per page
+MaxNbOfRecordPerPage=Número máximo de registos por página
 NotAuthorized=Não tem permissão para efetuar essa operação
 SetDate=Definir data
 SelectDate=Seleccionar uma data
 SeeAlso=Ver também %s
 SeeHere=Veja aqui
 ClickHere=Clique aqui
-Here=Here
+Here=Aqui
 Apply=Aplicar
 BackgroundColorByDefault=Cor de fundo por omissão
 FileRenamed=O ficheiro foi renomeado com sucesso
@@ -92,10 +92,11 @@ DolibarrInHttpAuthenticationSoPasswordUseless=O modo de autenticação do Doliba
 Administrator=Administrador
 Undefined=Não Definido
 PasswordForgotten=Esqueceu-se da sua palavra-passe?
+NoAccount=No account?
 SeeAbove=Ver acima
 HomeArea=Área Principal
 LastConnexion=Ultima conexão
-PreviousConnexion=Ligação Anterior
+PreviousConnexion=Conexão anterior
 PreviousValue=Valor anterior
 ConnectedOnMultiCompany=Conectado sobre entidade
 ConnectedSince=Conectado desde
@@ -165,7 +166,7 @@ ToValidate=Por validar
 NotValidated=Não validado
 Save=Guardar
 SaveAs=Guardar Como
-TestConnection=Teste a ligação
+TestConnection=Testar conexão
 ToClone=Clonar
 ConfirmClone=Selecione os dados que deseja clonar:
 NoCloneOptionsSpecified=Não existem dados definidos para clonar.
@@ -187,7 +188,7 @@ ToLink=Link
 Select=Selecionar
 Choose=Escolher
 Resize=Redimensionar
-ResizeOrCrop=Resize or Crop
+ResizeOrCrop=Redimensionar ou Cortar
 Recenter=Centrar
 Author=Autor
 User=Utilizador
@@ -231,7 +232,7 @@ Limit=Limite
 Limits=Limites
 Logout=Terminar Sessão
 NoLogoutProcessWithAuthMode=Função aplicativo não desconetado com modo de autenticação  <b>%s</b>
-Connection=Ligação
+Connection=Iniciar Sessão
 Setup=Configuração
 Alert=Alerta
 MenuWarnings=Alertas
@@ -328,10 +329,10 @@ Default=Predefinição
 DefaultValue=Valor Predefinido
 DefaultValues=Valores predefinidos
 Price=Preço
-PriceCurrency=Price (currency)
+PriceCurrency=Preço (moeda)
 UnitPrice=Preço Unitário
 UnitPriceHT=Preço unitário (líquido)
-UnitPriceHTCurrency=Unit price (net) (currency)
+UnitPriceHTCurrency=Preço unitário (líquido) (moeda)
 UnitPriceTTC=Preço Unitário
 PriceU=P.U.
 PriceUHT=P.U. (líquido)
@@ -339,7 +340,7 @@ PriceUHTCurrency=P.U. (moeda)
 PriceUTTC=P.U. (inc. impostos)
 Amount=Montante
 AmountInvoice=Montante da Fatura
-AmountInvoiced=Amount invoiced
+AmountInvoiced=Montante faturado
 AmountPayment=Montatne do pagamento
 AmountHTShort=Montante (líquido)
 AmountTTCShort=Montante (IVA inc.)
@@ -359,7 +360,7 @@ AmountLT2ES=Montante IRPF
 AmountTotal=Montante Total
 AmountAverage=Montante médio
 PriceQtyMinHT=Preço quantidade min total
-PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
+PriceQtyMinHTCurrency=Preço da quantidade mín. (líquido) (moeda)
 Percentage=Percentagem
 Total=Total
 SubTotal=Subtotal
@@ -396,12 +397,13 @@ LT2ES=IRPF
 LT1IN=ICBS
 LT2IN=IBSE
 VATRate=Taxa IVA
-VATCode=Tax Rate code
-VATNPR=Tax Rate NPR
+VATCode=Código da taxa de imposto
+VATNPR=Taxa de imposto NPR
 DefaultTaxRate=Taxa de imposto predefinida
 Average=Média
 Sum=Soma
 Delta=Divergencia
+RemainToPay=Montante por pagar
 Module=Módulo/Aplicação
 Modules=Módulos/Aplicações
 Option=Opção
@@ -414,7 +416,7 @@ Favorite=Favoritos
 ShortInfo=Informação
 Ref=Ref.
 ExternalRef=Ref. externa
-RefSupplier=Ref. fornecedor
+RefSupplier=Ref. do fornecedor
 RefPayment=Ref. pagamento
 CommercialProposalsShort=Orçamentos
 Comment=Comentário
@@ -429,7 +431,7 @@ ActionDoneShort=Terminado
 ActionUncomplete=Incompleta
 LatestLinkedEvents=Os últimos %s eventos relacionados
 CompanyFoundation=Empresa/Organização
-Accountant=Accountant
+Accountant=Contabilista
 ContactsForCompany=Contactos para este terceiro
 ContactsAddressesForCompany=Contactos/moradas para este terceiro
 AddressesForCompany=Moradas para este terceiro
@@ -438,7 +440,7 @@ ActionsOnMember=Eventos sobre este membro
 ActionsOnProduct=Eventos sobre este produto
 NActionsLate=%s em atraso
 ToDo=A realizar
-Completed=Completed
+Completed=Concluído
 Running=Em progresso
 RequestAlreadyDone=O pedido já foi realizado anteriormente
 Filter=Filtro
@@ -493,7 +495,7 @@ Received=Recebido
 Paid=Pago
 Topic=Assunto
 ByCompanies=Por empresa
-ByUsers=Por utilizador
+ByUsers=Pelo utilizador
 Links=Links
 Link=Link
 Rejects=Reprovado
@@ -619,9 +621,9 @@ BuildDoc=Gerar o doc
 Entity=Entidade
 Entities=Entidades
 CustomerPreview=Historial Cliente
-SupplierPreview=Historial Fornecedor
+SupplierPreview=Pré-visualização do fornecedor
 ShowCustomerPreview=Ver Historial Cliente
-ShowSupplierPreview=Ver Historial Fornecedor
+ShowSupplierPreview=Mostrar pré-visualização do fornecedor
 RefCustomer=Ref. Cliente
 Currency=Moeda
 InfoAdmin=Informação para os administradores
@@ -718,7 +720,7 @@ CoreErrorTitle=Erro de sistema
 CoreErrorMessage=Ocorreu um erro. Contacte o seu administrador do sistema de forma a que este proceda à análise do relatórios ou desative a opção $dolibarr_main_prod=1 para obter mais informação.
 CreditCard=Cartão de crédito
 ValidatePayment=Validar pagamento
-CreditOrDebitCard=Credit or debit card
+CreditOrDebitCard=Cartão de crédito ou débito
 FieldsWithAreMandatory=Os campos com <b>%s</b> são obrigatórios
 FieldsWithIsForPublic=Os campos com <b>%s</b> são mostrados na lista pública dos membros. Se você não quer isso, verificar o &quot;caixa&quot; do público.
 AccordingToGeoIPDatabase=(De acordo com GeoIP conversão)
@@ -823,7 +825,7 @@ ConfirmMassDeletion=Confirmação de eliminação em massa
 ConfirmMassDeletionQuestion=Tem certeza de que deseja eliminar o registo %s selecionado ?
 RelatedObjects=Objetos relacionados
 ClassifyBilled=Classificar como faturado
-ClassifyUnbilled=Classify unbilled
+ClassifyUnbilled=Classificar como não faturado
 Progress=Progresso
 FrontOffice=Front office
 BackOffice=Back office
@@ -866,7 +868,7 @@ FileNotShared=Ficheiro não partilhado
 Project=Projeto
 Projects=Projetos
 Rights=Permissões
-LineNb=Line no.
+LineNb=Linha número
 IncotermLabel=Incoterms
 # Week day
 Monday=Segunda-feira
@@ -914,12 +916,12 @@ SearchIntoUsers=Utilizadores
 SearchIntoProductsOrServices=Produtos ou serviços
 SearchIntoProjects=Projetos
 SearchIntoTasks=Tarefas
-SearchIntoCustomerInvoices=Faturas de Clientes
-SearchIntoSupplierInvoices=Faturas de Fornecedores
+SearchIntoCustomerInvoices=Faturas a clientes
+SearchIntoSupplierInvoices=Faturas do fornecedor
 SearchIntoCustomerOrders=Encomendas de clientes
-SearchIntoSupplierOrders=Encomendas a fornecedores
+SearchIntoSupplierOrders=Ordens de compra
 SearchIntoCustomerProposals=Orçamentos
-SearchIntoSupplierProposals=Orçamentos de fornecedores
+SearchIntoSupplierProposals=Propostas de fornecedor
 SearchIntoInterventions=Intervenções
 SearchIntoContracts=contractos
 SearchIntoCustomerShipments=Expedições do cliente
@@ -930,14 +932,16 @@ NbComments=Número de comentários
 CommentPage=Espaço de comentários
 CommentAdded=Comentário adicionado
 CommentDeleted=Comentário eliminado
-Everybody=Toda a Gente
+Everybody=Todos
 PayedBy=Pago por
 PayedTo=Pago a
-Monthly=Monthly
-Quarterly=Quarterly
-Annual=Annual
+Monthly=Mensal
+Quarterly=Trimestral
+Annual=Anual
 Local=Local
-Remote=Remote
-LocalAndRemote=Local and Remote
-KeyboardShortcut=Keyboard shortcut
+Remote=Remoto
+LocalAndRemote=Local e Remoto
+KeyboardShortcut=Atalho de teclado
 AssignedTo=Atribuído a
+Deletedraft=Eliminar rascunho
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/pt_PT/margins.lang b/htdocs/langs/pt_PT/margins.lang
index d3dd176bde5..a5b2391c681 100644
--- a/htdocs/langs/pt_PT/margins.lang
+++ b/htdocs/langs/pt_PT/margins.lang
@@ -9,29 +9,29 @@ MarginRate=Taxa de margem
 MarkRate=Mark rate
 DisplayMarginRates=Display margin rates
 DisplayMarkRates=Display mark rates
-InputPrice=Input price
+InputPrice=Inserir preço
 margin=Profit margins management
 margesSetup=Profit margins management setup
 MarginDetails=Detalhes da margem
 ProductMargins=Margens do produto
 CustomerMargins=Margens do cliente
 SalesRepresentativeMargins=Margens de representantes de vendas
-UserMargins=User margins
+UserMargins=Margens do utilizador
 ProductService=Produto ou Serviço
 AllProducts=Todos os produtos e serviços
 ChooseProduct/Service=Escolher produto ou serviço
 ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
 ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
-MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
+MARGIN_METHODE_FOR_DISCOUNT=Método de margem para descontos globais
 UseDiscountAsProduct=Como um produto
 UseDiscountAsService=Como um serviço
 UseDiscountOnTotal=No subtotal
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Define se um desconto global é tratado como um produto, um serviço, ou apenas no subtotal para cálculo de margem
 MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best supplier price
+MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
-MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margem no melhor preço de compra = Preço de venda - Melhor preço de fornecedor definido na ficha de produto<br> * Margem no preço médio ponderado (WAP) = Preço de venda - Preço médio ponderado do produto (PMP) ou melhor preço do fornecedor se PMP ainda não estiver definido<br> * Margem no preço de custo = Preço de venda - Preço de custo definido na ficha de produto ou PMP se o preço de custo não estiver definido ou o melhor preço do fornecedor se o PMP ainda não estiver definido
+MargeType3=Margem no Preço de Custo
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Preço de custo
 UnitCharges=Custos unitários
 Charges=Custos
diff --git a/htdocs/langs/pt_PT/members.lang b/htdocs/langs/pt_PT/members.lang
index 0ca87e31fb8..f846103c137 100644
--- a/htdocs/langs/pt_PT/members.lang
+++ b/htdocs/langs/pt_PT/members.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - members
-MembersArea=Área de Membros
+MembersArea=Área de membros
 MemberCard=Ficha de membro
 SubscriptionCard=Ficha de subscrição
 Member=Membro
@@ -21,7 +21,7 @@ MembersListToValid=Lista de Membros rascunho (a Confirmar)
 MembersListValid=Lista de Membros validados
 MembersListUpToDate=Lista dos Membros válidos ao dia de adesão
 MembersListNotUpToDate=Lista dos Membros válidos não ao dia de adesão
-MembersListResiliated=List of terminated members
+MembersListResiliated=Lista de membros inativos
 MembersListQualified=Lista dos Membros qualificados
 MenuMembersToValidate=Membros rascunho
 MenuMembersValidated=Membros validados
@@ -55,7 +55,7 @@ NewCotisation=Nova filiação
 PaymentSubscription=Nova contribuição pagamento
 SubscriptionEndDate=Data fim filiação
 MembersTypeSetup=configuração dos tipos de Membros
-MemberTypeModified=Member type modified
+MemberTypeModified=Tipo de membro modificado
 DeleteAMemberType=Delete a member type
 ConfirmDeleteMemberType=Are you sure you want to delete this member type?
 MemberTypeDeleted=Member type deleted
@@ -96,8 +96,8 @@ EnablePublicSubscriptionForm=Enable the public website with self-subscription fo
 ForceMemberType=Force the member type
 ExportDataset_member_1=Membros e Filicações
 ImportDataset_member_1=Membros
-LastMembersModified=Latest %s modified members
-LastSubscriptionsModified=Latest %s modified subscriptions
+LastMembersModified=Últimos %smembros modificados
+LastSubscriptionsModified=Últimas %s subscrições modificadas
 String=Sequencia de caracteres
 Text=Texto largo
 Int=Numérico
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
@@ -164,7 +164,7 @@ MembersStatisticsByTown=Membros estatísticas por localidade
 MembersStatisticsByRegion=Estatísticas do membros por região
 NbOfMembers=Número de membros
 NoValidatedMemberYet=Nenhum membro validado encontrado
-MembersByCountryDesc=Esta tela mostrará estatísticas sobre membros dos países. Gráfico depende, contudo, o serviço Google gráfico on-line e está disponível apenas se uma ligação à Internet é está funcionando.
+MembersByCountryDesc=Esta tela mostrará estatísticas sobre membros dos países. Gráfico depende, contudo, no serviço gráfico online da Google e apenas está disponível se existir uma conexão à Internet a funcionar.
 MembersByStateDesc=Esta tela mostrar-lhe as estatísticas sobre os membros por estado / província .
 MembersByTownDesc=Esta tela mostrará estatísticas sobre membros por localidade.
 MembersStatisticsDesc=Escolha as estatísticas que você deseja ler ...
diff --git a/htdocs/langs/pt_PT/modulebuilder.lang b/htdocs/langs/pt_PT/modulebuilder.lang
index a9303fc822f..bf56194be0e 100644
--- a/htdocs/langs/pt_PT/modulebuilder.lang
+++ b/htdocs/langs/pt_PT/modulebuilder.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=Esta ferramenta deve ser utilizada por utilizadores mais experientes ou desenvolvedores. Esta oferece os utilitários necessários para criar ou editar o seu próprio módulo (A documentação para criar manualmente um novo módulo encontra-se <a href="%s" target="_blank">aqui</a>).
+ModuleBuilderDesc=Esta ferramenta deve ser utilizada por utilizadores mais experientes ou programadores. Esta oferece utilitários para criar ou editar o seu próprio módulo (A documentação para o desenvolvimento manual alternativo encontra-se <a href="%s" target="_blank">aqui</a>).
 EnterNameOfModuleDesc=Introduza o nome do módulo/aplicação a criar, sem espaços. Use maiúsculas para separar palavras (Por exemplo: MyModule, EcommerceForShop, SyncWithMySystem ...)
 EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
 ModuleBuilderDesc2=Caminho onde são gerados/editados os módulos (primeira diretoria alternativa definida em %s): <strong>%s</strong>
-ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong>
+ModuleBuilderDesc3=Módulos gerados / editáveis ​​encontrados: <strong>%s</strong>
 ModuleBuilderDesc4=A module is detected as 'editable' when the file <strong>%s</strong> exists in root of module directory
 NewModule=Novo módulo
 NewObject=Novo objeto
diff --git a/htdocs/langs/pt_PT/oauth.lang b/htdocs/langs/pt_PT/oauth.lang
index 3b04dfbcfe5..69e96711024 100644
--- a/htdocs/langs/pt_PT/oauth.lang
+++ b/htdocs/langs/pt_PT/oauth.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Configuração de Oauth
-OAuthServices=Serviços OAuth
+OAuthServices=Serviços de OAuth
 ManualTokenGeneration=Geração manual de token
 TokenManager=Gestor de token
 IsTokenGenerated=O token foi gerado?
diff --git a/htdocs/langs/pt_PT/opensurvey.lang b/htdocs/langs/pt_PT/opensurvey.lang
index bd1f2d20616..11d99b98390 100644
--- a/htdocs/langs/pt_PT/opensurvey.lang
+++ b/htdocs/langs/pt_PT/opensurvey.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - opensurvey
-Survey=Inquérito
-Surveys=Inquéritos
+Survey=Sondagem
+Surveys=Sondagens
 OrganizeYourMeetingEasily=Organize suas reuniões e inquéritos facilmente. Primeiro selecione o tipo inquérito...
 NewSurvey=Novo inquérito
 OpenSurveyArea=Área de inquéritos
@@ -57,4 +57,5 @@ ErrorInsertingComment=Ocorreu um erro ao inserir o seu comentário
 MoreChoices=Insira mais escolhas para os inquiridos
 SurveyExpiredInfo=O inquérito foi encerrado ou o prazo de votação expirou.
 EmailSomeoneVoted=%s preencheu uma linha.\nVocê pode encontrar o seu inquérito através da hiperligação:\n%s
-ShowSurvey=Show survey
+ShowSurvey=Mostrar estudo
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/pt_PT/orders.lang b/htdocs/langs/pt_PT/orders.lang
index fd4b45d9820..0ed93991b17 100644
--- a/htdocs/langs/pt_PT/orders.lang
+++ b/htdocs/langs/pt_PT/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Área de encomendas de clientes
-SuppliersOrdersArea=Área de encomendas a fornecedores
+SuppliersOrdersArea=Área de encomendas de compra
 OrderCard=Ficha da encomenda
 OrderId=Id da encomenda
 Order=Encomenda
@@ -13,9 +13,9 @@ OrderToProcess=Encomenda a processar
 NewOrder=Nova encomenda
 ToOrder=Efetuar encomenda
 MakeOrder=Efetuar encomenda
-SupplierOrder=Encomenda a fornecedor
-SuppliersOrders=Encomendas a fornecedores
-SuppliersOrdersRunning=Encomendas a fornecedores atuais
+SupplierOrder=Ordem de compra
+SuppliersOrders=Ordens de compra
+SuppliersOrdersRunning=Ordens de compra atuais
 CustomerOrder=Encomenda de cliente
 CustomersOrders=Encomendas de clientes
 CustomersOrdersRunning=Encomendas de clientes atuais
@@ -24,7 +24,7 @@ OrdersDeliveredToBill=Encomendas de clientes entregues por faturar
 OrdersToBill=Encomendas de clientes entregues
 OrdersInProcess=Encomendas de clientes em processo
 OrdersToProcess=Encomendas de clientes por processar
-SuppliersOrdersToProcess=Encomendas a fornecedores por processar
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=Anulado
 StatusOrderDraftShort=Rascunho
 StatusOrderValidatedShort=Validado
@@ -75,15 +75,15 @@ ShowOrder=Mostrar encomenda
 OrdersOpened=Encomendas por processar
 NoDraftOrders=Sem encomendas rascunho
 NoOrder=Sem encomenda
-NoSupplierOrder=Se encomenda a fornecedor
+NoSupplierOrder=No purchase order
 LastOrders=%s últimas encomendas de clientes
 LastCustomerOrders=%s últimas encomendas de clientes
-LastSupplierOrders=%s últimas encomendas a fornecedores
-LastModifiedOrders=%s últimas encomendas de clientes modificadas
+LastSupplierOrders=Latest %s purchase orders
+LastModifiedOrders=Últimas %s encomendas de clientes modificadas
 AllOrders=Todos as encomendas
 NbOfOrders=Número de encomendas
 OrdersStatistics=Estatísticas de encomendas
-OrdersStatisticsSuppliers=Estatísticas de encomendas a fornecedores
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Número de encomendas por mês
 AmountOfOrdersByMonthHT=Quantia originada de encomendas, por mês (sem IVA)
 ListOfOrders=Lista de encomendas
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Tem a certeza que deseja confirmar que efetuou esta encomenda a
 GenerateBill=Gerar fatura
 ClassifyShipped=Classificar como entregue
 DraftOrders=Rascunhos de encomendas
-DraftSuppliersOrders=Rascunhos de encomendas a fornecedores
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=Encomendas em processo
 RefOrder=Ref. da encomenda
 RefCustomerOrder=Ref. da encomenda para o cliente
-RefOrderSupplier=Ref. de encomenda a fornecedor
-RefOrderSupplierShort=Ref. encomenda a fornecedor
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=Enviar encomenda por email
 ActionsOnOrder=Acções sobre a encomenda
 NoArticleOfTypeProduct=Não existe artigos de tipo 'produto' e portanto não há artigos expedidos para esta encomenda
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Tem a certeza que pretende clonar a encomenda <b>%s</b>?
 DispatchSupplierOrder=A receber a encomenda a fornecedor, %s
 FirstApprovalAlreadyDone=A primeira aprovação já foi efetuada
 SecondApprovalAlreadyDone=A segunda aprovação já foi efetuada
-SupplierOrderReceivedInDolibarr=A encomenda a fornecedor, %s, foi recebida %s
-SupplierOrderSubmitedInDolibarr=A encomenda a fornecedor, %s, foi submetida
-SupplierOrderClassifiedBilled=A encomenda a fornecedor, %s, foi faturada
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Outros Pedidos
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representante que está a dar seguimento à encomenda do cliente
@@ -125,11 +125,11 @@ TypeContact_commande_internal_SHIPPING=Representante transporte seguimento
 TypeContact_commande_external_BILLING=Contacto da fatura do cliente
 TypeContact_commande_external_SHIPPING=Contato com o transporte do cliente
 TypeContact_commande_external_CUSTOMER=Contacto do cliente que está a dar seguimento à encomenda
-TypeContact_order_supplier_internal_SALESREPFOLL=Representante que está a dar seguimento à encomenda ao fornecedor
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Representante transporte seguimento
-TypeContact_order_supplier_external_BILLING=Contacto da fatura do fornecedor
-TypeContact_order_supplier_external_SHIPPING=Fornecedor Contactar com transporte
-TypeContact_order_supplier_external_CUSTOMER=Contacto do fornecedor que está a dar seguimento à encomenda
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constante COMMANDE_SUPPLIER_ADDON não definida
 Error_COMMANDE_ADDON_NotDefined=Constante COMMANDE_ADDON não definida
 Error_OrderNotChecked=Nenhuma encomenda para faturar selecionada
diff --git a/htdocs/langs/pt_PT/other.lang b/htdocs/langs/pt_PT/other.lang
index 97ddcce07d0..c40a9e124db 100644
--- a/htdocs/langs/pt_PT/other.lang
+++ b/htdocs/langs/pt_PT/other.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - other
-SecurityCode=Código segurança
+SecurityCode=Código de segurança
 NumberingShort=N°
 Tools=Utilidades
 TMenuTools=Ferramentas
@@ -9,27 +9,27 @@ BirthdayDate=Data de nascimento
 DateToBirth=Data de Nascimento
 BirthdayAlertOn=Alerta de aniversário activo
 BirthdayAlertOff=Alerta aniversário inativo
-TransKey=Translation of the key TransKey
-MonthOfInvoice=Month (number 1-12) of invoice date
-TextMonthOfInvoice=Month (text) of invoice date
-PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
-TextPreviousMonthOfInvoice=Previous month (text) of invoice date
-NextMonthOfInvoice=Following month (number 1-12) of invoice date
-TextNextMonthOfInvoice=Following month (text) of invoice date
-ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
-DocFileGeneratedInto=Doc file generated into <b>%s</b>.
-JumpToLogin=Disconnected. Go to login page...
-MessageForm=Message on online payment form
+TransKey=Tradução da chave TransKey
+MonthOfInvoice=Mês (número 1-12) da data da fatura
+TextMonthOfInvoice=Mês (texto) da data da fatura
+PreviousMonthOfInvoice=Mês anterior (número 1-12) à data da fatura
+TextPreviousMonthOfInvoice=Mês anterior (texto) da data da fatura
+NextMonthOfInvoice=Mês seguinte (número 1-12) à data da fatura
+TextNextMonthOfInvoice=Mês seguinte (texto) à data da fatura
+ZipFileGeneratedInto=Ficheiro zip gerado em <b>%s</b>.
+DocFileGeneratedInto=Ficheiro doc gerado em <b>%s</b>.
+JumpToLogin=Desconectado. Vá para a página de inicio de sessão...
+MessageForm=Mensagem no formulário de pagamento online
 MessageOK=Mensagem na página validado o pagamento de retorno
 MessageKO=Mensagem na página de pagamento cancelado retorno
-ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
-DeleteAlsoContentRecursively=Check to delete all content recursiveley
+ContentOfDirectoryIsNotEmpty=O diretório não está vazio.
+DeleteAlsoContentRecursively=Selecione para eliminar todo o conteúdo recursivamente
 
-YearOfInvoice=Year of invoice date
-PreviousYearOfInvoice=Previous year of invoice date
-NextYearOfInvoice=Following year of invoice date
-DateNextInvoiceBeforeGen=Date of next invoice (before generation)
-DateNextInvoiceAfterGen=Date of next invoice (after generation)
+YearOfInvoice=Ano da data da fatura
+PreviousYearOfInvoice=Ano anterior à data da fatura
+NextYearOfInvoice=Ano seguinte à data da fatura
+DateNextInvoiceBeforeGen=Data da próxima fatura (antes da geração)
+DateNextInvoiceAfterGen=Data da próxima fatura (após geração)
 
 Notify_FICHINTER_ADD_CONTACT=Adicionado contato à intervenção
 Notify_FICHINTER_VALIDATE=Intervenção validada
@@ -41,14 +41,14 @@ Notify_ORDER_SUPPLIER_VALIDATE=Encomenda a fornecedor registada
 Notify_ORDER_SUPPLIER_APPROVE=Fornecedor fim aprovado
 Notify_ORDER_SUPPLIER_REFUSE=Fornecedor fim recusado
 Notify_PROPAL_VALIDATE=Orçamento validado
-Notify_PROPAL_CLOSE_SIGNED=Customer propal closed signed
-Notify_PROPAL_CLOSE_REFUSED=Customer propal closed refused
+Notify_PROPAL_CLOSE_SIGNED=Orçamento para cliente fechado, assinado
+Notify_PROPAL_CLOSE_REFUSED=Orçamento para cliente fechado, recusado
 Notify_PROPAL_SENTBYMAIL=Orçamento enviado por correio
 Notify_WITHDRAW_TRANSMIT=Retirada de transmissão
 Notify_WITHDRAW_CREDIT=Retirada de crédito
 Notify_WITHDRAW_EMIT=Realizar a retirada
 Notify_COMPANY_CREATE=Terceiro criado
-Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
+Notify_COMPANY_SENTBYMAIL=Emails enviadas a partir da ficha de terceiros
 Notify_BILL_VALIDATE=Fatura do cliente validada
 Notify_BILL_UNVALIDATE=Fatura do cliente não validada
 Notify_BILL_PAYED=Fatura de Cliente paga
@@ -57,7 +57,7 @@ Notify_BILL_SENTBYMAIL=Fatura do cliente enviada pelo correio
 Notify_BILL_SUPPLIER_VALIDATE=Fatura do fornecedor validado
 Notify_BILL_SUPPLIER_PAYED=Fatura do fornecedor paga
 Notify_BILL_SUPPLIER_SENTBYMAIL=Fatura do fornecedor enviada por correio
-Notify_BILL_SUPPLIER_CANCELED=Supplier invoice cancelled
+Notify_BILL_SUPPLIER_CANCELED=Fatura do fornecedor cancelada
 Notify_CONTRACT_VALIDATE=Contrato validado
 Notify_FICHEINTER_VALIDATE=Intervenção validado
 Notify_SHIPPING_VALIDATE=Transporte validado
@@ -71,7 +71,7 @@ Notify_PROJECT_CREATE=Criação do projeto
 Notify_TASK_CREATE=Tarefa criada
 Notify_TASK_MODIFY=Tarefa modificada
 Notify_TASK_DELETE=Tarefa eliminada
-SeeModuleSetup=See setup of module %s
+SeeModuleSetup=Veja a configuração do módulo %s
 NbOfAttachedFiles=Número Ficheiros/Documentos anexos
 TotalSizeOfAttachedFiles=Tamanho Total dos Ficheiros/Documentos anexos
 MaxSize=Tamanho Máximo
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -93,7 +93,7 @@ PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNA
 PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 DemoDesc=O Dolibarr é um ERP/CRM compacto que suporta vários módulos de negócios. Uma demonstração mostrando todos os módulos não faz sentido porque esse cenário nunca ocorre (várias centenas disponíveis). Assim, vários perfis de demonstração estão disponíveis.
 ChooseYourDemoProfil=Escolha o perfil de demonstração que melhor se adequa às suas necessidades ...
-ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
+ChooseYourDemoProfilMore=...ou crie o seu próprio perfil <br> (seleção manual de módulo)
 DemoFundation=Gestão de Membros de uma associação
 DemoFundation2=Gestão de Membros e tesouraria de uma associação
 DemoCompanyServiceOnly=Empresa ou serviço de freelancer apenas
@@ -104,16 +104,16 @@ CreatedBy=Criado por %s
 ModifiedBy=Modificado por %s
 ValidatedBy=Validado por %s
 ClosedBy=Fechado por %s
-CreatedById=User id who created
-ModifiedById=User id who made latest change
+CreatedById=ID do utilizador que criou
+ModifiedById=ID do utilizador que efetuou a última alteração
 ValidatedById=ID do utilizador que validou
-CanceledById=User id who canceled
-ClosedById=User id who closed
-CreatedByLogin=User login who created
-ModifiedByLogin=User login who made latest change
+CanceledById=ID do utilizador que cancelou
+ClosedById=ID do utilizador que fechou
+CreatedByLogin=Utilizador que criou
+ModifiedByLogin=Utilizador que efetuou a última alteração
 ValidatedByLogin=Login de utilizador que validou
-CanceledByLogin=User login who canceled
-ClosedByLogin=User login who closed
+CanceledByLogin=Utilizador que cancelou
+ClosedByLogin=Utilizador que fechou
 FileWasRemoved=o Ficheiro foi eliminado
 DirWasRemoved=A pasta foi eliminada
 FeatureNotYetAvailable=O funcionalidade ainda não se encontra disponível na versão atual
@@ -164,7 +164,7 @@ SizeUnitinch=polegada
 SizeUnitfoot=pé
 SizeUnitpoint=ponto
 BugTracker=Incidencias
-SendNewPasswordDesc=This form allows you to request a new password. It will be sent to your email address.<br>Change will become effective once you click on the confirmation link in the email.<br>Check your inbox.
+SendNewPasswordDesc=Este formulário permite que você solicite uma nova palavra-passe. Esta solicitação será enviada para seu endereço de e-mail.<br>A alteração entrará em vigor quando você clicar no link de confirmação no e-mail.<br>Verifique sua caixa de entrada.
 BackToLoginPage=Voltar à página de iniciar a sessão
 AuthenticationDoesNotAllowSendNewPassword=o modo de autenticação de Dolibarr está configurado como "<b>%s</b>".<br>em este modo Dolibarr não pode conocer ni modificar a sua palavra-passe<br>Contacte com a sua administrador para conocer as modalidades de alterar.
 EnableGDLibraryDesc=Instale ou ative a biblioteca GD na instalação do PHP para usar esta opção.
@@ -174,13 +174,13 @@ StatsByNumberOfUnits=Estatísticas para o somatório da quantidade de produtos/s
 StatsByNumberOfEntities=Estatísticas em número de entidades referentes (número de fatura, ou ordem...)
 NumberOfProposals=Número de orçamentos
 NumberOfCustomerOrders=Número de encomendas de clientes
-NumberOfCustomerInvoices=Número de faturas de clientes
+NumberOfCustomerInvoices=Número de faturas a clientes
 NumberOfSupplierProposals=Número de orçamentos de fornecedores
 NumberOfSupplierOrders=Número de encomendas a fornecedores
 NumberOfSupplierInvoices=Número de faturas de fornecedores
 NumberOfUnitsProposals=Número de unidades em orçamentos
 NumberOfUnitsCustomerOrders=Número de unidades em encomendas de clientes
-NumberOfUnitsCustomerInvoices=Número de unidades em faturas de clientes
+NumberOfUnitsCustomerInvoices=Número de unidades em faturas a clientes
 NumberOfUnitsSupplierProposals=Número de unidades em orçamentos de fornecedores
 NumberOfUnitsSupplierOrders=Número de unidades em encomendas a fornecedores
 NumberOfUnitsSupplierInvoices=Número de unidades nas faturas de fornecedores
@@ -191,7 +191,7 @@ EMailTextProposalValidated=O orçamento %s foi validado.
 EMailTextProposalClosedSigned=O orçamento %s foi fechado e assinado.
 EMailTextOrderValidated=O %s pedido foi validado.
 EMailTextOrderApproved=Pedido %s Aprovado
-EMailTextOrderValidatedBy=The order %s has been recorded by %s.
+EMailTextOrderValidatedBy=O encomenda %s foi registada por %s.
 EMailTextOrderApprovedBy=Pedido %s Aprovado por %s
 EMailTextOrderRefused=Pedido %s Reprovado
 EMailTextOrderRefusedBy=Pedido %s Reprovado por %s
@@ -216,15 +216,15 @@ StartUpload=Iniciar upload
 CancelUpload=Cancelar upload
 FileIsTooBig=Arquivos muito grandes
 PleaseBePatient=Por favor, aguarde...
-NewPassword=New password
+NewPassword=Nova palavra-passe
 ResetPassword=Repor palavra-passe
-RequestToResetPasswordReceived=Foi recebida uma solicitação para a alteração da sua senha Dolibarr
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=Estas são as suas novas credenciais para efectuar login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Clique aqui para ir para %s
-YouMustClickToChange=You must however first click on the following link to validate this password change
-ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
-IfAmountHigherThan=If amount higher than <strong>%s</strong>
+YouMustClickToChange=No entanto, você deve primeiro clicar no seguinte link para validar esta alteração de palavra-passe
+ForgetIfNothing=Se você não solicitou esta alteração, ignore o e-mail. As suas credenciais serão mantidas em segurança.
+IfAmountHigherThan=Se o montante for maior que <strong>%s</strong>
 SourcesRepository=Repositório para fontes
 Chart=Gráfico
 PassEncoding=Codificação de palavra-passe
@@ -232,7 +232,9 @@ PermissionsAdd=Permissões adicionadas
 PermissionsDelete=Permissões removidas
 YourPasswordMustHaveAtLeastXChars=A sua palavra-passe deve ter pelo menos estes caracteres: <strong>%s</strong>
 YourPasswordHasBeenReset=A sua palavra-passe foi reposta com sucesso
-ApplicantIpAddress=IP address of applicant
+ApplicantIpAddress=Endereço IP do requerente
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=Área de Exportações
 AvailableFormats=Formatos disponiveis
@@ -246,4 +248,4 @@ WEBSITE_PAGEURL=URL da página
 WEBSITE_TITLE=Título
 WEBSITE_DESCRIPTION=Descrição
 WEBSITE_KEYWORDS=Palavras-chave
-LinesToImport=Lines to import
+LinesToImport=Linhas a importar
diff --git a/htdocs/langs/pt_PT/paybox.lang b/htdocs/langs/pt_PT/paybox.lang
index 5640da03730..2d9a0dd25a7 100644
--- a/htdocs/langs/pt_PT/paybox.lang
+++ b/htdocs/langs/pt_PT/paybox.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - paybox
-PayBoxSetup=Configuração do módulo PayBox
-PayBoxDesc=Este módulo oferece uma página de pagamento através do fornecedor <a href="http://www.paybox.com" target="_blank">Paybox</a> para realizar qualquer pagamento ou um pagamento em relação a um objecto Dolibarr (facturas, pedidos ...)
+PayBoxSetup=Configurar módulo PayBox
+PayBoxDesc=Este módulo oferece uma página para permitir o pagamento de clientes no <a href="http://www.paybox.com" target="_blank">Paybox</a>. Isto pode ser utilizado para pagamento livre ou para um pagamento em particular de um objeto Dolibarr (fatura, ordem, ...)
 FollowingUrlAreAvailableToMakePayments=As seguintes URL estão disponiveis para permitir a um cliente efectuar um pagamento
 PaymentForm=Forma de pagamento
 WelcomeOnPaymentPage=Bem-vindo aos nossos serviços de pagamento online
diff --git a/htdocs/langs/pt_PT/paypal.lang b/htdocs/langs/pt_PT/paypal.lang
index 887f6bd5a25..70b56251912 100644
--- a/htdocs/langs/pt_PT/paypal.lang
+++ b/htdocs/langs/pt_PT/paypal.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - paypal
-PaypalSetup=Configuração do módulo do PayPal
-PaypalDesc=Esta oferta módulo de páginas para permitir o pagamento em <a href="http://www.paypal.com" target="_blank">PayPal</a> pelos clientes. Isto pode ser utilizado para um pagamento livre ou para um pagamento por um objeto Dolibarr particular (fatura, ordem, ...)
+PaypalSetup=Configurar módulo do PayPal
+PaypalDesc=Este módulo oferece uma página para permitir o pagamento de clientes no <a href="http://www.paypal.com" target="_blank">PayPal</a>. Isto pode ser utilizado para um pagamento livre ou para um pagamento em particular de um objeto Dolibarr (fatura, ordem, ...)
 PaypalOrCBDoPayment=Pagar com Paypal (Cartão de Crédito ou Paypal)
 PaypalDoPayment=Pague com Paypal
 PAYPAL_API_SANDBOX=Modo de teste / sandbox
@@ -30,6 +30,6 @@ ErrorCode=Código de Erro
 ErrorSeverityCode=Código de Severidade do Erro
 OnlinePaymentSystem=Sistema de pagamento online
 PaypalLiveEnabled=Paypal ativado (caso contrário, este encontra-se em modo teste)
-PaypalImportPayment=Import Paypal payments
-PostActionAfterPayment=Post actions after payments
+PaypalImportPayment=Importar pagamentos do Paypal
+PostActionAfterPayment=Ações posteriores depois dos pagamentos
 ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
diff --git a/htdocs/langs/pt_PT/productbatch.lang b/htdocs/langs/pt_PT/productbatch.lang
index 2b8521f0782..5377217d09c 100644
--- a/htdocs/langs/pt_PT/productbatch.lang
+++ b/htdocs/langs/pt_PT/productbatch.lang
@@ -1,6 +1,6 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Utilizar lote/número de série
-ProductStatusOnBatch=Sim (necessário lote/número de série)
+ProductStatusOnBatch=Sim (lote/número de série obrigatório)
 ProductStatusNotOnBatch=Não (não é necessário lote/número de série)
 ProductStatusOnBatchShort=Sim
 ProductStatusNotOnBatchShort=Não
@@ -16,7 +16,7 @@ printEatby=Data de validade: %s
 printSellby=Data de venda: %s
 printQty=Qtd.: %d
 AddDispatchBatchLine=Adicionar uma linha para o apuramento por data de validade
-WhenProductBatchModuleOnOptionAreForced=Quando o módulo Lote/Número de Série estiver ativo, o modo automático de aumento/diminuição de stock é forçado para validação de expedições e despacho manual da receção de produtos e não pode ser editado. Outras opções podem ser definidas como você desejar.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=Este produto não usa lote/número de série
 ProductLotSetup=Configuração do módulo Lote/Número de Série
 ShowCurrentStockOfLot=Mostrar o stock atual para o par produto/lote
diff --git a/htdocs/langs/pt_PT/products.lang b/htdocs/langs/pt_PT/products.lang
index fff0e4b2c6f..9e6c07ab317 100644
--- a/htdocs/langs/pt_PT/products.lang
+++ b/htdocs/langs/pt_PT/products.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - products
-ProductRef=Produto ref.
-ProductLabel=Produto rótulo
-ProductLabelTranslated=Translated product label
-ProductDescriptionTranslated=Translated product description
-ProductNoteTranslated=Translated product note
+ProductRef=Ref. de produto
+ProductLabel=Etiqueta do produto
+ProductLabelTranslated=Etiqueta do produto traduzida
+ProductDescriptionTranslated=Categoria do produto traduzida
+ProductNoteTranslated=Nota do produto traduzida
 ProductServiceCard=Ficha de produto/serviço
 TMenuProducts=Produtos
 TMenuServices=Serviços
@@ -22,21 +22,21 @@ MassBarcodeInit=Mass barcode init
 MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
 ProductAccountancyBuyCode=Código de contabilidade (compra)
 ProductAccountancySellCode=Código de contabilidade (venda)
-ProductAccountancySellIntraCode=Accounting code (sale intra-community)
-ProductAccountancySellExportCode=Accounting code (sale export)
+ProductAccountancySellIntraCode=Código de contabilidade (venda intra-comunitária)
+ProductAccountancySellExportCode=Código de contabilidade (venda exportação)
 ProductOrService=Produto ou Serviço
 ProductsAndServices=Produtos e Serviços
 ProductsOrServices=Produtos ou Serviços
-ProductsPipeServices=Products | Services
-ProductsOnSaleOnly=Products for sale only
-ProductsOnPurchaseOnly=Products for purchase only
+ProductsPipeServices=Produtos | Serviços
+ProductsOnSaleOnly=Apenas produtos para venda
+ProductsOnPurchaseOnly=Apenas produtos para compra
 ProductsNotOnSell=Produtos não vendidos e não disponíveis para compra
 ProductsOnSellAndOnBuy=Produtos para compra e venda
-ServicesOnSaleOnly=Services for sale only
-ServicesOnPurchaseOnly=Services for purchase only
+ServicesOnSaleOnly=Serviços apenas para venda
+ServicesOnPurchaseOnly=Serviços apenas para compra
 ServicesNotOnSell=Serviços não à venda e não disponíveis para compra
 ServicesOnSellAndOnBuy=Serviços para compra e venda
-LastModifiedProductsAndServices=Os últimos %s produtos/serviços modificados
+LastModifiedProductsAndServices=Últimos %s produtos/serviços modificados
 LastRecordedProducts=Os últimos %s produtos registados
 LastRecordedServices=Os últimos %s serviços registados
 CardProduct0=Ficha de Produto
@@ -70,6 +70,7 @@ SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=Novo preço
 MinPrice=Preço de venda mínimo
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=O preço de venda não pode ser inferior ao mínimo permitido para este produto ( %s sem impostos)
 ContractStatusClosed=Fechado
 ErrorProductAlreadyExists=Um produto com a referencia %s já existe.
@@ -145,9 +146,9 @@ RowMaterial=Matéria Prima
 CloneProduct=Copie produto ou serviço
 ConfirmCloneProduct=Tem certeza de que deseja clonar este produto ou serviço <b>%s</b>?
 CloneContentProduct=Copie todas as principais informações do produto / serviço
-ClonePricesProduct=Clone prices
+ClonePricesProduct=Clone preços
 CloneCompositionProduct=Clonar produto/serviço embalado
-CloneCombinationsProduct=Clone product variants
+CloneCombinationsProduct=Clonar variantes de produto
 ProductIsUsed=Este produto é utilizado
 NewRefForClone=Ref. do novo produto / serviço
 SellingPrices=Selling prices
@@ -155,7 +156,7 @@ BuyingPrices=Buying prices
 CustomerPrices=Preços aos clientes
 SuppliersPrices=Preços dos fornecedores
 SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
-CustomCode=Código de alfândega/mercadoria/SH
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=País de origem
 Nature=Natureza
 ShortLabel=Short label
@@ -222,11 +223,11 @@ PageToGenerateBarCodeSheets=With this tool, you can print sheets of bar code sti
 NumberOfStickers=Number of stickers to print on page
 PrintsheetForOneBarCode=Print several stickers for one barcode
 BuildPageToPrint=Gerar página para impressão
-FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
-FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
-DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
+FillBarCodeTypeAndValueManually=Preencha o tipo de código de barras e o valor, manualmente.
+FillBarCodeTypeAndValueFromProduct=Preencha o tipo de código de barras e o valor a partir do código de barras de um produto.
+FillBarCodeTypeAndValueFromThirdParty=Preencha o tipo de código de barras e o valor a partir do código de barras de um terceiro.
+DefinitionOfBarCodeForProductNotComplete=Definição do tipo ou valor do código de barras não completo para o produto %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definição do tipo ou valor do código de barras não completo para o terceiro %s.
 BarCodeDataForProduct=Informações de código de barras do produto %s:
 BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Define barcode value for all record (this will also reset barcode value already defined with new values)
@@ -302,16 +303,16 @@ ProductAttributeDeleteDialog=Are you sure you want to delete this attribute? All
 ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with reference "%s" of this attribute?
 ProductCombinationDeleteDialog=Are you sure want to delete the variant of the product "<strong>%s</strong>"?
 ProductCombinationAlreadyUsed=There was an error while deleting the variant. Please check it is not being used in any object
-ProductCombinations=Variants
-PropagateVariant=Propagate variants
+ProductCombinations=Variantes
+PropagateVariant=Propagar variantes
 HideProductCombinations=Hide products variant in the products selector
 ProductCombination=Variant
 NewProductCombination=New variant
 EditProductCombination=Editing variant
-NewProductCombinations=New variants
-EditProductCombinations=Editing variants
+NewProductCombinations=Novas variantes
+EditProductCombinations=Edição de variantes
 SelectCombination=Select combination
-ProductCombinationGenerator=Variants generator
+ProductCombinationGenerator=Gerador de variantes
 Features=Features
 PriceImpact=Price impact
 WeightImpact=Weight impact
diff --git a/htdocs/langs/pt_PT/projects.lang b/htdocs/langs/pt_PT/projects.lang
index 5ab7dc10990..d5fcb1a7e81 100644
--- a/htdocs/langs/pt_PT/projects.lang
+++ b/htdocs/langs/pt_PT/projects.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - projects
 RefProject=Ref. do projeto
-ProjectRef=Ref. do Projeto
+ProjectRef=Ref. do projeto
 ProjectId=Id. do Projeto
 ProjectLabel=Nome do Projeto
 ProjectsArea=Área de Projetos
 ProjectStatus=Estado do projeto
 SharedProject=Toda a Gente
 PrivateProject=Contactos do Projeto
-ProjectsImContactFor=Projects I'm explicitely a contact of
+ProjectsImContactFor=Projetos nos quais sou um contacto
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=Todos os Projetos
 MyProjectsDesc=This view is limited to projects you are a contact for
@@ -23,7 +23,7 @@ TasksPublicDesc=Esta visualização apresenta todos os projetos e tarefas que es
 TasksDesc=Esta visualização apresenta todos os projetos e tarefas (as suas permissões de utilizador concedem-lhe permissão para ver tudo).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
 OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yourself if it is not visible and you need to enter time on it.
-ImportDatasetTasks=Tasks of projects
+ImportDatasetTasks=Tarefas dos projetos
 ProjectCategories=Project tags/categories
 NewProject=Novo Projeto
 AddProject=Criar Projeto
@@ -31,8 +31,8 @@ DeleteAProject=Apagar um Projeto
 DeleteATask=Apagar uma Tarefa
 ConfirmDeleteAProject=Tem certeza de que deseja eliminar este projeto?
 ConfirmDeleteATask=Tem certeza de que deseja eliminar esta tarefa?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
+OpenedProjects=Projetos abertos
+OpenedTasks=Abrir tarefas
 OpportunitiesStatusForOpenedProjects=Quantia das oportunidades de projetos abertos, por estado
 OpportunitiesStatusForProjects=Quantia das oportunidades de projetos, por estado
 ShowProject=Mostrar Projeto
@@ -51,7 +51,7 @@ TaskTimeSpent=Tempo despendido nas tarefas
 TaskTimeUser=Utilizador
 TaskTimeNote=Nota
 TaskTimeDate=Data
-TasksOnOpenedProject=Tasks on open projects
+TasksOnOpenedProject=Tarefas em projetos abertos
 WorkloadNotDefined=Carga de trabalho não definida
 NewTimeSpent=Tempos Dispendidos
 MyTimeSpent=Meu Tempo Dispendido
@@ -77,10 +77,11 @@ Time=Tempo
 ListOfTasks=Lista de tarefas
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Ir para a lista de tarefas
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=Lista de Orçamentos Associados ao Projeto
 ListOrdersAssociatedProject=Lista de encomendas de clientes associadas ao projeto
-ListInvoicesAssociatedProject=Lista de faturas de clientes associadas ao projeto
+ListInvoicesAssociatedProject=Lista de faturas a clientes associadas ao projeto
 ListPredefinedInvoicesAssociatedProject=Lista de faturas modelo de clientes associadas ao projeto
 ListSupplierOrdersAssociatedProject=Lista de notas de encomenda de fornecedores associadas ao projeto
 ListSupplierInvoicesAssociatedProject=Lista de faturas de fornecedores associadas ao projeto
@@ -147,9 +148,9 @@ TaskModifiedInDolibarr=%s tarefas modificadas
 TaskDeletedInDolibarr=%s tarefas apagadas
 OpportunityStatus=Estado da oportunidade
 OpportunityStatusShort=Estado da Opu.
-OpportunityProbability=Opportunity probability
+OpportunityProbability=Probabilidade da oportunidade
 OpportunityProbabilityShort=Opp. probab.
-OpportunityAmount=Opportunity amount
+OpportunityAmount=Montante da oportunidade
 OpportunityAmountShort=Opp. amount
 OpportunityAmountAverageShort=Average Opp. amount
 OpportunityAmountWeigthedShort=Weighted Opp. amount
@@ -200,10 +201,10 @@ TasksStatistics=Statistics on project/lead tasks
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
-OpenedProjectsByThirdparties=Open projects by third parties
+OpenedProjectsByThirdparties=Projetos abertos, por terceiros
 OnlyOpportunitiesShort=Apenas oportunidades
 OpenedOpportunitiesShort=Open opportunities
-NotAnOpportunityShort=Not an opportunity
+NotAnOpportunityShort=Não é uma oportunidade
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
 OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
@@ -217,7 +218,7 @@ OppStatusLOST=Perdido
 Budget=Orçamento
 AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>Supported values :</u><br>- Keep empty: Can link any project of the company (default)<br>- "all" : Can link any projects, even project of other companies<br>- A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)<br>
 LatestProjects=Latest %s projects
-LatestModifiedProjects=Latest %s modified projects
+LatestModifiedProjects=Últimos %s projetos modificados 
 OtherFilteredTasks=Other filtered tasks
 NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
 # Comments trans
@@ -226,4 +227,4 @@ AllowCommentOnProject=Allow user comments on projects
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=O projeto %s deve estar ativo para ser desativado
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/pt_PT/propal.lang b/htdocs/langs/pt_PT/propal.lang
index 7195490b3f6..5bc8c415222 100644
--- a/htdocs/langs/pt_PT/propal.lang
+++ b/htdocs/langs/pt_PT/propal.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - propal
-Proposals=Orçamentos
-Proposal=Orçamento
+Proposals=Propostas comerciais
+Proposal=Proposta comercial
 ProposalShort=Orçamento
 ProposalsDraft=Orçamentos Rascunho
 ProposalsOpened=Orçamentos a clientes abertos
@@ -16,7 +16,7 @@ AddProp=Criar orçamento
 ConfirmDeleteProp=Tem a certeza que pretende eliminar este orçamento?
 ConfirmValidateProp=Tem certeza de que deseja validar este orçamento com o nome <b>%s</b>?
 LastPropals=Os últimos %s orçamentos
-LastModifiedProposals=Os últimos %s orçamentos modificados
+LastModifiedProposals=Últimos %s orçamentos modificados
 AllPropals=Todos Os Orçamentos
 SearchAProposal=Procurar um Orçamento
 NoProposal=Nenhum orçamento
diff --git a/htdocs/langs/pt_PT/receiptprinter.lang b/htdocs/langs/pt_PT/receiptprinter.lang
index 2cb96338772..e1d460b6b9f 100644
--- a/htdocs/langs/pt_PT/receiptprinter.lang
+++ b/htdocs/langs/pt_PT/receiptprinter.lang
@@ -1,28 +1,28 @@
 # Dolibarr language file - Source file is en_US - receiptprinter
-ReceiptPrinterSetup=Setup of module ReceiptPrinter
+ReceiptPrinterSetup=Configuração do módulo Recibo / Impressora
 PrinterAdded=Adicionada a impressora %s
 PrinterUpdated=Atualizada a impressora %s
 PrinterDeleted=Eliminada a impressora %s
 TestSentToPrinter=Teste Enviado para a Impressora %s
-ReceiptPrinter=Receipt printers
-ReceiptPrinterDesc=Setup of receipt printers
-ReceiptPrinterTemplateDesc=Setup of Templates
+ReceiptPrinter=Impressoras de recibo
+ReceiptPrinterDesc=Configurar impressoras de recibo
+ReceiptPrinterTemplateDesc=Configuração de Modelos
 ReceiptPrinterTypeDesc=Description of Receipt Printer's type
 ReceiptPrinterProfileDesc=Description of Receipt Printer's Profile
-ListPrinters=List of Printers
+ListPrinters=Lista de Impressoras
 SetupReceiptTemplate=Template Setup
-CONNECTOR_DUMMY=Dummy Printer
+CONNECTOR_DUMMY=Impressora de Teste
 CONNECTOR_NETWORK_PRINT=Impressora de Rede
 CONNECTOR_FILE_PRINT=Impressora Local
 CONNECTOR_WINDOWS_PRINT=Impressora do Windows Local
-CONNECTOR_DUMMY_HELP=Fake Printer for test, does nothing
+CONNECTOR_DUMMY_HELP=Impressora de Teste para testar, não faz nada
 CONNECTOR_NETWORK_PRINT_HELP=10.x.x.x:9100
 CONNECTOR_FILE_PRINT_HELP=/dev/usb/lp0, /dev/usb/lp1
 CONNECTOR_WINDOWS_PRINT_HELP=LPT1, COM1, smb://FooUser:secret@computername/workgroup/Receipt Printer
-PROFILE_DEFAULT=Default Profile
-PROFILE_SIMPLE=Simple Profile
+PROFILE_DEFAULT=Perfil Predefinido
+PROFILE_SIMPLE=Perfil Simples
 PROFILE_EPOSTEP=Epos Tep Profile
-PROFILE_P822D=P822D Profile
+PROFILE_P822D=Perfil P822D
 PROFILE_STAR=Star Profile
 PROFILE_DEFAULT_HELP=Default Profile suitable for Epson printers
 PROFILE_SIMPLE_HELP=Simple Profile No Graphics
diff --git a/htdocs/langs/pt_PT/salaries.lang b/htdocs/langs/pt_PT/salaries.lang
index 9414ac2143d..354fdd9a91d 100644
--- a/htdocs/langs/pt_PT/salaries.lang
+++ b/htdocs/langs/pt_PT/salaries.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - salaries
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Conta contabilística usada para terceiros
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=A conta contabilidade definida na ficha do utilizador será usada apenas para o Livro Auxiliar de contabilidade. Este será usado para o Livro Razão e como valor padrão da contabilidade do Livro Auxiliar se a conta de contabilidade do utilizador não estiver definida.
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Conta contabilística utilizada para utilizadores de terceiros
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=A conta de contabilidade dedicada definida na ficha do utilizador será utilizada apenas para o 'Livro Auxiliar' de contabilidade. Este será utilizado para o 'Livro Razão' e como valor predefinido do 'Livro Auxiliar' da contabilidade se a conta de contabilidade do utilizador dedicada não estiver definida.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Conta contabilística usada por defeito para pagamentos de salários
 Salary=Salário
 Salaries=Salários
@@ -15,4 +15,4 @@ THMDescription=Esse valor pode ser usado para calcular o custo do tempo consumid
 TJMDescription=Esse valor é atualmente serve apenas como informação e não é utilizado em qualquer cálculo
 LastSalaries=Últimos %s pagamentos salariais
 AllSalaries=Todos os pagamentos salariais
-SalariesStatistics=Statistiques salaires
+SalariesStatistics=Estatísticas salariais
diff --git a/htdocs/langs/pt_PT/sendings.lang b/htdocs/langs/pt_PT/sendings.lang
index 1d8df148b7e..0341b92f5de 100644
--- a/htdocs/langs/pt_PT/sendings.lang
+++ b/htdocs/langs/pt_PT/sendings.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - sendings
-RefSending=Ref. de Envio
-Sending=Envio
+RefSending=Ref. de expedição
+Sending=Expedição
 Sendings=Envios
 AllSendings=Todos os Despachos
 Shipment=Envio
@@ -24,7 +24,7 @@ QtyToShip=Quant. a Enviar
 QtyReceived=Quant. Recebida
 QtyInOtherShipments=Qty in other shipments
 KeepToShip=Remain to ship
-KeepToShipShort=Remain
+KeepToShipShort=Restante
 OtherSendingsForSameOrder=Outros Envios deste Pedido
 SendingsAndReceivingForSameOrder=Envios e receções para esta encomenda
 SendingsToValidate=Expedições por validar
@@ -35,7 +35,7 @@ StatusSendingProcessed=Processado
 StatusSendingDraftShort=Rascunho
 StatusSendingValidatedShort=Validado
 StatusSendingProcessedShort=Processado
-SendingSheet=Shipment sheet
+SendingSheet=Folha de expedição
 ConfirmDeleteSending=Tem certeza de que deseja eliminar esta expedição?
 ConfirmValidateSending=Tem a certeza de que deseja validar esta expedição com a referência <b> %s </b>?
 ConfirmCancelSending=Are you sure you want to cancel this shipment?
diff --git a/htdocs/langs/pt_PT/sms.lang b/htdocs/langs/pt_PT/sms.lang
index a163a8d9f42..3df936b6a06 100644
--- a/htdocs/langs/pt_PT/sms.lang
+++ b/htdocs/langs/pt_PT/sms.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - sms
 Sms=Sms
-SmsSetup=Sms configuração
+SmsSetup=Configurar Sms
 SmsDesc=Esta página permite que você defina opções globais de SMS ou características
 SmsCard=Ficha de SMS
 AllSms=Todos Campanhas SMS
diff --git a/htdocs/langs/pt_PT/stocks.lang b/htdocs/langs/pt_PT/stocks.lang
index c94f9999a00..4c20b3caa5f 100644
--- a/htdocs/langs/pt_PT/stocks.lang
+++ b/htdocs/langs/pt_PT/stocks.lang
@@ -1,16 +1,16 @@
 # Dolibarr language file - Source file is en_US - stocks
 WarehouseCard=Ficha do armazém
-Warehouse=Armazem
+Warehouse=Armazém
 Warehouses=Armazéns
-ParentWarehouse=Parent warehouse
+ParentWarehouse=Armazém Principal
 NewWarehouse=Novo Armazem ou Zona de Armazenagem
 WarehouseEdit=Modificar armazém
 MenuNewWarehouse=Novo Armazem
 WarehouseSource=Armazem Origem
 WarehouseSourceNotDefined=Sem armazém definido
-AddWarehouse=Create warehouse
+AddWarehouse=Criar armazém
 AddOne=Adicionar um
-DefaultWarehouse=Default warehouse
+DefaultWarehouse=Armazém predefinido
 WarehouseTarget=Armazem Destino
 ValidateSending=Confirmar Envío
 CancelSending=Cancelar Envío
@@ -18,22 +18,22 @@ DeleteSending=Eliminar Envío
 Stock=Stock
 Stocks=Stocks
 StocksByLotSerial=Stocks by lot/serial
-LotSerial=Lots/Serials
-LotSerialList=List of lot/serials
+LotSerial=Lotes / Nr. Série
+LotSerialList=Lista de lote / nr. série
 Movements=Movimentos
 ErrorWarehouseRefRequired=O nome de referencia do armazem é obrigatório
 ListOfWarehouses=Lista de Armazens
 ListOfStockMovements=Lista de movimentos de stock
-ListOfInventories=List of inventories
-MovementId=Movement ID
-StockMovementForId=Movement ID %d
+ListOfInventories=Lista de inventários
+MovementId=Id. do Movimento
+StockMovementForId=Id. do Movimento %d
 ListMouvementStockProject=List of stock movements associated to project
-StocksArea=Warehouses area
+StocksArea=Área de armazéns
 Location=Localização
 LocationSummary=Nome abreviado da localização
-NumberOfDifferentProducts=Number of different products
+NumberOfDifferentProducts=Número de produtos diferentes
 NumberOfProducts=Numero total de produtos
-LastMovement=Latest movement
+LastMovement=Movimentos mais recentes
 LastMovements=Latest movements
 Units=Unidades
 Unit=Unidade
@@ -203,3 +203,4 @@ RegulateStock=Regulate Stock
 ListInventory=Lista
 StockSupportServices=Stock management support services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/pt_PT/stripe.lang b/htdocs/langs/pt_PT/stripe.lang
index 81d46eb1ae1..d94cf0d0e4e 100644
--- a/htdocs/langs/pt_PT/stripe.lang
+++ b/htdocs/langs/pt_PT/stripe.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - stripe
-StripeSetup=Configuração do módulo Stripe
+StripeSetup=Configurar módulo de Stripe
 StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 StripeOrCBDoPayment=Pagar com cartão de crédito ou Stripe
 FollowingUrlAreAvailableToMakePayments=As seguintes URL estão disponiveis para permitir a um cliente efectuar um pagamento
@@ -58,8 +58,8 @@ NameOnCard=Name on card
 CardNumber=Card Number
 ExpiryDate=Expiry Date
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Criar cliente no Stripe
 CreateCardOnStripe=Criar ficha no Stripe
 ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/pt_PT/supplier_proposal.lang b/htdocs/langs/pt_PT/supplier_proposal.lang
index 60d097fde28..91544b07cda 100644
--- a/htdocs/langs/pt_PT/supplier_proposal.lang
+++ b/htdocs/langs/pt_PT/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Orçamentos de fornecedores
-supplier_proposalDESC=Gerir pedidos de preço aos fornecedores
+SupplierProposal=Propostas comerciais de fornecedor
+supplier_proposalDESC=Gerir pedidos de preço aos vendedores
 SupplierProposalNew=Novo pedido de preço
 CommRequest=Preço solicitado
 CommRequests=Preços solicitados
 SearchRequest=Encontrar um pedido
 DraftRequests=Pedidos rascunho
-SupplierProposalsDraft=Rascunhos de orçamentos de fornecedores
-LastModifiedRequests=Latest %s modified price requests
+SupplierProposalsDraft=Draft vendor proposals
+LastModifiedRequests=Últimos %s orçamentos de fornecedores modificados 
 RequestsOpened=Abrir pedidos de preço
-SupplierProposalArea=Área de orçamentos de fornecedores
-SupplierProposalShort=Orçamento do fornecedor
-SupplierProposals=Orçamentos de fornecedores
-SupplierProposalsShort=Orçamentos de fornecedores
+SupplierProposalArea=Área de propostas de fornecedor
+SupplierProposalShort=Proposta de fornecedor
+SupplierProposals=Propostas de fornecedor
+SupplierProposalsShort=Propostas de fornecedor
 NewAskPrice=Novo pedido de preço
-ShowSupplierProposal=Show price request
-AddSupplierProposal=Create a price request
-SupplierProposalRefFourn=Supplier ref
+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.
 ConfirmValidateAsk=Tem a certeza que pretende validar este pedido de preço com o nome <b> %s </b>?
@@ -47,9 +47,9 @@ CommercialAsk=Pedido de preço
 DefaultModelSupplierProposalCreate=Criação do modelo padrão
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposals=Lista de orçamentos de fornecedores
-ListSupplierProposalsAssociatedProject=Lista de orçamentos de fornecedores associados ao projeto
-SupplierProposalsToClose=Orçamentos de fornecedores por fechar
-SupplierProposalsToProcess=Orçamentos de fornecedores por processar
+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
diff --git a/htdocs/langs/pt_PT/suppliers.lang b/htdocs/langs/pt_PT/suppliers.lang
index 45a55271de9..e10632750cc 100644
--- a/htdocs/langs/pt_PT/suppliers.lang
+++ b/htdocs/langs/pt_PT/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
 Suppliers=Fornecedores
-SuppliersInvoice=Faturas do Fornecedor
-ShowSupplierInvoice=Mostrar fatura do fornecedor
-NewSupplier=Novo Fornecedor
+SuppliersInvoice=Fatura de fornecedor
+ShowSupplierInvoice=Mostrar Fatura do Fornecedor
+NewSupplier=Novo fornecedor
 History=Histórico
-ListOfSuppliers=Lista de Fornecedores
-ShowSupplier=Mostrar Fornecedor
+ListOfSuppliers=Lista de fornecedores
+ShowSupplier=Mostrar fornecedor
 OrderDate=Data Pedido
 BuyingPriceMin=Melhor preço de compra
 BuyingPriceMinShort=Melhor preço de compra
@@ -14,27 +14,27 @@ TotalSellingPriceMinShort=Total dos preços de venda dos subprodutos
 SomeSubProductHaveNoPrices=Alguns sub-produtos não têm preço definido
 AddSupplierPrice=Adicionar preço de compra
 ChangeSupplierPrice=Alterar o preço de compra
-SupplierPrices=Preços dos fornecedores
+SupplierPrices=Preços de fornecedor
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Este fornecedor de referência já está associado com uma referência: %s
-NoRecordedSuppliers=Sem Fornecedores Registados
-SupplierPayment=Pagamento a Fornecedor
-SuppliersArea=Área Fornecedores
-RefSupplierShort=Ref. Fornecedor
+NoRecordedSuppliers=Nenhum fornecedor registado
+SupplierPayment=Pagamento de fornecedor
+SuppliersArea=Área de forncedores
+RefSupplierShort=Ref. do fornecedor
 Availability=Disponibilidade
-ExportDataset_fournisseur_1=Faturas de fornecedores e linhas da fatura
-ExportDataset_fournisseur_2=Faturas de fornecedores e pagamentos
-ExportDataset_fournisseur_3=Pedidos a fornecedores e linhas de pedido
+ExportDataset_fournisseur_1=Lista de faturas de fornecedor e linhas de fatura
+ExportDataset_fournisseur_2=Faturas e pagamentos de fornecedor
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=Aprovar este Pedido
 ConfirmApproveThisOrder=Tem certeza de que deseja aprovar a encomenda <b> %s </b>?
 DenyingThisOrder=Negar esta encomenda
 ConfirmDenyingThisOrder=Tem certeza de que deseja recusar esta encomenda <b> %s </b>?
 ConfirmCancelThisOrder=Tem certeza de que deseja cancelar esta encomenda <b> %s </b>?
-AddSupplierOrder=Criar Pedido a Fornecedor
-AddSupplierInvoice=Criar Factura do Fornecedor
+AddSupplierOrder=Criar Ordem de Compra
+AddSupplierInvoice=Criar fatura de fornecedor
 ListOfSupplierProductForSupplier=Lista de produtos e preços do fornecedor <b>%s</b>
 SentToSuppliers=Enviado para os fornecedores
-ListOfSupplierOrders=Lista das encomendas do fornecedor
-MenuOrdersSupplierToBill=Encomendas do fornecedor para faturar
+ListOfSupplierOrders=Lista de ordens de compra
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Atraso da entrega em dias
 DescNbDaysToDelivery=O maior atraso na entrega dos produtos desta encomenda
 SupplierReputation=Reputação do fornecedor
@@ -44,4 +44,4 @@ ReputationForThisProduct=Reputação
 BuyerName=Nome do comprador
 AllProductServicePrices=Todos os preços de produtos/serviços
 AllProductReferencesOfSupplier=Todas as referências de produtos/serviços do fornecedor
-BuyingPriceNumShort=Preços dos fornecedores
+BuyingPriceNumShort=Preços de fornecedor
diff --git a/htdocs/langs/pt_PT/trips.lang b/htdocs/langs/pt_PT/trips.lang
index 3ed0ee808e3..f8bb5a56ec3 100644
--- a/htdocs/langs/pt_PT/trips.lang
+++ b/htdocs/langs/pt_PT/trips.lang
@@ -1,26 +1,26 @@
 # Dolibarr language file - Source file is en_US - trips
-ShowExpenseReport=Show expense report
-Trips=Relatórios de Despesas
+ShowExpenseReport=Mostrar relatório de despesas
+Trips=Relatórios de despesas
 TripsAndExpenses=Relatório de Despesas
 TripsAndExpensesStatistics=Estatísticas dos Relatórios de Despesas
 TripCard=Ficha do relatório de despesa
-AddTrip=Create expense report
+AddTrip=Criar relatório de despesas
 ListOfTrips=Lista de relatórios de despesas
 ListOfFees=Lista de Taxas
 TypeFees=Tipos de taxas
-ShowTrip=Show expense report
+ShowTrip=Mostrar relatório de despesas
 NewTrip=Novo relatório de despesas
 LastExpenseReports=Latest %s expense reports
-AllExpenseReports=All expense reports
-CompanyVisited=Company/organization visited
+AllExpenseReports=Todos os relatórios de despesas
+CompanyVisited=Empresa / organização visitada
 FeesKilometersOrAmout=Quantidade de Quilómetros
 DeleteTrip=Apagar relatório de despesas
 ConfirmDeleteTrip=Tem certeza de que deseja eliminar este relatório de despesas?
 ListTripsAndExpenses=Lista de relatórios de despesas
 ListToApprove=A aguardar aprovação
-ExpensesArea=Expense reports area
+ExpensesArea=Área dos relatórios de despesas
 ClassifyRefunded=Classificar como 'Reembolsado'
-ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApproval=Foi submetido um relatório de despesas para aprovação
 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
diff --git a/htdocs/langs/pt_PT/users.lang b/htdocs/langs/pt_PT/users.lang
index 8f14c13f796..a9b476db2d3 100644
--- a/htdocs/langs/pt_PT/users.lang
+++ b/htdocs/langs/pt_PT/users.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - users
-HRMArea=Área GRH
+HRMArea=Área de GRH
 UserCard=Ficha do utilizador
 GroupCard=Ficha do grupo
 Permission=Permissão
@@ -57,10 +57,10 @@ UserModified=Utilizador modificado com sucesso
 PhotoFile=Ficheiro de Fotografia
 ListOfUsersInGroup=Lista de Utilizadores neste grupo
 ListOfGroupsForUser=Lista de Grupos para este utilizador
-LinkToCompanyContact=Hiperligação para terceiros / contacto
-LinkedToDolibarrMember=Hiperligação para membro
-LinkedToDolibarrUser=Hiperligação para o utilizador do Dolibarr
-LinkedToDolibarrThirdParty=Hiperligação para terceiros do Dolibarr
+LinkToCompanyContact=Associar a terceiro / contacto
+LinkedToDolibarrMember=Associar a membro
+LinkedToDolibarrUser=Associar a utilizador do Dolibarr
+LinkedToDolibarrThirdParty=Associar a terceiro do Dolibarr
 CreateDolibarrLogin=Criar um Utilizador
 CreateDolibarrThirdParty=Criar um Terceiro
 LoginAccountDisableInDolibarr=A conta está desativada no Dolibarr.
@@ -69,8 +69,8 @@ InternalUser=Utilizador Interno
 ExportDataset_user_1=Utilizadores e Propriedades do Dolibarr
 DomainUser=Utilizador de Domínio %s
 Reactivate=Reativar
-CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=Este formulário permite que você crie um utilizador interno para a sua empresa/organização. Para criar um utilizador externo (cliente, fornecedor; terceiro), utilize o botão "Criar utilizador Dolibarr" a partir da ficha de contacto do terceiro.
+InternalExternalDesc=Um utilizador <b>interno</b>é um utilizador que faz parte de sua empresa/organização. <br>Um utilizador <b>externo</b>é um cliente, fornecedor ou outro. <br><br> Em ambos os casos, as permissões definem os direitos no Dolibarr, o utilizador externo também pode ter um gestor de menu diferente do utilizador interno (consulte Inicio -> Configurações -> Aparência)
 PermissionInheritedFromAGroup=A permissão dá-se já que o herda de um grupo ao qual pertenece o utilizador.
 Inherited=Herdado
 UserWillBeInternalUser=O utilizador criado irá ser um utilizador interno (porque não está interligado com um terceiro em particular)
@@ -93,7 +93,7 @@ NameToCreate=Nome do Terceiro a Criar
 YourRole=As suas funções
 YourQuotaOfUsersIsReached=A sua quota de utilizadores ativos foi atingida!
 NbOfUsers=N º de Utilizadores
-NbOfPermissions=Nb of permissions
+NbOfPermissions=Número de permissões
 DontDowngradeSuperAdmin=Apenas um superadmin pode desclassificar um superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Visualização Hierárquica
diff --git a/htdocs/langs/pt_PT/website.lang b/htdocs/langs/pt_PT/website.lang
index cf74b572dc6..974fa46bc11 100644
--- a/htdocs/langs/pt_PT/website.lang
+++ b/htdocs/langs/pt_PT/website.lang
@@ -3,8 +3,8 @@ Shortname=Código
 WebsiteSetupDesc=Crie aqui as entradas e o número de diferentes sites da Web que precisar. Depois vá ao menu de Sites da Web para editá-los.
 DeleteWebsite=Eliminar site da Web
 ConfirmDeleteWebsite=Tem a certeza que deseja eliminar este site da Web. Também irão ser removidos todas as suas páginas e conteúdo.
-WEBSITE_TYPE_CONTAINER=Type of page/container
-WEBSITE_PAGE_EXAMPLE=Web page to use as example
+WEBSITE_TYPE_CONTAINER=Tipo de página / recipiente
+WEBSITE_PAGE_EXAMPLE=Página da Web para utilizar como exemplo
 WEBSITE_PAGENAME=Nome/pseudonimo da página
 WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_CSS_URL=URL do ficheiro CSS externo
@@ -12,23 +12,23 @@ WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
+WEBSITE_HTACCESS=Ficheiro .htaccess de site da Web
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
 MediaFiles=Bliblioteca de Multimedia
-EditCss=Edit Style/CSS or HTML header
+EditCss=Editar Estilo/CSS ou cabeçalho de HTML
 EditMenu=Editar Menu
 EditMedias=Edit medias
 EditPageMeta=Editar Metadados
-AddWebsite=Add website
-Webpage=Web page/container
-AddPage=Add page/container
-HomePage=Home Page
-PageContainer=Page/container
+AddWebsite=Adicionar site da Web
+Webpage=Página/recipiente da Web
+AddPage=Adicionar página/recipiente
+HomePage=Página Inicial
+PageContainer=Página/recipiente
 PreviewOfSiteNotYetAvailable=A pré-visualização do seu site da Web <strong>%s</strong> ainda mão está disponível. Deve adicionar primeiro uma página.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
-PageContent=Page/Contenair
+PageContent=Página / Recipiente
 PageDeleted=Page/Contenair '%s' of website %s deleted
 PageAdded=Page/Contenair '%s' added
 ViewSiteInNewTab=Ver site no novo separador
@@ -73,7 +73,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
diff --git a/htdocs/langs/pt_PT/withdrawals.lang b/htdocs/langs/pt_PT/withdrawals.lang
index 81be5830a28..4946c432c0f 100644
--- a/htdocs/langs/pt_PT/withdrawals.lang
+++ b/htdocs/langs/pt_PT/withdrawals.lang
@@ -1,14 +1,14 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Direct debit payment orders area
-SuppliersStandingOrdersArea=Direct credit payment orders area
-StandingOrdersPayment=Direct debit payment orders
-StandingOrderPayment=Direct debit payment order
-NewStandingOrder=New direct debit order
+CustomersStandingOrdersArea=Área das ordens de pagamento de débito direto
+SuppliersStandingOrdersArea=Área das ordens de pagamento de débito direto
+StandingOrdersPayment=Ordens de pagamento de débito direto
+StandingOrderPayment=Débito direto
+NewStandingOrder=Nova ordem de pagamento de débito direto
 StandingOrderToProcess=Para processar
 WithdrawalsReceipts=Encomenda de débito direto
 WithdrawalReceipt=Encomenda de Débito Direto
 LastWithdrawalReceipts=Latest %s direct debit files
-WithdrawalsLines=Direct debit order lines
+WithdrawalsLines=Linhas de ordem de débito direto
 RequestStandingOrderToTreat=Request for direct debit payment order to process
 RequestStandingOrderTreated=Request for direct debit payment order processed
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
@@ -16,12 +16,12 @@ NbOfInvoiceToWithdraw=Nb. of qualified invoice with waiting direct debit order
 NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Quantidade a Levantar
-WithdrawsRefused=Direct debit refused
+WithdrawsRefused=Débito direto recusado
 NoInvoiceToWithdraw=Não existe nenhuma fatura à espera com 'Pedidos de débito direto' abertos. Vá ao separador '%s' na ficha da fatura para fazer um pedido.
 ResponsibleUser=Utilizador Responsável dos Débitos Directos
-WithdrawalsSetup=Direct debit payment setup
-WithdrawStatistics=Direct debit payment statistics
-WithdrawRejectStatistics=Direct debit payment reject statistics
+WithdrawalsSetup=Configurar pagamento de débito direto
+WithdrawStatistics=Estatísticas de pagamento de débito direto
+WithdrawRejectStatistics=Estatísticas de pagamento de débito direto rejeitado
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
diff --git a/htdocs/langs/pt_PT/workflow.lang b/htdocs/langs/pt_PT/workflow.lang
index adc8112cb89..2205f9d76fa 100644
--- a/htdocs/langs/pt_PT/workflow.lang
+++ b/htdocs/langs/pt_PT/workflow.lang
@@ -1,20 +1,20 @@
 # Dolibarr language file - Source file is en_US - workflow
-WorkflowSetup=Configuração do módulo de Fluxo de Trabalho
-WorkflowDesc=Este módulo foi projetado para modificar o comportamento das ações automáticas na aplicação. Por defeito, o fluxo de trabalho é aberto (você pode fazer as coisas na ordem que deseja). Você pode ativar as ações automáticas do seu interesse.
+WorkflowSetup=Configurar módulo de fluxo de frabalho
+WorkflowDesc=Este módulo foi criado para modificar o comportamento das ações automáticas na aplicação. Por predefinição, o fluxo de trabalho está aberto (pode fazer as coisas na ordem que desejar). Pode ativar as ações automáticas em que está interessado.
 ThereIsNoWorkflowToModify=Não há modificações de fluxo de trabalho disponíveis para os módulos ativados.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed (new order will have same amount than proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Criar automaticamente uma encomenda de cliente após a assinatura de um orçamento (a nova encomenda terá o mesmo valor que o orçamento)
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (new invoice will have same amount than proposal)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Criar automaticamente uma fatura de cliente após a validação de um contrato
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed (new invoice will have same amount than order)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer order is set to billed (and if amount of the order is same than total amount of signed linked proposals)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classifique o(s) orçamentos(s) associados como faturados quando uma encomenda de um cliente é classificada como faturada (e se a quantidade da encomenda for igual à quantidade total dos orçamentos assinados associados)
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classifique os orçamentos de clientes vinculados como faturados quando a fatura do cliente é validada (e se o valor da fatura for igual ao montante total dos orçamentos, assinados, vinculados)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classifique a encomenda do cliente vinculada como enviada quando uma expedição é validada (e se a quantidade enviada por todas as expedições for idêntica à da encomenda a atualizar)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classifique os pedidos de orçamento do fornecedor vinculados como faturados quando a fatura do fornecedor é validada (e se o montante da fatura for igual ao montante total dos pedidos de orçamento vinculados)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classifique as notas de encomenda de fornecedores vinculadas como faturadas quando a fatura do fornecedor é validada (e se o valor da fatura for igual ao total das notas de encomenda vinculadas)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=Criação automática
 AutomaticClassification=Classificação automática
diff --git a/htdocs/langs/ro_RO/accountancy.lang b/htdocs/langs/ro_RO/accountancy.lang
index 3fac49d0d52..52c9ee0f9dc 100644
--- a/htdocs/langs/ro_RO/accountancy.lang
+++ b/htdocs/langs/ro_RO/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Contabilitate
 ACCOUNTING_EXPORT_SEPARATORCSV= Separator coloane pentru fisier export
 ACCOUNTING_EXPORT_DATE=Format date pentru fisiere export
 ACCOUNTING_EXPORT_PIECE=Export the number of piece
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Accounts with non zero values
 ListOfAccounts=List of accounts
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers 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
 
-AccountancyArea=Contabilitate
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Utilizarea modulului de contabilitate se face în mai multe etape:
 AccountancyAreaDescActionOnce=Următoarele acțiuni sunt executate de obicei doar o singură dată sau o dată pe an ...
 AccountancyAreaDescActionOnceBis=Următorii pași trebuie făcuți pentru a vă economisi timpul în viitor prin sugerarea contului contabil implicit corect atunci când efectuați jurnalizarea (scrierea înregistrărilor în Jurnale și în registrul Cartea Mare).
@@ -89,7 +90,7 @@ MenuProductsAccounts=Conturi de produs
 ProductsBinding=Conturi de produse
 Ventilation=Asocierea la conturi
 CustomersVentilation=Asocierea facturii cu clientul
-SuppliersVentilation=Asocierea facturii cu furnizorul
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Raportul de cheltuieli obligatoriu
 CreateMvts=Creați o nouă tranzacție
 UpdateMvts=Modificarea unei tranzacții
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=Jurnal cumpărări
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Journal Diverse
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Jurnalul raportului de cheltuieli
 ACCOUNTING_SOCIAL_JOURNAL=Jurnal Asigurări Sociale
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Contul contabil al transferului
 ACCOUNTING_ACCOUNT_SUSPENSE=Contul contabil de așteptare
@@ -185,11 +187,12 @@ ListeMvts=Lista mișcărilor
 ErrorDebitCredit=Debitul și creditul nu pot avea o valoare, în același timp,
 AddCompteFromBK=Adăugați conturi contabile grupului
 ReportThirdParty=Listează contul terță parte
-DescThirdPartyReport=Consultați aici lista clienților și furnizorilor terță parte și a conturile lor contabile
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=Lista conturilor contabile
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Group of account
 Pcgsubtype=Subgroup of account
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Consultați aici lista liniilor de facturare pentru clien
 DescVentilTodoCustomer=Ascoiază linii de facturare care nu sunt deja legate de contul contabil al produsului
 ChangeAccount=Modificați contul contabil al produsului / serviciului pentru liniile selectate cu următorul cont contabil:
 Vide=-
-DescVentilSupplier=Consultați aici lista liniilor de facturare a furnizorilor asociate sau nu încă unui cont contabil de produs
-DescVentilDoneSupplier=Consultati aici lista liniilor de facturi furnizor și conturile lor  contabile
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Linii de raportare a cheltuielilor care nu sunt deja asociate unui cont contabile de taxe
 DescVentilExpenseReport=Consultați aici lista liniilor de raportare a cheltuielilor asociate (sau nu) unui cont contabile de taxe
 DescVentilExpenseReportMore=Dacă configurați contul contabil pe linii de raportare a tipurilor de cheltuieli, aplicația va putea face asocierea între liniile dvs. de raportare a cheltuielilor și contul contabil al planului dvs. de conturi, printr-un singur clic cu butonul <strong> "%s" </strong>. În cazul în care contul nu a fost stabilit în dicționarul de taxe sau dacă aveți încă anumite linii care nu sunt asociate niciunui cont, va trebui să faceți o asociere manuală din meniul "<strong> %s </strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Asociază automat
 AutomaticBindingDone=Asociere automată făcută
 
 ErrorAccountancyCodeIsAlreadyUse=Eroare, nu puteți șterge acest cont contabil, deoarece este folosit
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Card asociat
 GeneralLedgerIsWritten=Tranzacțiile sunt scrise în Cartea Mare
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -293,4 +296,9 @@ Binded=Linii asociate
 ToBind=Linii de asociat
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index a71415d450e..e3c9b74582c 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=SMTP-gazdă (în mod implicit în <b>php.ini: %s)</b>
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP Port (Nu este definită în PHP pe Unix, cum ar fi sisteme)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP-gazdă (Nu este definită în PHP pe Unix, cum ar fi sisteme)
 MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= Trimite un mod sistematic ascunse carbon copie a tuturor e-mailuri trimise la
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=Metoda de a folosi pentru a trimite email-uri
 MAIN_MAIL_SMTPS_ID=SMTP ID-ul de autentificare necesare în cazul în
 MAIN_MAIL_SMTPS_PW=SMTP parola, dacă se cere autentificare
@@ -291,7 +292,7 @@ ModuleSetup=Configurare Modul
 ModulesSetup=Configurare Module / Aplicație
 ModuleFamilyBase=Sistem
 ModuleFamilyCrm=Clientul Ressource Management (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Managementul Produselor (PM)
 ModuleFamilyHr=Management Resurse Umane (HR)
 ModuleFamilyProjects=Proiecte
@@ -373,7 +374,8 @@ NoSmsEngine=Nu expeditor SMS Manager disponibile. SMS expeditor manager nu sunt
 PDF=PDF
 PDFDesc=Puteţi seta opţiunile de fiecare globale referitoare la generarea PDF
 PDFAddressForging=Reguli de creare a casetelor adresa
-HideAnyVATInformationOnPDF=Ascunde toate informaţiile referitoare la TVA-ul pe PDF generate
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=Ascunde descrierea produselor pe PDF ul generat
@@ -445,7 +447,8 @@ DisplayCompanyInfo=Afiseaza adresa societatii
 DisplayCompanyManagers=Afiseaza nume manager
 DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party 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.
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Set this to 1 if you want to attach main document to emai
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=Utilizatori & grupuri
 Module0Desc=Managementul Utilizatorilor/Angajaților și Grupurilor
@@ -479,7 +485,7 @@ Module1Desc=Managementul terţilor (societăţi, particulari) şi contactelor
 Module2Name=Comercial
 Module2Desc=Management Comercial
 Module10Name=Contabilitate
-Module10Desc=Contabilitate  simplă de gestiune ( jurnale , cifră afaceri) bazată pe baza de date. Fără ventilare.
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=Oferte
 Module20Desc=Managementul Ofertelor Comerciale
 Module22Name=Emailing
@@ -546,8 +552,8 @@ Module400Name=Proiecte / Oportunitati  / Prospecți
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integrare
-Module500Name=Cheltuieli speciale
-Module500Desc=Managementul cheltuielilor speciale (impozite, taxe sociale sau fiscale, dividende)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Plata salariilor angajaților
 Module510Desc=Înregistrați și urmați plata salariilor angajaților dvs.
 Module520Name=Credit
@@ -561,14 +567,14 @@ Module700Name=Donatii
 Module700Desc=MAnagementul Donaţiilor
 Module770Name=Rapoarte Cheltuieli
 Module770Desc=Managementul rapoartelor de cheltuieli (transport, masă, ...)
-Module1120Name=Ofertă Comercială Furnizor
-Module1120Desc=Cereti oferta comerciala si preturile furnizorului
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Mantis integrare
 Module1520Name=Generare Document 
 Module1520Desc=Generarea de documente de poștă electronică in masa
 Module1780Name=Tag-uri / Categorii
-Module1780Desc=Creați etichete/categorii (produse, clienti, furnizori, contacte sau membri)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=Fckeditor
 Module2000Desc=Permite modificarea unor zone din text folosind un editor avansat (Bazat pe CKEditor)
 Module2200Name=Preţuri dinamice
@@ -576,7 +582,7 @@ Module2200Desc=Activați utilizarea expresii matematice pentru prețuri
 Module2300Name=Joburi programate
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Evenimente / Agenda
-Module2400Desc=Urmăriți evenimentele efectuate și cele viitoare. Lăsați aplicațiile să înregistreze evenimente automate în scopuri de urmărire sau să înregistreze manual evenimente sau întâlniri.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API/Web services (SOAP server)
@@ -613,7 +619,7 @@ Module50100Desc=Modulul Punct de vânzări (POS)
 Module50200Name=PayPal
 Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 Module50400Name=Contabilitate (avansat)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=Print lP IPrinter
 Module54000Desc=Imprimare directă (fără a deschide documentele) folosind interfața CUPS IPP (imprimanta trebuie să fie vizibilă de pe server și CUPS trebuie să fie instalat pe server).
 Module55000Name=Sondaj, supraveghere sau vot
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=Toleranta întârziere (în zile) înainte de alertă
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Toleranta întârziere (în zile) înainte de alertă pentru cecuri de depozit pentru a face
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=\nZona de configurare este pentru parametrii de configurare inițiali înainte de a începe să se utilizeze Dolibarr.
-SetupDescription2=Cele două etape obligatorii de configurare sunt primele două din meniul de configurare din stânga: pagina de configurare %s și pagina de configurare %s:
-SetupDescription3=Parametrii din meniul <a href="%s"> %s -> %s </a> sunt necesari deoarece datele definite sunt folosite pe ecranele Dolibarr și pentru a personaliza comportamentul implicit al software-ului (de exemplu, pentru caracteristicile legate de țară).
-SetupDescription4=Parametrii din meniul <a href="%s"> %s -> %s </a> sunt necesari, deoarece Dolibarr ERP / CRM este o colecție de mai multe module / aplicații, toate mai mult sau mai puțin independente. Noile caracteristici vor fi adăugate în meniuri pentru fiecare modul pe care îl veți activa.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=Alte meniul intrări gestiona parametri opţionali.
 LogEvents=Audit de securitate evenimente
 Audit=Audit
@@ -1054,8 +1060,9 @@ LogEventDesc=Puteţi activa jurnalul de evenimente de securitate Dolibarr aici.
 AreaForAdminOnly=Parametrii de configurare pot fi setați numai de <b> utilizatorii administratori </b>.
 SystemInfoDesc=Sistemul de informare este diverse informaţii tehnice ai citit doar în modul şi vizibil doar pentru administratori.
 SystemAreaForAdminOnly=Această zonă este disponibil numai pentru utilizatorii de administrator. Nici una din Dolibarr permisiunile pot reduce această limită.
-CompanyFundationDesc=Editați pe această pagină toate informațiile cunoscute ale companiei sau fundației pe care trebuie să o gestionați (Pentru aceasta, faceți clic pe "Modificare" sau "Salvare", butonul din partea de jos a paginii)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=Puteţi alege fiecare parametru legate de Dolibarr aspect aici
 AvailableModules=Available app/modules
 ToActivateModule=Pentru a activa modulele, du-te la zona de configurare.
@@ -1188,11 +1195,11 @@ UserMailRequired=EMail necesare pentru a crea un utilizator nou
 HRMSetup=Configurare Modul HRM
 ##### Company setup #####
 CompanySetup=Setări Modul Terţi
-CompanyCodeChecker=Modulul pentru terţi cod de generare şi de verificare (client sau furnizor)
-AccountCodeManager=Module for accounting code generation (customer or supplier)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=Funcția notificări prin e-mail permite trimiterea de email-uri automate pentru anumite evenimente Dolibarr. Recipienții notificărilor pot fi definiți.
 NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
 ModelModules=Documente şabloane
 DocumentModelOdt=Generare din modelele OpenDocument (Fichier .ODT ou .ODS OpenOffice, KOffice, TextEdit…)
@@ -1203,6 +1210,9 @@ MustBeUnique=Trebuie sa fie unic?
 MustBeMandatory=Este obligatorie crearea unor terțe părți?
 MustBeInvoiceMandatory=Este obligatorie validarea facturilor?
 TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=O export se leagă de <b>format %s</b> este disponibil la următoarea adresă: %s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=Text liber pe ofertele comerciale
 WatermarkOnDraftProposal=Filigranul pe ofertele comerciale schiţă (niciunul daca e gol)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Cere contul bancar destinație al ofertei
 ##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=Ordinele de gestionare setup
 OrdersNumberingModules=Ordinele de numerotare module
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=Conectarea la server ' %s' pe bază de date " %s" cu utilizator
 OSCommerceTestKo1=Conectarea la server ' %s' reuseste, dar baza de date " %s" nu a putut fi atins.
 OSCommerceTestKo2=Conectarea la server ' %s' cu utilizatorul " %s" nu a reuşit.
 ##### Stock #####
-StockSetup=Configurare modul Depozite  
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=Dacă utilizați unmodul punct de vânzare  (modulul POS furnizat în mod implicit sau un alt modul extern), acest setup poate fi ignorat de către modul punctul de vânzare . Cele mai multe module de puncte  de vânzări sunt concepute pentru a crea imediat o factură și reduce stocul implicit indiferent de ce optiune  aveţi aici. Deci, dacă aveți nevoie sau nu de a avea o scădere de stoc la înregistrarea unei vinzări din punctul dvs. de vânzare, verificați de asemenea modulul POS configurat.
 ##### Menu #####
 MenuDeleted=Meniu eliminat
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
 MultiCompanySetup=Multi-societate modul setup
 ##### Suppliers #####
 SuppliersSetup=Furnizorul modul de configurare
-SuppliersCommandModel=Finalizarea şablon de ordine furnizorul (logo. ..)
-SuppliersInvoiceModel=Model complet de factura furnizorului (logo. ..)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Modele numerotaţie al facturilor furnizori
 IfSetToYesDontForgetPermission=Dacă este setat la da, nu uitați să furnizați permisiuni grupurilor sau utilizatorilor cărora li se permite a doua aprobare
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=Nu utiliza caractere ambigue  ("1","l","i","|","0","O"
 SalariesSetup=Configurare modul salarii
 SortOrder=Ordine sortare
 Format=Format
-TypePaymentDesc=0:Tip plata Client, 1:Tip plata Furnizor, 2:Ambele tipuri plata Client sau Furnizor
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Include calea (definita in variabila %s)
 ExpenseReportsSetup=Configurarea modului rapoartelor de cheltuieli
 TemplatePDFExpenseReports=Șabloane de documente pentru a genera un document de raportare a cheltuielilor
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Install of external module from applic
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
-TextTitleColor=Culoare titlu pagina
+TextTitleColor=Text color of Page title
 LinkColor=Culoare link-uri
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=Culoare Background pentru Top menu
 TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Culoare Background pentru Left menu
 BackgroundTableTitleColor=Background color for Table title line
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Checksum așteptat
 CurrentChecksum=Checksum curent
 ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-MailToMember=To send email from member page
-MailToUser=To send email from user page
-MailToProject= To send email from project page
+MailToSendProposal=Oferte Clienti
+MailToSendOrder=Comenzi client
+MailToSendInvoice=Facturi Clienţi
+MailToSendShipment=Livrări
+MailToSendIntervention=Intervenţii
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Contracte
+MailToThirdparty=Terţi
+MailToMember=Membri
+MailToUser=Utilizatori
+MailToProject=Projects page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1780,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/ro_RO/bills.lang b/htdocs/langs/ro_RO/bills.lang
index 797efa922be..623576e9181 100644
--- a/htdocs/langs/ro_RO/bills.lang
+++ b/htdocs/langs/ro_RO/bills.lang
@@ -109,7 +109,7 @@ CancelBill=Anulează o factură
 SendRemindByMail=EMail memento
 DoPayment=Enter payment
 DoPaymentBack=Enter refund
-ConvertToReduc=Transformă în viitor discount
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Introduceţi o încasare de la client
@@ -120,7 +120,7 @@ BillStatus=Status Factura
 StatusOfGeneratedInvoices=Status factură generată
 BillStatusDraft=Schiţă (de validat)
 BillStatusPaid=Plătite
-BillStatusPaidBackOrConverted=Credit note refund or converted into discount
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Abandonate
 BillStatusValidated=Validate (de plată)
@@ -296,10 +296,10 @@ DiscountType=Discount type
 NoteReason=Notă / Motiv
 ReasonDiscount=Motiv
 DiscountOfferedBy=Acordate de
-DiscountStillRemaining=Discounts available
-DiscountAlreadyCounted=Discounts already consumed
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+SupplierDiscounts=Vendors discounts
 BillAddress=Adresa de facturare
 HelpEscompte=Această reducere este un discount acordat clientului pentru că plata  a fost făcută înainte de termen.
 HelpAbandonBadCustomer=Această sumă a fost abandonată (client declarat  rău platnic) şi este considerată ca fiind o pierdere excepţională.
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Permite plata la parteneri diferiţi cu aceeaşi co
 PaymentNote=Comentariu plată
 ListOfPreviousSituationInvoices=Lista facturilor de situaţie anterioare
 ListOfNextSituationInvoices=Lista facturilor de situaţie următoare
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=La fiecare %s zile
 FrequencyPer_m=La fiecare %s luni
 FrequencyPer_y=La fiecare %s ani
@@ -505,9 +511,14 @@ SituationAmount=Valoare (neta) factură de situaţie
 SituationDeduction=Situatie scadere
 ModifyAllLines=Modifica toate liniile
 CreateNextSituationInvoice=Creaza urmatoarea situatie
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=Aceasta factura nu este ultima din serie si nu trebuie modificata.
 DisabledBecauseNotLastInCycle=Urmatoarea situatie deja exista
 DisabledBecauseFinal=Aceasta situatie este finala
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=D
 CantBeLessThanMinPercent=Progresul nu poate fi mai mic decat valoarea lui in precedenta situatie
 NoSituations=Nicio situatie deschisa
 InvoiceSituationLast=Factură finală si generală
@@ -532,3 +543,4 @@ AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/ro_RO/categories.lang b/htdocs/langs/ro_RO/categories.lang
index 6ae1795fb36..c4392fa6de3 100644
--- a/htdocs/langs/ro_RO/categories.lang
+++ b/htdocs/langs/ro_RO/categories.lang
@@ -16,7 +16,7 @@ MembersCategoriesArea=Tag-uri  / categorii Membri
 ContactsCategoriesArea=Tag-uri / Categorii Contacte
 AccountsCategoriesArea=Tag-uri / Categorii Contabilitate
 ProjectsCategoriesArea=Zona etichetelor / categoriilor de proiecte
-SubCats=Subcategorii
+SubCats=Sub-categories
 CatList=Lista Tag-uri / Categorii
 NewCategory=Tag / categorie noua
 ModifCat=Modifica Tag / categoria
@@ -85,3 +85,4 @@ CategorieRecursivHelp=Dacă este activat, produsul va fi legat către categoria
 AddProductServiceIntoCategory=Add  următoarele produseservicii
 ShowCategory=Arată tag / categorie
 ByDefaultInList=Implicit în listă
+ChooseCategory=Choose category
diff --git a/htdocs/langs/ro_RO/commercial.lang b/htdocs/langs/ro_RO/commercial.lang
index a0f2d3d366f..64f5a388c24 100644
--- a/htdocs/langs/ro_RO/commercial.lang
+++ b/htdocs/langs/ro_RO/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=Închide
 ActionAC_EMAILING=Trimite e-mail-uri în masă
 ActionAC_COM=Trimitere comandă client prin e-mail
 ActionAC_SHIP=Trimitere notă de livrare prin e-mail
-ActionAC_SUP_ORD=Trimitere comandă  furnizor prin e-mail
-ActionAC_SUP_INV=Trimitere factură furnizor prin e-mail
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=Altele
 ActionAC_OTH_AUTO=Evenimente inserate automat
 ActionAC_MANUAL=Evenimente inserate manual
@@ -71,9 +71,9 @@ Stats=Statistici vânzări
 StatusProsp=Statut Prospect
 DraftPropals=Oferte Comerciale Schiţă
 NoLimit=Nelimitat 
-ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
-ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
-ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commerical proposal %s
-FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
+ToOfferALinkForOnlineSignature=Link pentru semnatura online
+WelcomeOnOnlineSignaturePage=Bine ati venit pe pagina de acceptare a propunerii comerciale de la %s
+ThisScreenAllowsYouToSignDocFrom=Acest ecran vă permite  sa acceptati sisemnati , sau refuzati o oferta /propunere comerciala
+ThisIsInformationOnDocumentToSign=Aceasta este informatia pe document de accetat sau refuzat
+SignatureProposalRef=Semnare a propunerii/ofertei comerciale %s
+FeatureOnlineSignDisabled=Functionalitate pentru semnare online dezactivata sau documentul generat inainte de functionalitae a fost activat
diff --git a/htdocs/langs/ro_RO/companies.lang b/htdocs/langs/ro_RO/companies.lang
index aaf2f118bba..8b410df73da 100644
--- a/htdocs/langs/ro_RO/companies.lang
+++ b/htdocs/langs/ro_RO/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Are you sure you want to delete this contact and all inheri
 MenuNewThirdParty=Terţ nou
 MenuNewCustomer=Client nou
 MenuNewProspect=Prospect nou
-MenuNewSupplier=Furnizor nou
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=Particular nou
-NewCompany=Societate nouă (prospect, client, furnizor)
-NewThirdParty=Terţ nou (prospect, client, furnizor)
-CreateDolibarrThirdPartySupplier=Creare terţ ( furnizor)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=Creare terţ
 CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Prospecte
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=Prospecte
 ThirdPartyCustomers=Clienţi
 ThirdPartyCustomersStats=Clienţi
 ThirdPartyCustomersWithIdProf12=Clienţii cu %s sau %s
-ThirdPartySuppliers=Furnizori
+ThirdPartySuppliers=Vendors
 ThirdPartyType=Tip de terţi
 Individual=Persoană privată
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
@@ -77,11 +77,11 @@ Web=Web
 Poste= Poziţie
 DefaultLang=Limba implicită
 VATIsUsed=Sales tax is used
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
-ThirdpartyNotCustomerNotSupplierSoNoRef=Terţii nu sunt clienţi sau furnizori, nu sunt obiecte asociate disponibile
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Oferte
 OverAllOrders=Comenzi
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=RE Tip
 TypeLocaltax2ES=IRPF Tip
 WrongCustomerCode=Cod  Client invalid
-WrongSupplierCode=Cod  Furnizor invalid
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Model cod client
-SupplierCodeModel=Model cod furnizor
+SupplierCodeModel=Vendor code model
 Gencod=Cod de bare
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
@@ -267,7 +267,7 @@ Prospect=Prospect
 CustomerCard=Fişa Client
 Customer=Client
 CustomerRelativeDiscount=Discount Relativ client
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=Discount Relativ
 CustomerAbsoluteDiscountShort=Discount Absolut
 CompanyHasRelativeDiscount=Acest client are un discount <b>de %s%%</b>
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this suppl
 CompanyHasNoAbsoluteDiscount=Acest client nu are nici o reducere de credit disponibil
 CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
 CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=Niciunul
 Supplier=Furnizor
 AddContact=Creare contact
@@ -304,13 +304,13 @@ DeleteACompany=Şterge o societate
 PersonalInformations=Informaţii personale
 AccountancyCode=Cont contabil
 CustomerCode=Cod Client
-SupplierCode=Cod Furnizor
+SupplierCode=Vendor code
 CustomerCodeShort=Cod Client
-SupplierCodeShort=Cod Furnizor 
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=Cod Client,  unic pentru toţi clienţii
-SupplierCodeDesc=Cont Furnizor ,  unic pentru toţi furnizorii
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=Obligatoriu, dacă un terţ este un client sau prospect
-RequiredIfSupplier=Obligatoriu, dacă un terţ este un furnizor
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=Valabilitatea controlate de modulul
 ThisIsModuleRules=Aici sunt regulile pentru acest modul
 ProspectToContact=Prospect de contact
@@ -338,7 +338,7 @@ MyContacts=Contactele mele
 Capital=Capital
 CapitalOf=Capital de % s
 EditCompany=Modifică societate
-ThisUserIsNot=Acest utilizator nu este nici  prospect, nici client, nici furnizor
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=Verifică
 VATIntraCheckDesc=Linkul  <b>%s</b>permite solicitarea verificării TVA european . Este necesar  acces la internet  pentru  ca acest  serviciu să funcționeze.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -396,7 +396,7 @@ ImportDataset_company_4=Third parties/Sales representatives (Assign sales repres
 PriceLevel=Nivel de Pret
 DeliveryAddress=Adresă de livrare
 AddAddress=Adaugă adresă
-SupplierCategory=Categorie Furnizor
+SupplierCategory=Vendor category
 JuridicalStatus200=Freelancer
 DeleteFile=Şterge fişier
 ConfirmDeleteFile=Sigur  doriţi să ştergeţi acest fişier?
@@ -406,7 +406,7 @@ FiscalYearInformation=Informaţii pe anul fiscal
 FiscalMonthStart=Luna de început a anului fiscal
 YouMustAssignUserMailFirst=Mai întâi trebuie creată o adresa de email pentru acest utilizator pentru a putea adaugă notificări pe email pentru el
 YouMustCreateContactFirst=Pentru a putea adaugă notificări pe email, este necesară definirea unor contacte pentru terţi cu adresa de email validă
-ListSuppliersShort=Lista  furnizori
+ListSuppliersShort=List of vendors
 ListProspectsShort=Lista  prospecte
 ListCustomersShort=Lista  clienţi
 ThirdPartiesArea=Terţi şi Contacte
@@ -420,7 +420,7 @@ CurrentOutstandingBill=Facturi in suspensie curente
 OutstandingBill=Max. limită credit
 OutstandingBillReached=Limită credit depăsită 
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Retrimite numărulcu formatul %syymm-nnnn pentru codul de client și %syymm-nnnn pentru codul de furnizor unde YY este anul, mm  este luna și nnnn este o secvență continuă și fără să revină la 0.
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=Codul este liber fîrî verificare. Acest cod poate fi modificat în orice moment.
 ManagingDirectors=Nume Manager(i) nume (CEO, director, preşedinte...)
 MergeOriginThirdparty=Duplica terț (terț dorit să-l ștergeți)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Autentificare reprezentant vânzări
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/ro_RO/compta.lang b/htdocs/langs/ro_RO/compta.lang
index 19058a4d6fa..1ce89e514c4 100644
--- a/htdocs/langs/ro_RO/compta.lang
+++ b/htdocs/langs/ro_RO/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=TVA platit
 VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
-VATSummary=Tax Balance
+VATSummary=Tax monthly
+VATBalance=Tax Balance
 VATPaid=Tax paid
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=Contabilitate / Trezorerie
 NewPayment=Plată nouă
 Payments=Plăţi
 PaymentCustomerInvoice=Plată factură client
-PaymentSupplierInvoice=Plată factură  furnizor
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Plata taxe sociale sau fiscale
 PaymentVat=Plată TVA
 ListPayment=Listă plăţi
 ListOfCustomerPayments=Listă plăţi clienţi
-ListOfSupplierPayments=Listă plăţi  furnizori
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Dată început perioadă
 DateEndPeriod=Dată sfârşit perioadă
 newLT1Payment=Plată taxă nouă 2
@@ -110,7 +111,7 @@ ShowVatPayment=Arata plata TVA
 TotalToPay=Total de plată
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
 CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cont contabil client
 SupplierAccountancyCodeShort=Cont contabil furnizor
 AccountNumber=Numărul de cont
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=Raport pe terţ RE
 LT2ReportByCustomersES=Raport de terţă parte IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Raport după TVA client colectat și plătit
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Chart of accounts models
 Pcg_type=Pcg tip
 Pcg_subtype=Pcg subtip
 InvoiceLinesToDispatch=Linii factură de expediat
-ByProductsAndServices=După produse şi servicii
+ByProductsAndServices=By product and service
 RefExt=Referinţă externă
 ToCreateAPredefinedInvoice= Pentru a crea o factură model/ template, se crează o factură standard, apoi, fără a fi validată, se apasă pe butonul  "%s". 
 LinkedOrder=Link către comandă
@@ -215,7 +218,8 @@ Mode1=Metoda 1
 Mode2=Metoda 2
 CalculationRuleDesc=Pentru a calcula totalul TVA, există două metode: <br> Metoda 1 este rotunjirea TVA-ului pe fiecare linie, apoi însumarea lor. <br> Metoda 2 este însumarea tututor TVA rilor de pe fiecare linie, apoi rotunjirea rezultatului. <br> Rezultatul final poate fi diferit cu câțiva cenți. Modul implicit este <b>%s</b>.
 CalculationRuleDescSupplier=în funcție de furnizor, alege metoda potrivită pentru a aplica aceeași regulă de calcul și pentru a obține același rezultat ca furnizorul.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Raportul cifra de afaceri pe produs, atunci când se utilizează modul <b>contabilitate de casă</b> nu este relevant. Acest raport este disponibil numai atunci când se utilizează modul  <b>contabilitate de angajament</b> (a se vedea configurarea modulului de contabilitate).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Mod calcul
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=Cloneaza o taxa sociala / fiscala
 ConfirmCloneTax= Confirmare duplicare plată taxă. 
@@ -242,3 +246,10 @@ FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/ro_RO/dict.lang b/htdocs/langs/ro_RO/dict.lang
index 7dc12f647c2..b6c2bc4edd6 100644
--- a/htdocs/langs/ro_RO/dict.lang
+++ b/htdocs/langs/ro_RO/dict.lang
@@ -5,6 +5,7 @@ CountryIT=Italia
 CountryES=Spania
 CountryDE=Germania
 CountryCH=Eleveţia
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
 CountryGB=Marea Britanie
 CountryUK=Marea Britanie
 CountryIE=Irlanda
@@ -339,18 +340,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
-ExpCyclo=Capacity lower to 50cm3
-ExpMoto12CV=Motorbike 1 or 2 CV
-ExpMoto345CV=Motorbike 3, 4 or 5 CV
-ExpMoto5PCV=Motorbike 5 CV and more
+ExpAuto3PCV=3 CV si mai multe
+ExpAuto4PCV=4 CV si mai multe
+ExpAuto5PCV=5 CV si mai multe
+ExpAuto6PCV=6 CV si mai multe
+ExpAuto7PCV=7 CV si mai multe
+ExpAuto8PCV=8 CV si mai multe
+ExpAuto9PCV=9 CV si mai multe
+ExpAuto10PCV=10 CV si mai multe
+ExpAuto11PCV=11 CV si mai multe
+ExpAuto12PCV=12 CV si mai multe
+ExpAuto13PCV=13 CV si mai multe
+ExpCyclo=Capacitate  mai mica de 50cm3
+ExpMoto12CV=Motorbike 1 sau 2 CV
+ExpMoto345CV=Motorbike 3, 4 sau 5 CV
+ExpMoto5PCV=Motorbike 5 CV si mai multe
diff --git a/htdocs/langs/ro_RO/ecm.lang b/htdocs/langs/ro_RO/ecm.lang
index a2a9f2f2fd2..4e1193b4c50 100644
--- a/htdocs/langs/ro_RO/ecm.lang
+++ b/htdocs/langs/ro_RO/ecm.lang
@@ -39,9 +39,10 @@ ShowECMSection=Arată director
 DeleteSection=Elimină director
 ConfirmDeleteSection=Puteți confirma că doriți să ștergeți directorul <b> %s</b>?
 ECMDirectoryForFiles=Director relativ  pentru fişierele
-CannotRemoveDirectoryContainsFiles=Ştergerea  nu este posibilă deoarece conţine câteva fişiere
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=Manager Fişiere
-ECMSelectASection=Selectaţi un director din  arborele  stâng  ...
+ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
diff --git a/htdocs/langs/ro_RO/errors.lang b/htdocs/langs/ro_RO/errors.lang
index ce79244220d..7951579ab35 100644
--- a/htdocs/langs/ro_RO/errors.lang
+++ b/htdocs/langs/ro_RO/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Cod de bare cerut
 ErrorCustomerCodeAlreadyUsed=Clientul codul folosit deja
 ErrorBarCodeAlreadyUsed=cod bare utilizat deja
 ErrorPrefixRequired=Prefix necesare
-ErrorBadSupplierCodeSyntax=Bad sintaxă pentru furnizor cod
-ErrorSupplierCodeRequired=Furnizor codul necesar
-ErrorSupplierCodeAlreadyUsed=Furnizor de cod folosit deja
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Bad parametrii
 ErrorBadValueForParameter=Valoarea  incorectă  '%s'  pentru parametrul '%s'
 ErrorBadImageFormat=Fișier de imagine nu are un format acceptat (PHP dvs. nu acceptă funcții pentru a converti imagini de acest format)
@@ -87,7 +87,7 @@ ErrorsOnXLines=Erori pe liniile sursă <b>%s</b>
 ErrorFileIsInfectedWithAVirus=Programul antivirus nu a validet fisierul (fisierul ar putea fi infectat cu un virus)
 ErrorSpecialCharNotAllowedForField=Caractere speciale nu sunt permise pentru domeniul "%s"
 ErrorNumRefModel=O referire există în baza de date (%s) şi nu este compatibilă cu această regulă de numerotare. înregistra Remove sau redenumite de referinţă pentru a activa acest modul.
-ErrorQtyTooLowForThisSupplier=Cantitatea prea mică pentru acest furnizor sau nu există un preţ definite pe acest produs pentru acest furnizor
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Configurarea modulului pare a nu fi completă. Mergeți la Setup - Module pentru a finaliza.
 ErrorBadMask=Eroare pe masca
 ErrorBadMaskFailedToLocatePosOfSequence=Eroare, fără a masca numărul de ordine
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Definire greșită pentru Menu A
 ErrorSavingChanges=A apărut o eroare la salvarea modificărilor
 ErrorWarehouseRequiredIntoShipmentLine=Depozitul este obligatoriu pe linie pentru livrare
 ErrorFileMustHaveFormat=Fisierul trebuie sa aiba format '%s'
-ErrorSupplierCountryIsNotDefined=Țara nu este definită pentru acest furnizor. 
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
diff --git a/htdocs/langs/ro_RO/install.lang b/htdocs/langs/ro_RO/install.lang
index c135f4e099e..6b8294e6825 100644
--- a/htdocs/langs/ro_RO/install.lang
+++ b/htdocs/langs/ro_RO/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=<b>%s</b> de fişiere de configurare n
 ConfFileCouldBeCreated=Fişier de configurare <b>%s</b> ar putea fi creat.
 ConfFileIsNotWritable=<b>%s</b> fişier de configurare nu poate fi scris. Verificaţi permisiunile. Pentru prima de instalare, serverul de web trebuie să fie acordate pentru a putea scrie în acest fişier în timpul procesului de configurare (&quot;chmod 666&quot;, de exemplu, pe un Unix ca OS).
 ConfFileIsWritable=<b>%s</b> fişier de configurare este de scriere.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reîncarcă toate informaţiile din fişierul de configurare.
 PHPSupportSessions=Acest PHP susţine sesiuni.
 PHPSupportPOSTGETOk=Acest PHP suportă variabile POST si GET.
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
 WarningRemoveInstallDir=Atenţie, pentru motive de securitate, o dată sau de upgrade-ul de instalare este completă, trebuie să scoateţi <b>directorul de instalare sau de a adăuga un fişier numit director install.lock în documentul Dolibarr, în scopul de a evita utilizarea rău intenţionată a acestuia.</b>
 FunctionNotAvailableInThisPHP=Nu este disponibil pe acest PHP
 ChoosedMigrateScript=Alegeţi script-ul de migraţie
-DataMigration=Migrarea datelor
-DatabaseMigration=Structura bazei de date a migraţiei
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script de prelucrare
 ChooseYourSetupMode=Alegeţi modul de configurare şi faceţi clic pe &quot;Start&quot; ...
 FreshInstall=Instalare proaspătă
@@ -146,7 +147,7 @@ NothingToDo=Nothing to do
 # upgrade
 MigrationFixData=Fix pentru date denormalized
 MigrationOrder=Migrare a datelor pentru comenzile clienţilor
-MigrationSupplierOrder=Migrare de date pentru comenzi furnizor
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Migrare de date pentru oferte comerciale
 MigrationInvoice=Migrare de date pentru facturile clienţilor
 MigrationContract=Migrarea datelor pentru contracte
@@ -196,6 +197,8 @@ MigrationEvents=Migrația evenimentelor pentru a adăuga proprietarului evenimen
 MigrationEventsContact=Migration of events to add event contact into assignement table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
 MigrationReloadModule=Reîncarcă modul %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 ShowNotAvailableOptions=Afişează opţiunile nedisponibile
diff --git a/htdocs/langs/ro_RO/ldap.lang b/htdocs/langs/ro_RO/ldap.lang
index 414907ee6d5..a8b8041151e 100644
--- a/htdocs/langs/ro_RO/ldap.lang
+++ b/htdocs/langs/ro_RO/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Parola pentru domeniu
 YouMustChangePassNextLogon=Parola pentru <b>utilizatorul %s pe %s</b> de domeniu trebuie să fie schimbat.
 UserMustChangePassNextLogon=Utilizatorul trebuie să schimbaţi parola de pe domeniul %s
 LDAPInformationsForThisContact=Informaţii în LDAP pentru această bază de date de contact
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Member type synchronized
 ContactSynchronized=Contact sincronizate
 ForceSynchronize=Forţei de sincronizare Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Nu şi-a citit de baze de date LDAP. LDAP verifica modul de instalare şi de baze de date de accesibilitate.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/ro_RO/loan.lang b/htdocs/langs/ro_RO/loan.lang
index af29433f62f..9c58c3d4dc8 100644
--- a/htdocs/langs/ro_RO/loan.lang
+++ b/htdocs/langs/ro_RO/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=Capital
 Insurance=Asigurari
 Interest=Dobândă
 Nbterms=Numarul termenelor
+Term=Term
 LoanAccountancyCapitalCode=Accounting account capital
 LoanAccountancyInsuranceCode=Accounting account insurance
 LoanAccountancyInterestCode=Accounting account interest
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=Confirmaţi ştergerea acestui credit
 LoanDeleted=Credit șters cu succes
 ConfirmPayLoan=Confirm classify paid this loan
 LoanPaid=Credit achitat
-# Calc
-LoanCalc=Calculator credite bancare
-PurchaseFinanceInfo=Purchase & Financing Information
-SalePriceOfAsset=Pret vanzare al Activului
-PercentageDown=Percentage Down
-LengthOfMortgage=Durata creditului
-AnnualInterestRate=Dobândă anuală
-ExplainCalculations=Calcule explicate
-ShowMeCalculationsAndAmortization=Show me the calculations and amortization
-MortgagePaymentInformation=Mortgage Payment Information
-DownPayment=Avans
-DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
-InterestRateDesc=<b>Rata dobânzii<b> = Procentul anual al dobânzii împărțit la 100
-MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
-MonthlyInterestRateDesc=<b>Rata lunară a dobânzii</b> = Rata anuală a dobânzii împărțit la 12 (pentru 12 luni într-un an)
-MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
-MonthlyPaymentDesc=Plata lunară reiese din următoarea formulă
-AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
-AmountFinanced=Amount Financed
-AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
-Totalsforyear=Totaluri pe an
-MonthlyPayment=Plată Lunara
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
-GoToInterest=%s will go towards INTEREST
-GoToPrincipal=%s will go towards PRINCIPAL
-YouWillSpend=You will spend %s in year %s
 ListLoanAssociatedProject=List of loan associated with the project
 AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Dobândă
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-FinancialCommitment=Financial commitment
 CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/langs/ro_RO/mails.lang b/htdocs/langs/ro_RO/mails.lang
index d0d2600df17..94bbc43aa43 100644
--- a/htdocs/langs/ro_RO/mails.lang
+++ b/htdocs/langs/ro_RO/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Expeditor
 MailErrorsTo=Erori la
 MailReply=Răspundeţi
 MailTo=Receiver (e)
+MailToUsers=To user(s)
 MailCC=Copiere în
+MailToCCUsers=Copy to users(s)
 MailCCC=Copie în cache a
 MailTopic=EMail subiect
 MailText=Mesaj
@@ -164,4 +166,4 @@ InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Informatie
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang
index 462de61cca3..9e853fa2eba 100644
--- a/htdocs/langs/ro_RO/main.lang
+++ b/htdocs/langs/ro_RO/main.lang
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is se
 Administrator=Administrator
 Undefined=Nedefinit
 PasswordForgotten=Parola uitata ?
+NoAccount=No account?
 SeeAbove=Vezi mai sus
 HomeArea=Acasă
 LastConnexion=Latest connection
@@ -231,7 +232,7 @@ Limit=Limita
 Limits=Limite
 Logout=Deconectare
 NoLogoutProcessWithAuthMode=Nu există funcție de deconectare ce poate fi aplicată cu modul de autentificare <b>%s</b>
-Connection=Conexiune
+Connection=Login
 Setup=Setări
 Alert=Alerta
 MenuWarnings=Alerte
@@ -402,6 +403,7 @@ DefaultTaxRate=Default tax rate
 Average=Medie
 Sum=Suma
 Delta=Delta
+RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Opţiunea
@@ -414,7 +416,7 @@ Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
 ExternalRef=Ref. externa
-RefSupplier=Ref. furnizor
+RefSupplier=Ref. vendor
 RefPayment=Ref. plată
 CommercialProposalsShort=Oferte Comerciale
 Comment=Comentează
@@ -493,7 +495,7 @@ Received=Primit
 Paid=Platit
 Topic=Subiect
 ByCompanies=Pe terți
-ByUsers=Pe utilizatori
+ByUsers=By user
 Links=Link-uri
 Link=Link
 Rejects=Respinge
@@ -619,9 +621,9 @@ BuildDoc=Generează  Doc
 Entity=Mediu
 Entities=Entităţile
 CustomerPreview=Preview Client
-SupplierPreview=Preview Furnizor
+SupplierPreview=Vendor preview
 ShowCustomerPreview=Afişează Preview client
-ShowSupplierPreview=Afişează Preview  furnizor
+ShowSupplierPreview=Show vendor preview
 RefCustomer=Ref. client
 Currency=Moneda
 InfoAdmin=Informaţii pentru administratori
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=Produse sau servicii
 SearchIntoProjects=Proiecte
 SearchIntoTasks=Taskuri
 SearchIntoCustomerInvoices=Facturi Clienţi
-SearchIntoSupplierInvoices=Facturi Furnizori
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Comenzi client
-SearchIntoSupplierOrders=Comenzi Furnizori 
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=Oferte Clienti
-SearchIntoSupplierProposals=Oferte Furnizori
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Intervenţii
 SearchIntoContracts=Contracte
 SearchIntoCustomerShipments=Livrări Client
@@ -941,3 +943,5 @@ Remote=Remote
 LocalAndRemote=Local and Remote
 KeyboardShortcut=Keyboard shortcut
 AssignedTo=Atribuit lui
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/ro_RO/margins.lang b/htdocs/langs/ro_RO/margins.lang
index 7f991326f07..f5fd2b7a1e8 100644
--- a/htdocs/langs/ro_RO/margins.lang
+++ b/htdocs/langs/ro_RO/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=Ca serviciu
 UseDiscountOnTotal=Pe subtotal
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Definiti daca discontul global e tratat ca un produs, serviciu, sau numai pe total la calcularea marjei.
 MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best supplier price
+MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Preţ de cost
 UnitCharges=Cheluieli unitare
 Charges=Cheltuieli
diff --git a/htdocs/langs/ro_RO/members.lang b/htdocs/langs/ro_RO/members.lang
index f1b96789b77..f7219accaf4 100644
--- a/htdocs/langs/ro_RO/members.lang
+++ b/htdocs/langs/ro_RO/members.lang
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
diff --git a/htdocs/langs/ro_RO/opensurvey.lang b/htdocs/langs/ro_RO/opensurvey.lang
index 36a7a714b33..2fe8bebb09c 100644
--- a/htdocs/langs/ro_RO/opensurvey.lang
+++ b/htdocs/langs/ro_RO/opensurvey.lang
@@ -58,3 +58,4 @@ MoreChoices=Introdu mai multe opţiuni pentru votanţi
 SurveyExpiredInfo=Sondaj de opinie închis sau termen pentru vot expirat.
 EmailSomeoneVoted=%sa completat o linie.\nPuteţi găsi sondajul dvs. la linkul: \n%s
 ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/ro_RO/orders.lang b/htdocs/langs/ro_RO/orders.lang
index ce8e011263b..a0c2e36c2a9 100644
--- a/htdocs/langs/ro_RO/orders.lang
+++ b/htdocs/langs/ro_RO/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Comenzi Clienţi
-SuppliersOrdersArea=Comenzi Furnizori
+SuppliersOrdersArea=Purchase orders area
 OrderCard=Fişă Comandă
 OrderId=ID Comandă
 Order=Comandă
@@ -13,18 +13,18 @@ OrderToProcess=Comandă de procesat
 NewOrder=Comandă nouă
 ToOrder=Plasează comanda
 MakeOrder=Plasează comanda
-SupplierOrder=Comandă Furnizor
-SuppliersOrders=Comenzi Furnizori
-SuppliersOrdersRunning=Comenzi Furnizori în curs
-CustomerOrder=Comandă client
-CustomersOrders=Comenzi client
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=Clientul Ordine
+CustomersOrders=Comenzi clienţi
 CustomersOrdersRunning=Comenzi client curent
 CustomersOrdersAndOrdersLines=Comenzi clienti si lini comenzi
 OrdersDeliveredToBill=Customer orders delivered to bill
 OrdersToBill=Comenzi client livrate
 OrdersInProcess=Comenzi Clienţi in procesare
 OrdersToProcess=Comenzi Clienţi de procesat
-SuppliersOrdersToProcess=Comenzi Furnizori de procesat
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=Anulata
 StatusOrderDraftShort=Schiţă
 StatusOrderValidatedShort=Validat
@@ -75,15 +75,15 @@ ShowOrder=Afişează comanda
 OrdersOpened=Comenzi de procesat
 NoDraftOrders=Nicio comandă  schiţă
 NoOrder=Nicio comandă
-NoSupplierOrder=Nicio comandă furnizor
+NoSupplierOrder=No purchase order
 LastOrders=Ultimele %s comenzi clienți
 LastCustomerOrders=Ultimele %s comenzi clienți
-LastSupplierOrders=Ultimele %s comenzi furnizori
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=Latest %s modified orders
 AllOrders=Toate comenzile
 NbOfOrders=Numar  comenzi
 OrdersStatistics=Statistici Comenzi
-OrdersStatisticsSuppliers=Statistici Comenzi Furnizori
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Numar comenzi pe luni
 AmountOfOrdersByMonthHT=Valoarea comenzilor pe luna (net fără tva)
 ListOfOrders=Lista  comenzi
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</
 GenerateBill=Generează Factură
 ClassifyShipped=Clasează livrată
 DraftOrders=Comenzi schiţă
-DraftSuppliersOrders=Comenzi Furnizori schita
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=Comenzi în curs de tratare
 RefOrder=Ref. comanda
 RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for supplier
-RefOrderSupplierShort=Ref. order supplier
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=Trimite comanda prin e-mail
 ActionsOnOrder=Evenimente pe comanda
 NoArticleOfTypeProduct=Nici un articol de tip "produs", astfel încât nici un articol expediabil pentru această  comandă
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
 DispatchSupplierOrder=Recepţia comenzii furnizorul ui%s
 FirstApprovalAlreadyDone=First approval already done
 SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=Supplier order %s received %s
-SupplierOrderSubmitedInDolibarr=Supplier order %s submited
-SupplierOrderClassifiedBilled=Supplier order %s set billed
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Alte comenzi
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Responsabil urmărire comandă client
@@ -125,11 +125,11 @@ TypeContact_commande_internal_SHIPPING=Responsabil urmărire expediere comandă
 TypeContact_commande_external_BILLING=Contact  client facturare comandă
 TypeContact_commande_external_SHIPPING=Contact client  livrare comandă
 TypeContact_commande_external_CUSTOMER=Contact client urmărire comandă
-TypeContact_order_supplier_internal_SALESREPFOLL=Responsabil urmărire comandă  furnizor
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Responsabil  recepţie  comandă  furnizor
-TypeContact_order_supplier_external_BILLING=Contact furnizor facturare comandă
-TypeContact_order_supplier_external_SHIPPING=Contact furnizor livrare comandă
-TypeContact_order_supplier_external_CUSTOMER=Contact furnizor urmărire comandă
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constanta COMMANDE_SUPPLIER_ADDON nedefinită
 Error_COMMANDE_ADDON_NotDefined=Constanta COMMANDE_ADDON nedefinită
 Error_OrderNotChecked=Nicio comandă de facturat selectată
diff --git a/htdocs/langs/ro_RO/other.lang b/htdocs/langs/ro_RO/other.lang
index 0f7276e242f..e51b72b70e5 100644
--- a/htdocs/langs/ro_RO/other.lang
+++ b/htdocs/langs/ro_RO/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=Fişiere este prea mare
 PleaseBePatient=Vă rugăm să aveţi răbdare ...
 NewPassword=New password
 ResetPassword=Reset password
-RequestToResetPasswordReceived=O cerere pentru a schimba parola dvs. Dolibarr a fost primită
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=Aceasta este noua cheie pentru login
 NewKeyWillBe=Noua dvs. cheie pentru a vă conecta la software-ul va fi
 ClickHereToGoTo=Click aici pentru a merge la %s
@@ -233,6 +233,8 @@ PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=Export
 AvailableFormats=Formatele disponibile
diff --git a/htdocs/langs/ro_RO/productbatch.lang b/htdocs/langs/ro_RO/productbatch.lang
index e23292247b9..86d13623bd5 100644
--- a/htdocs/langs/ro_RO/productbatch.lang
+++ b/htdocs/langs/ro_RO/productbatch.lang
@@ -16,9 +16,9 @@ printEatby=Expiră : %s
 printSellby=Vanzare: %s
 printQty=Cant: %d
 AddDispatchBatchLine=Adauga o linie pentru Perioada de valabilitate expediere
-WhenProductBatchModuleOnOptionAreForced=Când modulul Lot / Serial este activat, modul automat de creștere / micșorare a stocului este forțat să expedieze expedierea și expedierea manuală pentru recepție și nu poate fi editat. Alte opțiuni pot fi definite așa cum doriți.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=Acest produs nu foloseste numarul de lot / serie
 ProductLotSetup=Configurarea lotului / serial modulului
 ShowCurrentStockOfLot=Afișați stocul curent pentru cuplu de produs / lot
 ShowLogOfMovementIfLot=Afișați jurnalul mișcărilor pentru cuplu de produs / lot
-StockDetailPerBatch=Stock detail per lot
+StockDetailPerBatch=Stock detail pe lot
diff --git a/htdocs/langs/ro_RO/products.lang b/htdocs/langs/ro_RO/products.lang
index e8f79c9fb7c..cd27237442f 100644
--- a/htdocs/langs/ro_RO/products.lang
+++ b/htdocs/langs/ro_RO/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=Preţ nou
 MinPrice=Preţ minim vânzare
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=Prețul de vânzare nu poate fi mai mic decât minimul permis pentru acest produs (%s fără tva). Acest mesaj poate apărea, de asemenea, dacă tastați o reducere prea important.
 ContractStatusClosed=Închis
 ErrorProductAlreadyExists=Un produs cu referinţa %s există deja.
@@ -155,7 +156,7 @@ BuyingPrices=Buying prices
 CustomerPrices=Preţuri Client
 SuppliersPrices=Preţuri furnizor
 SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
-CustomCode=Cod vamal / marfă / SA
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=Ţara de origine
 Nature=Natura
 ShortLabel=Etichetă scurta
diff --git a/htdocs/langs/ro_RO/projects.lang b/htdocs/langs/ro_RO/projects.lang
index e3166565a08..3ad5c5507b6 100644
--- a/htdocs/langs/ro_RO/projects.lang
+++ b/htdocs/langs/ro_RO/projects.lang
@@ -77,6 +77,7 @@ Time=Timp
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=Lista oferte comerciale asociate la proiect
 ListOrdersAssociatedProject=List of customer orders associated with the project
@@ -226,4 +227,4 @@ AllowCommentOnProject=Allow user comments on projects
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/ro_RO/stocks.lang b/htdocs/langs/ro_RO/stocks.lang
index 39fd55fc3ab..286c52edd7c 100644
--- a/htdocs/langs/ro_RO/stocks.lang
+++ b/htdocs/langs/ro_RO/stocks.lang
@@ -203,3 +203,4 @@ RegulateStock=Regulate Stock
 ListInventory=Lista
 StockSupportServices=Stock management support services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/ro_RO/stripe.lang b/htdocs/langs/ro_RO/stripe.lang
index 71c84e714ba..46007076496 100644
--- a/htdocs/langs/ro_RO/stripe.lang
+++ b/htdocs/langs/ro_RO/stripe.lang
@@ -58,8 +58,8 @@ NameOnCard=Name on card
 CardNumber=Card Number
 ExpiryDate=Expiry Date
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/ro_RO/supplier_proposal.lang b/htdocs/langs/ro_RO/supplier_proposal.lang
index 476c36f987d..896f28c4cf5 100644
--- a/htdocs/langs/ro_RO/supplier_proposal.lang
+++ b/htdocs/langs/ro_RO/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Oferte Comercială Furnizor
-supplier_proposalDESC=Gestiioneaza cereri pret la furnizori
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
 SupplierProposalNew=Cerere Preţ  Noua
 CommRequest=Cerere Preţ 
 CommRequests=Cereri Preţ 
 SearchRequest=Cauta o cerere
 DraftRequests=Cereri schiţă
-SupplierProposalsDraft=Ofertă  Furnizor Schiţă
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=Latest %s modified price requests
 RequestsOpened=Deschide Cereri Preţ 
-SupplierProposalArea=Oferte Furnizori
-SupplierProposalShort=Oferta Furnizor
-SupplierProposals=Oferte Furnizori
-SupplierProposalsShort=Oferte Furnizori
+SupplierProposalArea=Vendor proposals area
+SupplierProposalShort=Vendor proposal
+SupplierProposals=Vendor proposals
+SupplierProposalsShort=Vendor proposals
 NewAskPrice=Cerere Preţ  Noua
 ShowSupplierProposal=Arata Cerere Preţ 
 AddSupplierProposal=Crează o cerere de pret
-SupplierProposalRefFourn=Ref Furnizor 
+SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=Data de livrare
 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>?
@@ -47,9 +47,9 @@ CommercialAsk=Cerere Preţ
 DefaultModelSupplierProposalCreate=Crează model implicit
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposals=List of supplier proposal requests
-ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
-SupplierProposalsToClose=Supplier proposals to close
-SupplierProposalsToProcess=Supplier proposals to process
+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
diff --git a/htdocs/langs/ro_RO/suppliers.lang b/htdocs/langs/ro_RO/suppliers.lang
index 92f7fe0d9b7..1acfe2d1fdd 100644
--- a/htdocs/langs/ro_RO/suppliers.lang
+++ b/htdocs/langs/ro_RO/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Furnizori
-SuppliersInvoice=Factură furnizor
-ShowSupplierInvoice=Show Supplier Invoice
-NewSupplier=Furnizor nou
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=Istoric
-ListOfSuppliers=Lista  furnizori
-ShowSupplier=Afişează furnizor
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=Data comandă
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Unele sub-produse nu au un preț definit
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
-SupplierPrices=Preţuri furnizor
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Acest furnizor este deja asociat cu referinta: % s
-NoRecordedSuppliers=Niciun furnizor înregistrat
-SupplierPayment=Plată Furnizor
-SuppliersArea=Furnizori
-RefSupplierShort=Ref. furnizor
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=Disponibilitate
-ExportDataset_fournisseur_1=Facturi furnizori şi linii facturi
-ExportDataset_fournisseur_2=Facturi Furnizor  şi plăţi
-ExportDataset_fournisseur_3=Comenzi furnizori si lini comenzi
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=Aprobă  această comandă
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Refuză aceasta comanda
 ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
 ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
-AddSupplierOrder=Crează comandă furnizor
-AddSupplierInvoice=Crează  factură furnizor
-ListOfSupplierProductForSupplier=Lista  produse şi preţuri pentru furnizorul  <b>%s</b>
-SentToSuppliers=Trimite la furnizori
-ListOfSupplierOrders=Lista comenzi furnizori
-MenuOrdersSupplierToBill=Comenzi Furnizor de facturat
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery= Intârziere Livrare in zile
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-SupplierReputation=Supplier reputation
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
 AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=Preţuri furnizor
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/ro_RO/website.lang b/htdocs/langs/ro_RO/website.lang
index bb3cf7f9426..79425dc7e14 100644
--- a/htdocs/langs/ro_RO/website.lang
+++ b/htdocs/langs/ro_RO/website.lang
@@ -73,7 +73,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
diff --git a/htdocs/langs/ro_RO/workflow.lang b/htdocs/langs/ro_RO/workflow.lang
index 8c0f4dfc796..5e4f0a4fb88 100644
--- a/htdocs/langs/ro_RO/workflow.lang
+++ b/htdocs/langs/ro_RO/workflow.lang
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source custome
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/ru_RU/accountancy.lang b/htdocs/langs/ru_RU/accountancy.lang
index d64058b0d2b..c66a3582349 100644
--- a/htdocs/langs/ru_RU/accountancy.lang
+++ b/htdocs/langs/ru_RU/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Бухгалтерия
 ACCOUNTING_EXPORT_SEPARATORCSV=Разделитель колонок при экспорте в файл
 ACCOUNTING_EXPORT_DATE=Формат даты при экспорте в файл
 ACCOUNTING_EXPORT_PIECE=Экспортировать количество
@@ -17,7 +18,7 @@ DefaultForProduct=Default for product
 CantSuggest=Can't suggest
 AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
 ConfigAccountingExpert=Конфигурация бухгалтерского модуля
-Journalization=Journalization
+Journalization=Журнализация
 Journaux=Журналы
 JournalFinancial=Финансовые журналы
 BackToChartofaccounts=Получаемый график счетов
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Accounts with non zero values
 ListOfAccounts=List of accounts
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers 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
 
-AccountancyArea=Accountancy area
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
 AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
@@ -89,7 +90,7 @@ MenuProductsAccounts=Product accounts
 ProductsBinding=Products accounts
 Ventilation=Привязка к счетам
 CustomersVentilation=Привязка счета клиента
-SuppliersVentilation=Привязка счета поставщика
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Создать новую транзакцию
 UpdateMvts=Изменить транзакцию
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=Журнал платежей
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Журнал "Разное"
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Социальный журнал
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
 ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
@@ -185,11 +187,12 @@ ListeMvts=List of movements
 ErrorDebitCredit=Дебит и кредит не могут иметь значения одновременно
 AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
-DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=Список бухгалтерских счетов
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Group of account
 Pcgsubtype=Subgroup of account
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
 ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
 DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report 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 fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -293,4 +296,9 @@ Binded=Lines bound
 ToBind=Lines to bind
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
index b464fabfbc3..95ae9fcf55a 100644
--- a/htdocs/langs/ru_RU/admin.lang
+++ b/htdocs/langs/ru_RU/admin.lang
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS сервер (по умолчанию в php.in
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Порт (Не определен в PHP на Unix-подобных системах)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS сервер (Не определен в PHP на Unix-подобных системах)
 MAIN_MAIL_EMAIL_FROM=Отправитель писем для автоматических рассылок (В php.ini указан: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= Скрыто отправлять копии всех отправляемых писем на 
 MAIN_DISABLE_ALL_MAILS=Отключить отправку всех писем (для тестирования или демонстраций)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=Метод, используемый для отправки электронной почты
 MAIN_MAIL_SMTPS_ID=SMTP ID, если требуется проверка подлинности
 MAIN_MAIL_SMTPS_PW=SMTP пароль, если требуется проверка подлинности
@@ -291,7 +292,7 @@ ModuleSetup=Настройка модуля
 ModulesSetup=Настройка Модулей/Приложений
 ModuleFamilyBase=Система
 ModuleFamilyCrm=Управление взаимоотношениями с клиентами (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Управление продукцией (PM)
 ModuleFamilyHr=Управление персоналом (HR)
 ModuleFamilyProjects=Проекты / Совместная работа
@@ -373,7 +374,8 @@ NoSmsEngine=Нет доступного менеджера SMS-рассылки.
 PDF=PDF
 PDFDesc=Вы можете настроить каждую глобальную опции для создания PDF-файлов
 PDFAddressForging=Правила придумывания почтовых ящиков
-HideAnyVATInformationOnPDF=Скрывать все информацию о НДС в создаваемых PDF-файлах
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=Скрывать описания продуктов в создаваемых PDF-файлах
@@ -445,7 +447,8 @@ DisplayCompanyInfo=Display company address
 DisplayCompanyManagers=Display manager names
 DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party 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.
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Set this to 1 if you want to attach main document to emai
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=Пользователи и группы
 Module0Desc=Управление Пользователями / Сотрудниками и Группами
@@ -479,7 +485,7 @@ Module1Desc=Компании и управление контактами (кл
 Module2Name=Коммерческие
 Module2Desc=Коммерческое управление
 Module10Name=Бухгалтерия
-Module10Desc=Основные бухгалтерские отчеты (журналы, оборот) основанные на содержимом базы данных. Без диспетчеризации.
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=Предложения
 Module20Desc=Управление коммерческими предложеними
 Module22Name=Почтовые рассылки
@@ -546,8 +552,8 @@ Module400Name=Проекты/Возможности/Потенциальные 
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Веб-календарь
 Module410Desc=Интеграция веб-календаря
-Module500Name=Специальные расходы
-Module500Desc=Управление специальными расходами (налоги, социальные или налоговые отчисления, дивиденды)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Payment of employee wages
 Module510Desc=Record and follow payment of your employee wages
 Module520Name=Ссуда
@@ -561,14 +567,14 @@ Module700Name=Пожертвования
 Module700Desc=Управление пожертвованиями
 Module770Name=Отчёты о затратах
 Module770Desc=Управление и утверждение отчётов о затратах (на транспорт, еду)
-Module1120Name=Коммерческое предложение поставщика
-Module1120Desc=Запросить у поставщика коммерческое предложение и цены
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Интеграция с Mantis
 Module1520Name=Создание документов
 Module1520Desc=Mass mail document generation
 Module1780Name=Теги/Категории
-Module1780Desc=Создание  тегов/категорий (продукции, клиентов, поставщиков, контактов или участников)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=Текстовый редактор WYSIWYG
 Module2000Desc=Позволяет редаткировать некоторые текстовые области использую расширенный редактор (основанный на CKEditor)
 Module2200Name=Динамическое ценообразование
@@ -576,7 +582,7 @@ Module2200Desc=Разрешить использовать математиче
 Module2300Name=Запланированные задания
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=События/Повестка дня
-Module2400Desc=Завершенные и предстоящие события. Приложение для автоматического отслеживания событий или записи событий вручную или рандеву.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API/Веб-службы (SOAP-сервер)
@@ -613,7 +619,7 @@ Module50100Desc=Модуль точки продаж (POS).
 Module50200Name=Paypal
 Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=Модуль PrintIPP
 Module54000Desc=Прямая печать (без открытия документа) использует интерфейс Cups IPP  (Принтер должен быть доступен с сервера, и система печати CUPS  должна быть установлена на сервере). 
 Module55000Name=Poll, Survey or Vote
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=Толерантность задержки (в дня
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Терпимость задержки (в днях) до полной готовности к чеки сделать депозит
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=Другие пункты меню управления необязательных параметров.
 LogEvents=Безопасность ревизии события
 Audit=Аудит
@@ -1054,8 +1060,9 @@ LogEventDesc=Вы можете включить в журнале событий
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Система информации разного техническую информацию Вы получите в режиме только для чтения и видимые только для администраторов.
 SystemAreaForAdminOnly=Эта область доступна для пользователей только администратором. Ни одно из разрешений Dolibarr может снизить этот предел.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=Вы можете выбрать каждого параметра, связанных с Dolibarr выглядеть и чувствовать себя здесь
 AvailableModules=Available app/modules
 ToActivateModule=Чтобы активировать модуль, перейдите на настройку зоны.
@@ -1188,11 +1195,11 @@ UserMailRequired=EMail, необходимые для создания ново
 HRMSetup=HRM module setup
 ##### Company setup #####
 CompanySetup=Предприятия модуль настройки
-CompanyCodeChecker=Модуль для третьих сторон, генерации кода и проверку (клиент или поставщик)
-AccountCodeManager=Module for accounting code generation (customer or supplier)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
 NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
 ModelModules=Документы шаблоны
 DocumentModelOdt=Создавать документы из шаблонов форматов OpenDocuments (.ODT or .ODS файлы для OpenOffice, KOffice, TextEdit,...)
@@ -1203,6 +1210,9 @@ MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
 TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Экспорт ссылка <b>на %s</b> формате доступна на следующую ссылку: %s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=Свободный текст на коммерческ
 WatermarkOnDraftProposal=Водяные знаки на черновиках Коммерческих предложений ("Нет" если пусто)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Запрос банковского счёта для предложения
 ##### SupplierProposal #####
-SupplierProposalSetup=Настройка модуля запросов цен поставщиков
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Свободный текст на запросе цены у поставщиков
-WatermarkOnDraftSupplierProposal=Водяной знак на проекте запроса цены у поставщиков (нет знака, если пустое)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=Приказ 'Management Setup
 OrdersNumberingModules=Приказы нумерации модулей
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=Соединение с сервером ' %s' на базе '
 OSCommerceTestKo1=Соединение с сервером ' %s' успешными, но база данных ' %s' не может быть достигнута.
 OSCommerceTestKo2=Соединение с сервером ' %s' пользователя ' %s' провалилась.
 ##### Stock #####
-StockSetup=Конфигурация модуля Склад
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
 ##### Menu #####
 MenuDeleted=Удаленное Меню 
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
 MultiCompanySetup=Компания Multi-модуль настройки
 ##### Suppliers #####
 SuppliersSetup=Поставщик модуля установки
-SuppliersCommandModel=Полный шаблон для поставщика (logo. ..)
-SuppliersInvoiceModel=Полный шаблон поставщиком счета-фактуры (logo. ..)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Способ нумерации счетов-фактур Поставщика
 IfSetToYesDontForgetPermission=Если установлено "Да", не забудьте дать доступ группам или пользователям, разрешённым для повторного утверждения
 ##### GeoIPMaxmind #####
@@ -1662,10 +1672,10 @@ NbNumMin=Минимальное количество цифр
 NbSpeMin=Минимальное количество специальных символов
 NbIteConsecutive=Максимальное количество повторяющихся повторяющихся одинаковых символов
 NoAmbiCaracAutoGeneration=Не используйте похожие символы ("1","l","i","|","0","O")  для автоматической генерации
-SalariesSetup=Настройка модуля зарплат
+SalariesSetup=Настройка зарплатного модуля
 SortOrder=Порядок сортировки
 Format=Формат
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Путь к заголовочным файлам (задан в переменной %s)
 ExpenseReportsSetup=Настройка модуля Отчёты о затратах
 TemplatePDFExpenseReports=Шаблон документа для создания отчёта о затратах
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Установка внешних мо
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
-TextTitleColor=Color of page title
+TextTitleColor=Text color of Page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=Background color for Top menu
 TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
 ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-MailToMember=To send email from member page
-MailToUser=To send email from user page
-MailToProject= To send email from project page
+MailToSendProposal=Предложения клиенту
+MailToSendOrder=Заказы клиента
+MailToSendInvoice=Счета клиента
+MailToSendShipment=Отгрузки
+MailToSendIntervention=Проектные работы
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Договоры
+MailToThirdparty=Контрагенты
+MailToMember=Участники
+MailToUser=Пользователи
+MailToProject=Projects page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1780,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/ru_RU/bills.lang b/htdocs/langs/ru_RU/bills.lang
index 36114edd125..0dbdbfac4fc 100644
--- a/htdocs/langs/ru_RU/bills.lang
+++ b/htdocs/langs/ru_RU/bills.lang
@@ -109,7 +109,7 @@ CancelBill=Отменить счет-фактуру
 SendRemindByMail=Отправить напоминание по EMail
 DoPayment=Enter payment
 DoPaymentBack=Enter refund
-ConvertToReduc=Преобразовать в будущую скидку
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Ввести платеж, полученный от покупателя
@@ -120,7 +120,7 @@ BillStatus=Статус счета-фактуры
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Проект (должен быть подтвержден)
 BillStatusPaid=Оплачен
-BillStatusPaidBackOrConverted=Credit note refund or converted into discount
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Аннулирован
 BillStatusValidated=Подтвержден (необходимо оплатить)
@@ -296,10 +296,10 @@ DiscountType=Discount type
 NoteReason=Примечание / Основание
 ReasonDiscount=Основание
 DiscountOfferedBy=Предоставлена
-DiscountStillRemaining=Discounts available
-DiscountAlreadyCounted=Discounts already consumed
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+SupplierDiscounts=Vendors discounts
 BillAddress=Адрес выставления
 HelpEscompte=Эта скидка предоставлена Покупателю за досрочный платеж.
 HelpAbandonBadCustomer=От этой суммы отказался Покупатель (считается плохим клиентом) и она считается чрезвычайной потерей.
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Every %s days
 FrequencyPer_m=Every %s months
 FrequencyPer_y=Every %s years
@@ -454,7 +460,7 @@ ChequeDeposits=Оплаты чеками
 Cheques=Чеки
 DepositId=Id deposit
 NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=This %s has been converted into %s
+CreditNoteConvertedIntoDiscount=Этот %s должен быть преобразован в %s
 UsBillingContactAsIncoiveRecipientIfExist=Использовать в качестве получателя счета платежный контактный адрес клиента вместо адреса контрагента
 ShowUnpaidAll=Показать все неоплаченные счета-фактуры
 ShowUnpaidLateOnly=Показать только просроченные неоплаченные счета-фактуры
@@ -505,9 +511,14 @@ SituationAmount=Situation invoice amount(net)
 SituationDeduction=Situation subtraction
 ModifyAllLines=Изменить все строки
 CreateNextSituationInvoice=Create next situation
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=Вс
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
 NoSituations=No open situations
 InvoiceSituationLast=Финальный и основной счёт
@@ -532,3 +543,4 @@ AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/ru_RU/categories.lang b/htdocs/langs/ru_RU/categories.lang
index 11670831552..4f01a352107 100644
--- a/htdocs/langs/ru_RU/categories.lang
+++ b/htdocs/langs/ru_RU/categories.lang
@@ -16,7 +16,7 @@ MembersCategoriesArea=Раздел тегов/категорий участни
 ContactsCategoriesArea=Раздел тегов/категорий контактов
 AccountsCategoriesArea=Accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
-SubCats=Подкатегории
+SubCats=Sub-categories
 CatList=Список тегов/категорий
 NewCategory=Новый тег/категория
 ModifCat=Изменить тег/категорию
@@ -85,3 +85,4 @@ CategorieRecursivHelp=Если активировать, то продукт б
 AddProductServiceIntoCategory=Добавить следующий товар/услугу
 ShowCategory=Показать тег/категорию
 ByDefaultInList=By default in list
+ChooseCategory=Choose category
diff --git a/htdocs/langs/ru_RU/commercial.lang b/htdocs/langs/ru_RU/commercial.lang
index 03a1b0b20ab..3a77c19df98 100644
--- a/htdocs/langs/ru_RU/commercial.lang
+++ b/htdocs/langs/ru_RU/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=Закрыть
 ActionAC_EMAILING=Отправить по электронной почте масса
 ActionAC_COM=Отправить заказ по почте
 ActionAC_SHIP=Отправить доставку по почте
-ActionAC_SUP_ORD=Отправить поставщиком заказы по почте
-ActionAC_SUP_INV=Отправить поставщиком счета по почте
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=Другой
 ActionAC_OTH_AUTO=Мероприятия созданные автоматически
 ActionAC_MANUAL=Мероприятия, созданные вручную
diff --git a/htdocs/langs/ru_RU/companies.lang b/htdocs/langs/ru_RU/companies.lang
index 5496dfe5254..b7f10126f80 100644
--- a/htdocs/langs/ru_RU/companies.lang
+++ b/htdocs/langs/ru_RU/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Удалить этот контакт и всю связа
 MenuNewThirdParty=Новый контрагент
 MenuNewCustomer=Новый покупатель
 MenuNewProspect=Новый потенциальный клиент
-MenuNewSupplier=Новый поставщик
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=Новое физическое лицо
-NewCompany=Новая компания (проспект, покупатель, поставщик)
-NewThirdParty=Новые третьей стороне (проспект, клиента, поставщика)
-CreateDolibarrThirdPartySupplier=Создать контрагента (поставщика)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=Создать контрагента
 CreateThirdPartyAndContact=Создать контрагента и связанный контакт
 ProspectionArea=Область потенциальных клиентов
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=Потенциальные клиенты
 ThirdPartyCustomers=Покупатели
 ThirdPartyCustomersStats=Заказчики
 ThirdPartyCustomersWithIdProf12=Покупатели с %s или %s
-ThirdPartySuppliers=Поставщики
+ThirdPartySuppliers=Vendors
 ThirdPartyType=Тип контрагента
 Individual=Физическое лицо
 ToCreateContactWithSameName=Будет автоматически создан контакт/адрес с той информацией которая связывает контрагента с контрагентом. В большинстве случаев, даже если контрагент является физическим лицом, достаточно создать одного контрагента.
@@ -77,11 +77,11 @@ Web=Web
 Poste= Должность
 DefaultLang=Язык по умолчанию
 VATIsUsed=Sales tax is used
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Заполнить адрес из адреса контрагента
-ThirdpartyNotCustomerNotSupplierSoNoRef=Контрагенты не имеющие клиентов или связей, пустые контрагенты
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Банковские реквизиты
 OverAllProposals=Предложения
 OverAllOrders=Заказы
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=Тип налога RE
 TypeLocaltax2ES=Тип налога IRPF 
 WrongCustomerCode=Неверный код Покупателя
-WrongSupplierCode=Неверный код Поставщика
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Шаблон кода Покупателя
-SupplierCodeModel=Шаблон кода Поставщика
+SupplierCodeModel=Vendor code model
 Gencod=Штрих-код
 ##### Professional ID #####
 ProfId1Short=Основной государственный регистрационный номер
@@ -267,7 +267,7 @@ Prospect=Потенц. клиент
 CustomerCard=Карточка Покупателя
 Customer=Покупатель
 CustomerRelativeDiscount=Относительная скидка покупателя
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=Относительная скидка
 CustomerAbsoluteDiscountShort=Абсолютная скидка
 CompanyHasRelativeDiscount=Этот покупатель имеет скидку по умолчанию <b>%s%%</b>
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this suppl
 CompanyHasNoAbsoluteDiscount=Этот клиент не имеет дисконтный кредит
 CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
 CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=Нет
 Supplier=Поставщик
 AddContact=Создать контакт
@@ -304,13 +304,13 @@ DeleteACompany=Удалить компанию
 PersonalInformations=Личные данные
 AccountancyCode=Бухгалтерский счёт
 CustomerCode=Код Покупателя
-SupplierCode=Код Поставщика
+SupplierCode=Vendor code
 CustomerCodeShort=Код Покупателя
-SupplierCodeShort=Код Поставщика
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=Код покупателя, уникальный для каждого покупателя
-SupplierCodeDesc=Код поставщика, уникальный для каждого поставщика
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=Требуется, если контрагент является покупателем или потенциальным клиентом
-RequiredIfSupplier=Требуется, если контрагент является поставщиком
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=Действительность контролируется модулем
 ThisIsModuleRules=Это правила для данного модуля
 ProspectToContact=Потенциальный клиент для связи
@@ -338,7 +338,7 @@ MyContacts=Мои контакты
 Capital=Капитал
 CapitalOf=Столица %s
 EditCompany=Изменить компанию
-ThisUserIsNot=Этот пользователь не является потенциальным клиентом, покупателем или поставщиком
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=Проверить
 VATIntraCheckDesc=Эта ссылка <b>%s</b> позволяет направлять запросы к Европейской службе проверки НДС. Для работы этой службы необходим внешний доступ в Интернет с сервера Dolibarr.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -396,7 +396,7 @@ ImportDataset_company_4=Third parties/Sales representatives (Assign sales repres
 PriceLevel=Уровень цен
 DeliveryAddress=Адрес доставки
 AddAddress=Добавить адрес
-SupplierCategory=Категория поставщика
+SupplierCategory=Vendor category
 JuridicalStatus200=Независимый
 DeleteFile=Удалить файл
 ConfirmDeleteFile=Вы уверены, что хотите удалить этот файл?
@@ -406,7 +406,7 @@ FiscalYearInformation=Информация о финансовом годе
 FiscalMonthStart=Первый месяц финансового года
 YouMustAssignUserMailFirst=Вы должны создать электронную почту для этого пользователя, тогда вы сможете отправлять ему почтовые уведомления.
 YouMustCreateContactFirst=Для добавления электронных уведомлений вы должны сначала указать действующий email контрагента 
-ListSuppliersShort=Список поставщиков
+ListSuppliersShort=List of vendors
 ListProspectsShort=Список потенц. клиентов
 ListCustomersShort=Список покупателей
 ThirdPartiesArea=Область контрагентов и контактов
@@ -420,7 +420,7 @@ CurrentOutstandingBill=Валюта неуплаченного счёта
 OutstandingBill=Максимальный неуплаченный счёт
 OutstandingBillReached=Достигнут максимум не оплаченных счетов
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Вернуть номер с форматом %syymm-NNNN для кода покупателя и %syymm NNNN-код для кода поставщиков, где yy - это год, мм - месяц и NNNN - непрерывная последовательность без возврата к 0.
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=Код покупателю/поставщику не присваивается. Он может быть изменен в любое время.
 ManagingDirectors=Имя управляющего или управляющих (Коммерческого директора, директора, президента...)
 MergeOriginThirdparty=Копия контрагента (контрагент которого вы хотите удалить)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Логин торгового представителя
 SaleRepresentativeFirstname=Имя торгового представителя
 SaleRepresentativeLastname=Фамилия торгового представителя
 ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=Код нового клиента или поставщика дублируется.
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/ru_RU/compta.lang b/htdocs/langs/ru_RU/compta.lang
index 2decddcd8ca..872a15d0e0b 100644
--- a/htdocs/langs/ru_RU/compta.lang
+++ b/htdocs/langs/ru_RU/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=HT оплачивается
 VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
-VATSummary=Tax Balance
+VATSummary=Tax monthly
+VATBalance=Tax Balance
 VATPaid=Tax paid
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=Бухгалтерия / Казначейство обл
 NewPayment=Новые оплаты
 Payments=Платежи
 PaymentCustomerInvoice=Заказчиком оплаты счетов-фактур
-PaymentSupplierInvoice=Поставщик оплате счета-фактуры
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=НДС платеж
 ListPayment=Список платежей
 ListOfCustomerPayments=Список клиентов платежи
-ListOfSupplierPayments=Список поставщиков платежей
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Дата начала периода
 DateEndPeriod=Дата окончания периода
 newLT1Payment=New tax 2 payment
@@ -110,7 +111,7 @@ ShowVatPayment=Показать оплате НДС
 TotalToPay=Всего к оплате
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
 CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
 SupplierAccountancyCodeShort=Sup. account. code
 AccountNumber=Номер счета
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Доклад третьей стороной IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Отчёт по собранному и оплаченному НДС клиента
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,15 +210,16 @@ Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
 Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Строки счёта для отправки
-ByProductsAndServices=По продуктам и услугам
+ByProductsAndServices=By product and service
 RefExt=Внешняя ссылка
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
+ToCreateAPredefinedInvoice=Для создания шаблона счёта создайте стандартный счёт, а затем нажмите кнопку "%s" без его сохранения.
 LinkedOrder=Ссылка для заказа
 Mode1=Метод 1
 Mode2=Метод 2
 CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
 CalculationRuleDescSupplier=According to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Режим вычислений
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
@@ -242,3 +246,10 @@ FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/ru_RU/dict.lang b/htdocs/langs/ru_RU/dict.lang
index 94ea394b220..7f59ed81357 100644
--- a/htdocs/langs/ru_RU/dict.lang
+++ b/htdocs/langs/ru_RU/dict.lang
@@ -5,7 +5,8 @@ CountryIT=Италия
 CountryES=Испания
 CountryDE=Германия
 CountryCH=Швейцария
-CountryGB=Великобритания
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=Соединенное Королевство
 CountryUK=Соединенное Королевство
 CountryIE=Ирландия
 CountryCN=Китай
diff --git a/htdocs/langs/ru_RU/ecm.lang b/htdocs/langs/ru_RU/ecm.lang
index 8b61796d809..09496b101ae 100644
--- a/htdocs/langs/ru_RU/ecm.lang
+++ b/htdocs/langs/ru_RU/ecm.lang
@@ -39,9 +39,10 @@ ShowECMSection=Показать директорию
 DeleteSection=Удаление директории
 ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
 ECMDirectoryForFiles=Относительная директория для файлов
-CannotRemoveDirectoryContainsFiles=Директория не может быть удалена, потому что содержит файлы
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=Файловый менеджер
-ECMSelectASection=Выберите директорию на левом дереве ...
+ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
diff --git a/htdocs/langs/ru_RU/errors.lang b/htdocs/langs/ru_RU/errors.lang
index bfe1375c610..542595d812b 100644
--- a/htdocs/langs/ru_RU/errors.lang
+++ b/htdocs/langs/ru_RU/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Требуется штрих-код
 ErrorCustomerCodeAlreadyUsed=Код клиента уже используется
 ErrorBarCodeAlreadyUsed=Штрих-код уже используется
 ErrorPrefixRequired=Префикс обязателен
-ErrorBadSupplierCodeSyntax=Плохо синтаксис поставщиком код
-ErrorSupplierCodeRequired=Требуется код Поставщика
-ErrorSupplierCodeAlreadyUsed=Код Поставщика уже используется
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Неверные параметры
 ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
 ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
@@ -87,7 +87,7 @@ ErrorsOnXLines=Ошибки на источник <b>%s</b> линий
 ErrorFileIsInfectedWithAVirus=Антивирусная программа не смогла проверить файл (файл может быть заражен вирусом)
 ErrorSpecialCharNotAllowedForField=Специальные символы не допускаются для поля &quot;%s&quot;
 ErrorNumRefModel=Ссылка есть в базе данных (%s) и не совместимы с данным правилом нумерации. Удаление записей или переименован ссылкой для активации этого модуля.
-ErrorQtyTooLowForThisSupplier=Количество слишком мало для этого поставщика или не определена цена на этот продукт для этого поставщика
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Ошибка на маску
 ErrorBadMaskFailedToLocatePosOfSequence=Ошибка, маска без порядкового номера
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
-ErrorSupplierCountryIsNotDefined=Страна для данного поставщика не определена. Сначала исправьте это.
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
@@ -224,7 +224,7 @@ WarningCloseAlways=Warning, closing is done even if amount differs between sourc
 WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all pages showing the box.
 WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card).
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Функция отключена, когда отображение оадптировано для слабовидящих или текстовых браузеров. 
-WarningPaymentDateLowerThanInvoiceDate=Дата платежа (%s)  меньше, чем дата  (%s)  счёта  %s.
+WarningPaymentDateLowerThanInvoiceDate=Дата платежа (%s)  раньше, чем дата  (%s)  счёта  %s.
 WarningTooManyDataPleaseUseMoreFilters=Too many data (more than %s lines). Please use more filters or set the constant %s to a higher limit.
 WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while their hourly rate was not defined. A value of 0 %s per hour was used but this may result in wrong valuation of time spent.
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
diff --git a/htdocs/langs/ru_RU/install.lang b/htdocs/langs/ru_RU/install.lang
index adb1488423e..f4d8422a9d5 100644
--- a/htdocs/langs/ru_RU/install.lang
+++ b/htdocs/langs/ru_RU/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=Файл <b>конфигурации %
 ConfFileCouldBeCreated=Файл <b>конфигурации %s</b> может быть создан.
 ConfFileIsNotWritable=Файл <b>конфигурации %s</b> недоступен для записи. Проверьте права доступа. Для первой установки, Ваш веб-сервер должен быть предоставлен чтобы иметь права доступа для записи в этот файл во время всего процесса установки ( Используйте команду "сhmod" в ОС типа Unix, c маской 666).
 ConfFileIsWritable=Файл <b>конфигурации %s</b> доступен для записи.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Перезагрузить всю информацию из файла конфигурации.
 PHPSupportSessions=Эта версия PHP поддерживает сессии.
 PHPSupportPOSTGETOk=Эта версия PHP поддерживает переменные POST и GET.
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
 WarningRemoveInstallDir=Предупреждение, по соображениям безопасности после того, как установить или обновить завершено, Вы должны удалить <b>каталог или переименовать его в install.lock во избежание ее злонамеренного использования.</b>
 FunctionNotAvailableInThisPHP=Не доступно в текущей версии PHP
 ChoosedMigrateScript=Выбранная перенести скрипт
-DataMigration=Миграция данных
-DatabaseMigration=Миграция Структуры базы данных
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Сценарий обработки
 ChooseYourSetupMode=Выберите режим настройки и нажмите кнопку "Пуск" ...
 FreshInstall=Свежие установить
@@ -146,7 +147,7 @@ NothingToDo=Nothing to do
 # upgrade
 MigrationFixData=Fastsette for denormalized data
 MigrationOrder=Данные по миграции клиентов заказы
-MigrationSupplierOrder=Данные миграции для поставщиков заказов
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Данные миграции для коммерческих предложений
 MigrationInvoice=Данные миграции для клиентов, счета-фактуры
 MigrationContract=Данные по миграции контрактов
@@ -196,6 +197,8 @@ MigrationEvents=Перенос событий для добавления вла
 MigrationEventsContact=Migration of events to add event contact into assignement table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
 MigrationReloadModule=Перегрузите модуль %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 ShowNotAvailableOptions=Показать недоступные опции
diff --git a/htdocs/langs/ru_RU/ldap.lang b/htdocs/langs/ru_RU/ldap.lang
index b7f41d82e17..19b3615ccf0 100644
--- a/htdocs/langs/ru_RU/ldap.lang
+++ b/htdocs/langs/ru_RU/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Пароль для домена
 YouMustChangePassNextLogon=Пароль пользователя <b>%s</b> на домене <b>%s</b> должен быть изменен.
 UserMustChangePassNextLogon=Пользователь должен изменить пароль на домене %s
 LDAPInformationsForThisContact=Информация в базе данных LDAP для этого контакта
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Member type synchronized
 ContactSynchronized=Контакт синхронизирован
 ForceSynchronize=Принудительная синхронизация Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Не удалось прочитать базу данных LDAP. Проверьте настройку модуля LDAP  и доступность базы данных.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/ru_RU/loan.lang b/htdocs/langs/ru_RU/loan.lang
index 55468ec5f5e..70dcafed4e1 100644
--- a/htdocs/langs/ru_RU/loan.lang
+++ b/htdocs/langs/ru_RU/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=Капитал
 Insurance=Страховка
 Interest=Доля капитала
 Nbterms=Количество условий
+Term=Term
 LoanAccountancyCapitalCode=Accounting account capital
 LoanAccountancyInsuranceCode=Accounting account insurance
 LoanAccountancyInterestCode=Accounting account interest
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=Подтвердите удаление этой ссуды
 LoanDeleted=Ссуда успешно удалена
 ConfirmPayLoan=Подтвердите, что эта ссуда оплачена
 LoanPaid=Ссуда оплачена
-# Calc
-LoanCalc=Калькулятор банковской ссуды
-PurchaseFinanceInfo=Информация о покупках и финансах
-SalePriceOfAsset=Цена продажи актива
-PercentageDown=Процент вниз
-LengthOfMortgage=Duration of loan
-AnnualInterestRate=Годовой процент
-ExplainCalculations=Explain Calculations
-ShowMeCalculationsAndAmortization=Show me the calculations and amortization
-MortgagePaymentInformation=Mortgage Payment Information
-DownPayment=Авансовый платёж
-DownPaymentDesc=<b>Авансовый платеж</b> = цена дома, умноженного на процент,  разделенный на 100 (для 5% аванса будет  5/100 или 0.05),
-InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
-MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
-MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
-MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
-MonthlyPaymentDesc=Ежемесячная оплата вычислена, используя следующую формулу
-AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
-AmountFinanced=Amount Financed
-AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
-Totalsforyear=Годовой итог
-MonthlyPayment=Месячный платёж
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
-GoToInterest=%s will go towards INTEREST
-GoToPrincipal=%s will go towards PRINCIPAL
-YouWillSpend=You will spend %s in year %s
 ListLoanAssociatedProject=List of loan associated with the project
 AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Доля капитала
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=Настройка модуля Ссуды
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-FinancialCommitment=Financial commitment
 CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/langs/ru_RU/mails.lang b/htdocs/langs/ru_RU/mails.lang
index 18d59cefc56..ccd4b2b2cf4 100644
--- a/htdocs/langs/ru_RU/mails.lang
+++ b/htdocs/langs/ru_RU/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Отправитель
 MailErrorsTo=Ошибки в
 MailReply=Ответить
 MailTo=Получатель (и)
+MailToUsers=To user(s)
 MailCC=Копия
+MailToCCUsers=Copy to users(s)
 MailCCC=Сохраненная копия
 MailTopic=EMail темы
 MailText=Сообщение
@@ -35,7 +37,7 @@ MailingStatusSentPartialy=Отправлено частично
 MailingStatusSentCompletely=Отправлено полностью
 MailingStatusError=Ошибка
 MailingStatusNotSent=Не отправлено
-MailSuccessfulySent=Email (from %s to %s) successfully accepted for delivery
+MailSuccessfulySent=Письмо (от %s к %s) успешно принято к доставке
 MailingSuccessfullyValidated=Электронная почта успешно подтверждена 
 MailUnsubcribe=Отказаться от рассылки
 MailingStatusNotContact=Не писать
@@ -164,4 +166,4 @@ InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Информация
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang
index b2ff75c00b8..19a39c13986 100644
--- a/htdocs/langs/ru_RU/main.lang
+++ b/htdocs/langs/ru_RU/main.lang
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Режим аутентифика
 Administrator=Администратор
 Undefined=Неопределено
 PasswordForgotten=Забыли пароль?
+NoAccount=No account?
 SeeAbove=См. выше
 HomeArea=Начальная область
 LastConnexion=Последнее подключение
@@ -231,7 +232,7 @@ Limit=Лимит
 Limits=Лимиты
 Logout=Выход
 NoLogoutProcessWithAuthMode=Нет возможности разрыва соединения с этим режимим аунтетификации <b>%s</b>
-Connection=Войти
+Connection=Логин
 Setup=Настройка
 Alert=Оповещение
 MenuWarnings=Предупреждения
@@ -402,6 +403,7 @@ DefaultTaxRate=Default tax rate
 Average=Среднее
 Sum=Сумма
 Delta=Разница
+RemainToPay=Remain to pay
 Module=Модуль/Приложение
 Modules=Модули/Приложения
 Option=Опция
@@ -414,7 +416,7 @@ Favorite=Избранное
 ShortInfo=Инфо
 Ref=Ссылка
 ExternalRef=Внешний источник
-RefSupplier=Ссылка на поставщика
+RefSupplier=Ref. vendor
 RefPayment=Ссылка на оплату
 CommercialProposalsShort=Коммерческие предложения
 Comment=Комментарий
@@ -493,7 +495,7 @@ Received=Получено
 Paid=Оплачено
 Topic=Тема
 ByCompanies=По компаниям
-ByUsers=По пользователям
+ByUsers=By user
 Links=Ссылки
 Link=Ссылка
 Rejects=Отказы
@@ -619,9 +621,9 @@ BuildDoc=Создать Doc
 Entity=Субъект
 Entities=Субъекты
 CustomerPreview=Просмотр Клиента
-SupplierPreview=Просмотр Поставщика
+SupplierPreview=Vendor preview
 ShowCustomerPreview=Показать обзор клиента
-ShowSupplierPreview=Показать обзор поставщика
+ShowSupplierPreview=Show vendor preview
 RefCustomer=Ref. клиента
 Currency=Валюта
 InfoAdmin=Информация для администраторов
@@ -636,7 +638,7 @@ CloseWindow=Закрыть окно
 Response=Ответ
 Priority=Приоритет
 SendByMail=Отправить по электронной почте
-MailSentBy=Отправлено по Email
+MailSentBy=Email отправлен
 TextUsedInTheMessageBody=Текст Email
 SendAcknowledgementByMail=Отправить подтверждение на электронную почту
 SendMail=Отправить письмо
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=Продукты или услуги
 SearchIntoProjects=Проекты
 SearchIntoTasks=Задание
 SearchIntoCustomerInvoices=Счета клиента
-SearchIntoSupplierInvoices=Счета поставщика
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Заказы клиента
-SearchIntoSupplierOrders=Заказы поставщику
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=Предложения клиенту
-SearchIntoSupplierProposals=Предложения поставщику
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Мероприятия
 SearchIntoContracts=Договоры
 SearchIntoCustomerShipments=Отгрузки клиентам
@@ -941,3 +943,5 @@ Remote=Remote
 LocalAndRemote=Local and Remote
 KeyboardShortcut=Keyboard shortcut
 AssignedTo=Ответств.
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/ru_RU/margins.lang b/htdocs/langs/ru_RU/margins.lang
index 75e2da77a30..61546dd6e58 100644
--- a/htdocs/langs/ru_RU/margins.lang
+++ b/htdocs/langs/ru_RU/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=Как услуга
 UseDiscountOnTotal=Включить подитог
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
 MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best supplier price
+MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Себестоимость
 UnitCharges=Unit charges
 Charges=Charges
diff --git a/htdocs/langs/ru_RU/members.lang b/htdocs/langs/ru_RU/members.lang
index dc1048c0234..37a3c5fa974 100644
--- a/htdocs/langs/ru_RU/members.lang
+++ b/htdocs/langs/ru_RU/members.lang
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
diff --git a/htdocs/langs/ru_RU/multicurrency.lang b/htdocs/langs/ru_RU/multicurrency.lang
index e5a80b41d93..f44c1793569 100644
--- a/htdocs/langs/ru_RU/multicurrency.lang
+++ b/htdocs/langs/ru_RU/multicurrency.lang
@@ -7,7 +7,7 @@ multicurrency_syncronize_error=Synchronisation error: %s
 MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use date of document to find currency rate, instead of using latest known rate
 multicurrency_useOriginTx=When an object is created from another, keep the original rate of source object (otherwise use the latest known rate)
 CurrencyLayerAccount=CurrencyLayer API
-CurrencyLayerAccount_help_to_synchronize=You sould create an account on their website to use this functionnality<br>Get your <b>API key</b><br />If you use a free account you can't change the <b>currency source</b> (USD by default)<br />But if your main currency isn't USD you can use the <b>alternate currency source</b> to force you main currency<br /><br />You are limited at 1000 synchronizations per month
+CurrencyLayerAccount_help_to_synchronize=Вы должны создать аккаунт на их сайте для того, чтобы использовать этот функционал<br>Получите<b>API-ключ</b><br>Если вы используете бесплатный аккаунт, вы не можете изменить<b>источник валюты</b>(USD по умолчанию)<br>Но если ваша основная валюта не USD, то вы можете использовать <b>альтернативный источник валюты</b>для того, чтобы принудительно использовать основную валюту<br><br>Вы сможете производить не более 1000 синхронизаций в месяц
 multicurrency_appId=API key
 multicurrency_appCurrencySource=Currency source
 multicurrency_alternateCurrencySource=Alternate currency source
diff --git a/htdocs/langs/ru_RU/opensurvey.lang b/htdocs/langs/ru_RU/opensurvey.lang
index d1dae5a83b0..d83f41fa4ca 100644
--- a/htdocs/langs/ru_RU/opensurvey.lang
+++ b/htdocs/langs/ru_RU/opensurvey.lang
@@ -19,9 +19,9 @@ SelectedDays=Выбранные дни
 TheBestChoice=Лучший выбор на текущий момент это
 TheBestChoices=Лучшие выборы на текущий момент это
 with=с
-OpenSurveyHowTo=Если вы согласны голосовать в данном опросе, вы должны указать выше имя, выбрать значения ответов, которые вам кажутся подходящими и нажать клавишу "+" в конце строки.
+OpenSurveyHowTo=Если вы согласны принять участие в данном опросе, вы должны указать своё имя и выбрать ответы, которые вам кажутся подходящими, нажав кнопку "+" в конце строки.
 CommentsOfVoters=Комментарии проголосовавших
-ConfirmRemovalOfPoll=Вы уверены, что вы хотите удалить этот опрос (и все голоса)
+ConfirmRemovalOfPoll=Вы уверены, что хотите удалить этот опрос (и все голоса)
 RemovePoll=Удалить опрос
 UrlForSurvey=URL для прямого доступа к опросу
 PollOnChoice=Вы создаете опрос с множественным выбором. Сначала введите все возможные варианты выбора для вашего опроса:
@@ -58,3 +58,4 @@ MoreChoices=Введите больше вариантов выбора для 
 SurveyExpiredInfo=Опрос закрыт или период голосования истёк.
 EmailSomeoneVoted=%s заполнил строку. \nВы можете найти Ваш опрос по следующей ссылке: \n%s
 ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/ru_RU/orders.lang b/htdocs/langs/ru_RU/orders.lang
index cb9069b12bd..edf3700ccc7 100644
--- a/htdocs/langs/ru_RU/orders.lang
+++ b/htdocs/langs/ru_RU/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Раздел заказов клиентов
-SuppliersOrdersArea=Раздел заказов поставщиков
+SuppliersOrdersArea=Purchase orders area
 OrderCard=Карточка заказа
 OrderId=Идентификатор заказа
 Order=Заказ
@@ -13,18 +13,18 @@ OrderToProcess=Для обработки
 NewOrder=  Новый заказ
 ToOrder=Сделать заказ
 MakeOrder=Сделать заказ
-SupplierOrder=Для поставщиков
-SuppliersOrders=Поставщики заказ
-SuppliersOrdersRunning=Текущие поставщиков заказов
-CustomerOrder=Для клиентов
-CustomersOrders=Заказы клиента
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=Клиент Заказать
+CustomersOrders=Заказы клиентов
 CustomersOrdersRunning=Current customer orders
 CustomersOrdersAndOrdersLines=Customer orders and order lines
 OrdersDeliveredToBill=Customer orders delivered to bill
 OrdersToBill=Customer orders delivered
 OrdersInProcess=Customer orders in process
 OrdersToProcess=Customer orders to process
-SuppliersOrdersToProcess=Supplier orders to process
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=Отменен
 StatusOrderDraftShort=Черновик
 StatusOrderValidatedShort=Подтвержденные
@@ -75,15 +75,15 @@ ShowOrder=Показать порядок
 OrdersOpened=Orders to process
 NoDraftOrders=Нет проектов заказов
 NoOrder=No order
-NoSupplierOrder=No supplier order
+NoSupplierOrder=No purchase order
 LastOrders=Latest %s customer orders
 LastCustomerOrders=Latest %s customer orders
-LastSupplierOrders=Latest %s supplier orders
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=Latest %s modified orders
 AllOrders=Все заказы
 NbOfOrders=Количество заказов
 OrdersStatistics=Приказы Статистика
-OrdersStatisticsSuppliers=Поставщик заказов статистика
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Количество заказов в месяц
 AmountOfOrdersByMonthHT=Количество заказов по месяцам (за вычетом налогов)
 ListOfOrders=Список заказов
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</
 GenerateBill=Создать счет-фактуру
 ClassifyShipped=Отметить доставленным
 DraftOrders=Проект распоряжения
-DraftSuppliersOrders=Draft suppliers orders
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=В процессе заказов
 RefOrder=Ref. заказ
 RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for supplier
-RefOrderSupplierShort=Ref. order supplier
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=Отправить заказ по почте
 ActionsOnOrder=Меры по заказу
 NoArticleOfTypeProduct=Нет статьи типа "продукт", поэтому не shippable статью для этого заказа
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
 DispatchSupplierOrder=Прием %s поставщиком для
 FirstApprovalAlreadyDone=Первое утверждение уже сделано
 SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=Supplier order %s received %s
-SupplierOrderSubmitedInDolibarr=Supplier order %s submited
-SupplierOrderClassifiedBilled=Supplier order %s set billed
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Другие заказы
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Представитель следующие меры для клиентов
@@ -125,11 +125,11 @@ 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_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Представитель следующие меры судоходства
-TypeContact_order_supplier_external_BILLING=Поставщик счет контакта
-TypeContact_order_supplier_external_SHIPPING=Поставщик доставка контакты
-TypeContact_order_supplier_external_CUSTOMER=Поставщик связаться следующие меры для
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Постоянная COMMANDE_SUPPLIER_ADDON не определена
 Error_COMMANDE_ADDON_NotDefined=Постоянная COMMANDE_ADDON не определена
 Error_OrderNotChecked=Не выбраны заказы для выставления счёта
diff --git a/htdocs/langs/ru_RU/other.lang b/htdocs/langs/ru_RU/other.lang
index ac552af9595..35d2051bd2b 100644
--- a/htdocs/langs/ru_RU/other.lang
+++ b/htdocs/langs/ru_RU/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=Файлы слишком велик
 PleaseBePatient=Пожалуйста, будьте терпеливы ...
 NewPassword=New password
 ResetPassword=Reset password
-RequestToResetPasswordReceived=Получен запрос на изменение вашего пароля в системе Dolibarr
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=Ваши новые ключи для доступа
 NewKeyWillBe=Ваш новый ключ для доступа к ПО будет
 ClickHereToGoTo=Нажмите сюда, чтобы перейти к %s
@@ -233,6 +233,8 @@ PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=Экспорт области
 AvailableFormats=Доступные форматы
diff --git a/htdocs/langs/ru_RU/productbatch.lang b/htdocs/langs/ru_RU/productbatch.lang
index b740d101384..5ee0a0ee141 100644
--- a/htdocs/langs/ru_RU/productbatch.lang
+++ b/htdocs/langs/ru_RU/productbatch.lang
@@ -16,7 +16,7 @@ printEatby=Дата окончания срока годности: %s
 printSellby=Дата продажи: %s
 printQty=Кол-во:%d
 AddDispatchBatchLine=Добавить строку Срока годности
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic increase/decrease stock mode is forced to shipping validate and manual dispatching for reception and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
 ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
diff --git a/htdocs/langs/ru_RU/products.lang b/htdocs/langs/ru_RU/products.lang
index a69dcabc118..c2ab69ae98e 100644
--- a/htdocs/langs/ru_RU/products.lang
+++ b/htdocs/langs/ru_RU/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=Новая цена
 MinPrice=Min. selling price
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=Продажная цена не может быть ниже минимальной для этого товара (%s без налогов). Это сообщение также возникает, если вы задаёте слишком большую скидку.
 ContractStatusClosed=Закрытые
 ErrorProductAlreadyExists=Продукции с учетом% уже существует.
@@ -155,7 +156,7 @@ BuyingPrices=Buying prices
 CustomerPrices=Цены клиентов
 SuppliersPrices=Цены поставщиков
 SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
-CustomCode=Customs/Commodity/HS code
+CustomCode=Таможенный / Товарный / HS код
 CountryOrigin=Страна происхождения
 Nature=Природа
 ShortLabel=Short label
@@ -322,7 +323,7 @@ ProductCombinationGeneratorWarning=If you continue, before generating new varian
 TooMuchCombinationsWarning=Generating lots of variants may result in high CPU, memory usage and Dolibarr not able to create them. Enabling the option "%s" may help reduce memory usage.
 DoNotRemovePreviousCombinations=Do not remove previous variants
 UsePercentageVariations=Use percentage variations
-PercentageVariation=Percentage variation
+PercentageVariation=Изменение процентов
 ErrorDeletingGeneratedProducts=There was an error while trying to delete existing product variants
 NbOfDifferentValues=Nb of different values
 NbProducts=Nb. of products
diff --git a/htdocs/langs/ru_RU/projects.lang b/htdocs/langs/ru_RU/projects.lang
index 4d7664ac00f..c59225e9536 100644
--- a/htdocs/langs/ru_RU/projects.lang
+++ b/htdocs/langs/ru_RU/projects.lang
@@ -77,6 +77,7 @@ Time=Время
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=Списки коммерческих предложений, связанных с проектом
 ListOrdersAssociatedProject=List of customer orders associated with the project
@@ -226,4 +227,4 @@ AllowCommentOnProject=Allow user comments on projects
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/ru_RU/stocks.lang b/htdocs/langs/ru_RU/stocks.lang
index a16bd0b3d73..6e853295c7a 100644
--- a/htdocs/langs/ru_RU/stocks.lang
+++ b/htdocs/langs/ru_RU/stocks.lang
@@ -203,3 +203,4 @@ RegulateStock=Regulate Stock
 ListInventory=Список
 StockSupportServices=Stock management support services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/ru_RU/stripe.lang b/htdocs/langs/ru_RU/stripe.lang
index f3d51ed45be..4989304a344 100644
--- a/htdocs/langs/ru_RU/stripe.lang
+++ b/htdocs/langs/ru_RU/stripe.lang
@@ -58,8 +58,8 @@ NameOnCard=Name on card
 CardNumber=Card Number
 ExpiryDate=Expiry Date
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/ru_RU/supplier_proposal.lang b/htdocs/langs/ru_RU/supplier_proposal.lang
index fafc5fd52fd..582b980938c 100644
--- a/htdocs/langs/ru_RU/supplier_proposal.lang
+++ b/htdocs/langs/ru_RU/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Supplier commercial proposals
-supplier_proposalDESC=Manage price requests to suppliers
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
 SupplierProposalNew= Новый запрос цены
 CommRequest=Price request
 CommRequests=Запросы цены
 SearchRequest=Find a request
 DraftRequests=Draft requests
-SupplierProposalsDraft=Draft supplier proposals
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=Latest %s modified price requests
 RequestsOpened=Open price requests
-SupplierProposalArea=Статистика по поставщикам
-SupplierProposalShort=Supplier proposal
-SupplierProposals=Предложения поставщику
-SupplierProposalsShort=Предложения поставщику
+SupplierProposalArea=Vendor proposals area
+SupplierProposalShort=Vendor proposal
+SupplierProposals=Vendor proposals
+SupplierProposalsShort=Vendor proposals
 NewAskPrice= Новый запрос цены
 ShowSupplierProposal=Show price request
 AddSupplierProposal=Create a price request
-SupplierProposalRefFourn=Supplier ref
+SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=Дата доставки
 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>?
@@ -47,9 +47,9 @@ CommercialAsk=Price request
 DefaultModelSupplierProposalCreate=Создание модели по умолчанию
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposals= Список запросов поставщику
-ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
-SupplierProposalsToClose=Supplier proposals to close
-SupplierProposalsToProcess=Supplier proposals to process
+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
diff --git a/htdocs/langs/ru_RU/suppliers.lang b/htdocs/langs/ru_RU/suppliers.lang
index c12b53dc2f7..bfcb0877c5b 100644
--- a/htdocs/langs/ru_RU/suppliers.lang
+++ b/htdocs/langs/ru_RU/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Поставщики
-SuppliersInvoice=Счета-фактуры от поставщиков
-ShowSupplierInvoice=Show Supplier Invoice
-NewSupplier=Новый поставщик
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=История
-ListOfSuppliers=Список поставщиков
-ShowSupplier=Показать поставщика
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=Дата заказа
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Для субтоваров  товаров не указана цена
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
-SupplierPrices=Цены поставщиков
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Эта ссылка поставщиком уже связан с ссылкой: %s
-NoRecordedSuppliers=Нет зарегистрированных поставщиков
-SupplierPayment=Оплаты поставщика
-SuppliersArea=Раздел поставщиков
-RefSupplierShort=Ref. Поставщик
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=Доступность
-ExportDataset_fournisseur_1=Список счетов поставщика  и строки счета
-ExportDataset_fournisseur_2=Поставщиком счета-фактуры и платежи
-ExportDataset_fournisseur_3=Заказы поставщика и строки заказа
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=Утвердить этот заказ
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Отменить этот заказ
 ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
 ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
-AddSupplierOrder=Создать поставщиком порядка
-AddSupplierInvoice=Создать поставщику счет-фактуру
-ListOfSupplierProductForSupplier=Перечень продукции и цен для <b>поставщиков %s</b>
-SentToSuppliers=Отправлено поставщикам
-ListOfSupplierOrders=Список заказов поставщиков
-MenuOrdersSupplierToBill=Заказы поставщика для выписки счёта
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Задержка доставки в днях
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-SupplierReputation=Supplier reputation
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
 AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=Цены поставщиков
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/ru_RU/website.lang b/htdocs/langs/ru_RU/website.lang
index 77c665c2398..dbce71e54fa 100644
--- a/htdocs/langs/ru_RU/website.lang
+++ b/htdocs/langs/ru_RU/website.lang
@@ -73,7 +73,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
diff --git a/htdocs/langs/ru_RU/workflow.lang b/htdocs/langs/ru_RU/workflow.lang
index a3af7b121d3..98227e18291 100644
--- a/htdocs/langs/ru_RU/workflow.lang
+++ b/htdocs/langs/ru_RU/workflow.lang
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source custome
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/sk_SK/accountancy.lang b/htdocs/langs/sk_SK/accountancy.lang
index 75b10e7423c..94d8c117816 100644
--- a/htdocs/langs/sk_SK/accountancy.lang
+++ b/htdocs/langs/sk_SK/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Účtovníctvo
 ACCOUNTING_EXPORT_SEPARATORCSV=Oddeľovač stĺpcov pre exportný súbor
 ACCOUNTING_EXPORT_DATE=Formát dátumu pre súbor exportu
 ACCOUNTING_EXPORT_PIECE=Export čísla kusu
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Accounts with non zero values
 ListOfAccounts=List of accounts
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers 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
 
-AccountancyArea=Účtovná oblasť
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Použitie účtovného modulu sa vykonáva v niekoľkých krokoch:
 AccountancyAreaDescActionOnce=Nasledujúce akcie sa zvyčajne vykonávajú iba raz alebo raz za rok ...
 AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
@@ -89,7 +90,7 @@ MenuProductsAccounts=Produktové účty
 ProductsBinding=Produkty účty
 Ventilation=Priradené k účtom
 CustomersVentilation=Priradenie zákazníckej faktúry
-SuppliersVentilation=Priradenie dodávateľskej faktúry
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Vytvorte novú transakciu
 UpdateMvts=Úprava transakcie
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=Zakúpte denník
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Rôzne denníky
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Denník výdavkov
 ACCOUNTING_SOCIAL_JOURNAL=Sociálny časopis
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Účtovný účet prevodu
 ACCOUNTING_ACCOUNT_SUSPENSE=Účtovný účet čakania
@@ -185,11 +187,12 @@ ListeMvts=Zoznam pohybov
 ErrorDebitCredit=Debit a kredit nemôžu mať hodnotu súčasne
 AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=Uveďte účet tretej strany
-DescThirdPartyReport=Prečítajte si zoznam tretích zákazníkov a dodávateľov a ich účtovných účtov
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=Zoznam účtovných účtov
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Group of account
 Pcgsubtype=Subgroup of account
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Pozrite si zoznam riadkov zákazníkov faktúr a ich úč
 DescVentilTodoCustomer=Uviazať linky faktúr, ktoré ešte nie sú viazané účtom účtovania produktu
 ChangeAccount=Zmeniť účtovný účet produktu / služby pre vybrané riadky s týmto účtovným účtom:
 Vide=-
-DescVentilSupplier=Pozrite si zoznam dodávateľských faktúr, ktoré sú viazané alebo ešte nie sú viazané na účet účtovania produktu
-DescVentilDoneSupplier=Pozrite si zoznam liniek dodávateľov faktúr a ich účtovný účet
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
 DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report 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 fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Priradzovať automaticky
 AutomaticBindingDone=Automatické priradenie dokončené
 
 ErrorAccountancyCodeIsAlreadyUse=Chyba, nemôžete odstrániť tento účtovný účet, pretože sa používa
-MvtNotCorrectlyBalanced=Pohyb nie je správne vyvážený. Úver = %s. Debit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Viazacia karta
 GeneralLedgerIsWritten=Transakcie sú zapísané v knihe
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -293,4 +296,9 @@ Binded=Viazané čiary
 ToBind=Linky na viazanie
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang
index 3acaf40375a..955f2dbf908 100644
--- a/htdocs/langs/sk_SK/admin.lang
+++ b/htdocs/langs/sk_SK/admin.lang
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=SMTP / SMTPS Host (V predvolenom nastavení v php.ini: <b>
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP / SMTPS Port (Nie je definovaná v PHP na Unixe, ako napr systémy)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPS Host (Nie je definovaná v PHP na Unixe, ako napr systémy)
 MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= Poslať systematicky skrytú uhlík-kópie všetkých odoslaných e-mailov
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=Použitá metóda pri odosielaní e-mailov
 MAIN_MAIL_SMTPS_ID=SMTP ID ak sa vyžaduje overenie
 MAIN_MAIL_SMTPS_PW=Heslo SMTP Ak sa vyžaduje overenie
@@ -291,7 +292,7 @@ ModuleSetup=Nastavenie modulu
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=Systém
 ModuleFamilyCrm=Riadenie vzťahov so zákazníkmi (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Správa produktov ( PM )
 ModuleFamilyHr=Správa ľudských zdrojov ( HR )
 ModuleFamilyProjects=Projekty / tímovú prácu
@@ -373,7 +374,8 @@ NoSmsEngine=Nie odosielateľ SMS manažér k dispozícii. SMS odosielateľa mana
 PDF=PDF
 PDFDesc=Môžete nastaviť každý globálne možnosti týkajúce sa generovanie PDF
 PDFAddressForging=Pravidlá sa budujú adresy boxy
-HideAnyVATInformationOnPDF=Skryť všetky informácie týkajúce sa DPH na generované PDF
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=Skryť opis výrobkov z vytvoreného PDF
@@ -445,7 +447,8 @@ DisplayCompanyInfo=Zobraziť adresu spoločnosti
 DisplayCompanyManagers=Zobraziť mená manažérov
 DisplayCompanyInfoAndManagers=Zobraziť adresu spoločnosti a mená manažérov
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party 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.
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Set this to 1 if you want to attach main document to emai
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=Používatelia a skupiny
 Module0Desc=Users / Employees and Groups management
@@ -479,7 +485,7 @@ Module1Desc=Firmy a správu kontaktov (zákazníci, vyhliadky ...)
 Module2Name=Obchodné
 Module2Desc=Obchodné riadenie
 Module10Name=Účtovníctvo
-Module10Desc=Jednoduché účtovníctvo správy (časopisy, obrat) vychádza na obsahu databázy. No dispečing.
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=Návrhy
 Module20Desc=Komerčné návrh riadenia
 Module22Name=Mass E-mailing
@@ -546,8 +552,8 @@ Module400Name=Projekty/Príležitosti/Vyhliadky
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=WebCalendar
 Module410Desc=WebCalendar integrácia
-Module500Name=špeciálne rozšírenia
-Module500Desc=Správca špeciálnych rozšírení ( dane, sociálne a fiškálne dane, dividendy )
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Payment of employee wages
 Module510Desc=Record and follow payment of your employee wages
 Module520Name=Pôžička
@@ -561,14 +567,14 @@ Module700Name=Dary
 Module700Desc=Darovanie riadenie
 Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Dodávateľský obchodný návrh
-Module1120Desc=Vyžiadať dodávateľskú obchodnú ponuku a ceny
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Mantis integrácia
 Module1520Name=Generovanie dokumentov
 Module1520Desc=Masové emailové generovanie dokumentov
 Module1780Name=Štítky / Kategórie
-Module1780Desc=Vytvorte štítky / kategórie (produkty, zákazníkov, dodávateľov, kontakty alebo členov)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Povoliť úpravu niektorého textu použitím rozšíreného oditora ( Založené na CKEditor )
 Module2200Name=Dynamická cena
@@ -576,7 +582,7 @@ Module2200Desc=Zapnúť používanie matematických výrazov pre ceny
 Module2300Name=Naplánované úlohy
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API/Webové služby ( SOAP server )
@@ -613,7 +619,7 @@ Module50100Desc=Modul predajné miesta ( POS )
 Module50200Name=Paypal
 Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 Module50400Name=Učtovníctvo (pokročilé)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Anketa, Dotazník, Hlasovanie
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerancia oneskorenie (v dňoch) pred záznam o mešk
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerancia oneskorenie (v dňoch) pred pohotovosti pre kontrolu vklad robiť
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=Oblasť nastavení je pre základné nastavenia pre začatím používania Dolubarru
-SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=Ostatné položky menu spravovať voliteľné parametre.
 LogEvents=Udalosti bezpečnostný audit
 Audit=Audit
@@ -1054,8 +1060,9 @@ LogEventDesc=Môžete povoliť tu zapisovanie udalostí Dolibarr zabezpečenia.
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Systémové informácie je rôzne technické informácie získate v režime iba pre čítanie a viditeľné len pre správcov.
 SystemAreaForAdminOnly=Táto oblasť je k dispozícii pre správcu užívateľa. Žiadny z Dolibarr oprávnenia môže znížiť tento limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=Môžete si vybrať každý parameter týkajúce sa vzhľadu Dolibarr a cítiť sa tu
 AvailableModules=Available app/modules
 ToActivateModule=Pre aktiváciu modulov, prejdite na nastavenie priestoru (Domov-&gt; Nastavenie-&gt; Modules).
@@ -1188,11 +1195,11 @@ UserMailRequired=EMail nutné vytvoriť nového užívateľa
 HRMSetup=HRM module setup
 ##### Company setup #####
 CompanySetup=Firmy modul nastavenia
-CompanyCodeChecker=Modul pre generovanie kódu tretích strán a preskúšavanie (zákazník alebo dodávateľ)
-AccountCodeManager=Module for accounting code generation (customer or supplier)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
 NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
 ModelModules=Dokumenty šablóny
 DocumentModelOdt=Generovanie dokumentov z OpenDocuments šablón (. ODT alebo ODS. Súbory OpenOffice, KOffice, TextEdit, ...)
@@ -1203,6 +1210,9 @@ MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
 TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Export odkaz na <b>%s</b> formáte je k dispozícii na nasledujúcom odkaze: %s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=Voľný text o obchodných návrhov
 WatermarkOnDraftProposal=Vodoznak na predlôh návrhov komerčných (none ak prázdny)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
 ##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=Objednať riadenie nastavenia
 OrdersNumberingModules=Objednávky číslovanie modelov
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=Pripojenie k serveru &quot;%s&quot; na databázu &quot;%s&quot;
 OSCommerceTestKo1=Pripojenie k &quot;%s&quot; servera úspešná, ale databáza &quot;%s&quot; by nebolo možné dosiahnuť.
 OSCommerceTestKo2=Pripojenie k serveru &quot;%s&quot; s užívateľom &quot;%s 'zlyhalo.
 ##### Stock #####
-StockSetup=Nastavenie modulu Sklady
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
 ##### Menu #####
 MenuDeleted=Menu zmazaný
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
 MultiCompanySetup=Spoločnosť Multi-modul nastavenia
 ##### Suppliers #####
 SuppliersSetup=Dodávateľ modul nastavenia
-SuppliersCommandModel=Kompletná šablóna sa s dodávateľmi poriadku (logo. ..)
-SuppliersInvoiceModel=Kompletná šablóna dodávateľskej faktúry (logo. ..)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Dodávateľských faktúr číslovanie modelov
 IfSetToYesDontForgetPermission=Ak nastavené ANO, nezabudnite poskytnúť povolenia pre skupiny alebo užívateľov oprávnených pre povoľovanie 2. stupňa
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=Nepoúžívajte znaky  ("1","l","i","|","0","O") pre a
 SalariesSetup=Nastavenei mzdového modulu
 SortOrder=Zoradiť objednávky
 Format=Formát
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Zahrnúť cestu ( definovať do premennej %s )
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Install of external module from applic
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Zvýrazniť riadok pre prechode kurzora
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
-TextTitleColor=Color of page title
+TextTitleColor=Text color of Page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Spolupracuje so základnou témou, nemusí byť podporované externou témou
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=Farba pozadia pre vrchné menu
 TopMenuDisableImages=Skryť obrázky vo vrchnom menu
 LeftMenuBackgroundColor=Farba pozadia pre ľavé menu
 BackgroundTableTitleColor=Farba pozadia pre riadok s názvom
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Farba pozadia pre nepárne riadky tabuľky
 BackgroundTableLineEvenColor=Farba pozadia pre párne riadky tabuľky
 MinimumNoticePeriod=Minimálny oznamovací čas ( Vaša požiadávka musi byť zaznamenaná pred týmto časom )
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=Príklad: +2 ( vyplňte iba ak máte problém )
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
 ForcedConstants=Required constant values
-MailToSendProposal=Zákaznícka ponuka na poslanie
-MailToSendOrder=Zákaznícka objednávka na poslanie
-MailToSendInvoice=Zákaznícka faktúra na poslanie
-MailToSendShipment=Pošta na poslanie
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=Citácia pre dodávateľa na poslanie
-MailToSendSupplierOrder=Dodávateľska objednávka na poslanie
-MailToSendSupplierInvoice=Dodávateľská faktúra na poslanie
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-MailToMember=To send email from member page
-MailToUser=To send email from user page
-MailToProject= To send email from project page
+MailToSendProposal=Customer proposals
+MailToSendOrder=Customer orders
+MailToSendInvoice=Customer invoices
+MailToSendShipment=Zásielky
+MailToSendIntervention=Zásahy
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Zmluvy
+MailToThirdparty=Tretie strany
+MailToMember=Členovia
+MailToUser=Užívatelia
+MailToProject=Projects page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1780,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/sk_SK/bills.lang b/htdocs/langs/sk_SK/bills.lang
index 649e8b3fcdf..5c72de1a40e 100644
--- a/htdocs/langs/sk_SK/bills.lang
+++ b/htdocs/langs/sk_SK/bills.lang
@@ -109,7 +109,7 @@ CancelBill=Storno faktúry
 SendRemindByMail=Poslať pripomienku EMail
 DoPayment=Enter payment
 DoPaymentBack=Enter refund
-ConvertToReduc=Prevod do budúcnosti zľavou
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Zadajte platby, ktoré obdržal od zákazníka
@@ -120,7 +120,7 @@ BillStatus=Stav faktúry
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Návrh (musí byť overená)
 BillStatusPaid=Platený
-BillStatusPaidBackOrConverted=Credit note refund or converted into discount
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Opustený
 BillStatusValidated=Overené (potrebné venovať)
@@ -296,10 +296,10 @@ DiscountType=Discount type
 NoteReason=Poznámka / príčina
 ReasonDiscount=Dôvod
 DiscountOfferedBy=Poskytnuté
-DiscountStillRemaining=Discounts available
-DiscountAlreadyCounted=Discounts already consumed
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+SupplierDiscounts=Vendors discounts
 BillAddress=Bill adresa
 HelpEscompte=Táto zľava je zľava poskytnutá zákazníkovi, pretože jej platba bola uskutočnená pred horizonte.
 HelpAbandonBadCustomer=Táto suma bola opustená (zákazník povedal, aby bol zlý zákazník) a je považovaný za výnimočný voľné.
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but
 PaymentNote=Poznámka platby
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Každých %s dní
 FrequencyPer_m=Každých %s mesiacov
 FrequencyPer_y=Každých %s rokov
@@ -505,9 +511,14 @@ SituationAmount=Situation invoice amount(net)
 SituationDeduction=Situation subtraction
 ModifyAllLines=Modify all lines
 CreateNextSituationInvoice=Create next situation
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=S
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
 NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
@@ -532,3 +543,4 @@ AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/sk_SK/categories.lang b/htdocs/langs/sk_SK/categories.lang
index 87d1a04d11b..3c8e5e9d1a0 100644
--- a/htdocs/langs/sk_SK/categories.lang
+++ b/htdocs/langs/sk_SK/categories.lang
@@ -16,7 +16,7 @@ MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
-SubCats=Podkategórie
+SubCats=Sub-categories
 CatList=List of tags/categories
 NewCategory=New tag/category
 ModifCat=Modify tag/category
@@ -85,3 +85,4 @@ CategorieRecursivHelp=If activated, product will also linked to parent category
 AddProductServiceIntoCategory=Add the following product/service
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
+ChooseCategory=Choose category
diff --git a/htdocs/langs/sk_SK/commercial.lang b/htdocs/langs/sk_SK/commercial.lang
index 01450502204..d568369d081 100644
--- a/htdocs/langs/sk_SK/commercial.lang
+++ b/htdocs/langs/sk_SK/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=Zavrieť
 ActionAC_EMAILING=Poslať hromadný email
 ActionAC_COM=Poslať objednávky zákazníka e-mailom
 ActionAC_SHIP=Poslať prepravu poštou
-ActionAC_SUP_ORD=Poslať e-mailom objednávku s dodávateľmi
-ActionAC_SUP_INV=Poslať dodávateľskej faktúry poštou
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=Ostatné
 ActionAC_OTH_AUTO=Automaticky vložené udalosti
 ActionAC_MANUAL=Ručne vložené udalosti
diff --git a/htdocs/langs/sk_SK/companies.lang b/htdocs/langs/sk_SK/companies.lang
index 0b7af8128ae..6302122117e 100644
--- a/htdocs/langs/sk_SK/companies.lang
+++ b/htdocs/langs/sk_SK/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Are you sure you want to delete this contact and all inheri
 MenuNewThirdParty=Nový treťou stranou
 MenuNewCustomer=Nový zákazník
 MenuNewProspect=Nová Vyhliadka
-MenuNewSupplier=Nový dodávateľ
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=Nová súkromná osoba
-NewCompany=Nová spoločnosť (vyhliadka, zákazník, dodávateľ)
-NewThirdParty=Nový tretia strana (vyhliadka, zákazník, dodávateľ)
-CreateDolibarrThirdPartySupplier=Vytvoriť tretiu stranu (dodávateľa)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=Vytvoriť tretiu stranu
 CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Prospekcia plochy
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=Vyhliadky
 ThirdPartyCustomers=Zákazníci
 ThirdPartyCustomersStats=Zákazníci
 ThirdPartyCustomersWithIdProf12=Zákazníci s %s alebo %s
-ThirdPartySuppliers=Dodávatelia
+ThirdPartySuppliers=Vendors
 ThirdPartyType=Tretí typ vyhľadávajúci večierky
 Individual=Súkromná osoba
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
@@ -77,11 +77,11 @@ Web=Web
 Poste= Pozícia
 DefaultLang=Predvolený jazyk
 VATIsUsed=Sales tax is used
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
-ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Návrhy
 OverAllOrders=Objednávky
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=RE Type
 TypeLocaltax2ES=IRPF Type
 WrongCustomerCode=Zákaznícky kód neplatný
-WrongSupplierCode=Dodávateľ kód neplatný
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Zákaznícky kód modelu
-SupplierCodeModel=Dodávateľ kód modelu
+SupplierCodeModel=Vendor code model
 Gencod=Čiarový kód
 ##### Professional ID #####
 ProfId1Short=Prof id 1
@@ -267,7 +267,7 @@ Prospect=Vyhliadka
 CustomerCard=Zákaznícka karta
 Customer=Zákazník
 CustomerRelativeDiscount=Relatívna zákazník zľava
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=Relatívna zľava
 CustomerAbsoluteDiscountShort=Absolútna zľava
 CompanyHasRelativeDiscount=Tento zákazník má predvolenú zľavu <b>%s%%</b>
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this suppl
 CompanyHasNoAbsoluteDiscount=Tento zákazník nemá diskontné úver k dispozícii
 CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
 CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=Nikto
 Supplier=Dodávateľ
 AddContact=Vytvoriť kontakt
@@ -304,13 +304,13 @@ DeleteACompany=Odstránenie spoločnosť
 PersonalInformations=Osobné údaje
 AccountancyCode=Accounting account
 CustomerCode=Zákaznícky kód
-SupplierCode=Kód dodávateľa
+SupplierCode=Vendor code
 CustomerCodeShort=Zákaznícky kód
-SupplierCodeShort=Kód dodávateľa
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=Zákaznícky kód, jedinečný pre všetkých zákazníkov
-SupplierCodeDesc=Dodávateľ kód, jedinečný pre všetkých dodávateľov
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=Požadované, ak tretia osoba zákazníka alebo perspektíva
-RequiredIfSupplier=Požadované, ak tretia strana je dodávateľom
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=Platnosť riadený modulom
 ThisIsModuleRules=Jedná sa pravidlá pre tento modul
 ProspectToContact=Prospect kontaktovať
@@ -338,7 +338,7 @@ MyContacts=Moje kontakty
 Capital=Kapitál
 CapitalOf=Hlavné mesto %s
 EditCompany=Upraviť spoločnosť
-ThisUserIsNot=Tento užívateľ nie je vyhliadka, zákazník ani dodávateľ
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=Kontrola
 VATIntraCheckDesc=Odkaz <b>%s</b> umožňuje požiadať Európsku DPH checker služby. Externý prístup k internetu zo servera je nutné pre túto službu do práce.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -396,7 +396,7 @@ ImportDataset_company_4=Third parties/Sales representatives (Assign sales repres
 PriceLevel=Cenová hladina
 DeliveryAddress=Dodacia adresa
 AddAddress=Pridať adresu
-SupplierCategory=Dodávateľ kategórie
+SupplierCategory=Vendor category
 JuridicalStatus200=Independent
 DeleteFile=Zmazať súbor
 ConfirmDeleteFile=Ste si istí, že chcete zmazať tento súbor?
@@ -406,7 +406,7 @@ FiscalYearInformation=Informácie o fiškálny rok
 FiscalMonthStart=Počiatočný mesiac fiškálneho roka
 YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
 YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
-ListSuppliersShort=Zoznam dodávateľov
+ListSuppliersShort=List of vendors
 ListProspectsShort=Zoznam vyhliadky
 ListCustomersShort=Zoznam zákazníkov
 ThirdPartiesArea=Oblasť tretích strán a kontaktov
@@ -420,7 +420,7 @@ CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. za vynikajúce účet
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Späť numero vo formáte %syymm-nnnn pre zákazníka kódu a %syymm-NNNN s dodávateľmi kódu, kde yy je rok, MM je mesiac a nnnn je sekvencia bez prerušenia a bez návratu na 0.
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=Kód je zadarmo. Tento kód je možné kedykoľvek zmeniť.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/sk_SK/compta.lang b/htdocs/langs/sk_SK/compta.lang
index dd6bafb2f82..7eb53df1a4f 100644
--- a/htdocs/langs/sk_SK/compta.lang
+++ b/htdocs/langs/sk_SK/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=Čisté platené
 VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
-VATSummary=Tax Balance
+VATSummary=Tax monthly
+VATBalance=Tax Balance
 VATPaid=Tax paid
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=Účtovníctvo / Treasury oblasť
 NewPayment=Nový platobný
 Payments=Platby
 PaymentCustomerInvoice=Zákazník faktúru
-PaymentSupplierInvoice=Dodávateľ faktúru
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Platba sociálnej/fiškálnej dane
 PaymentVat=DPH platba
 ListPayment=Zoznam platieb
 ListOfCustomerPayments=Zoznam zákazníckych platieb
-ListOfSupplierPayments=Zoznam platieb dodávateľom
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -110,7 +111,7 @@ ShowVatPayment=Zobraziť DPH platbu
 TotalToPay=Celkom k zaplateniu
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
 CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
 SupplierAccountancyCodeShort=Sup. account. code
 AccountNumber=Číslo účtu
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Správa o treťou stranou IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Správa zákazníka DPH vyzdvihnúť a zaplatiť
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Chart of accounts models
 Pcg_type=PCG typ
 Pcg_subtype=PCG podtyp
 InvoiceLinesToDispatch=Faktúra linky na expedíciu
-ByProductsAndServices=Výrobkami a službami
+ByProductsAndServices=By product and service
 RefExt=Externé ref
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
 LinkedOrder=Link to order
@@ -215,7 +218,8 @@ Mode1=Method 1
 Mode2=Metóda 2
 CalculationRuleDesc=Ak chcete vypočítať celkovú sumu DPH, tam sú dve metódy: <br> Metóda 1 je zaokrúhlenie DPH na každom riadku, potom sa spočítajú tak. <br> Metóda 2 je súčtom všetkých sud na každom riadku, potom sa výsledok zaokrúhľovania. <br> Konečný výsledok môže sa líši od niekoľkých centov. Predvolený režim je režim <b>%s.</b>
 CalculationRuleDescSupplier=According to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Obrat správa za tovar, pri použití <b>hotovosti evidencia</b> režim nie je relevantná. Táto správa je k dispozícii len pri použití <b>zásnubný evidencia</b> režimu (pozri nastavenie účtovného modulu).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Výpočet režim
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
@@ -242,3 +246,10 @@ FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/sk_SK/dict.lang b/htdocs/langs/sk_SK/dict.lang
index 41b88174fda..a20f900306e 100644
--- a/htdocs/langs/sk_SK/dict.lang
+++ b/htdocs/langs/sk_SK/dict.lang
@@ -5,7 +5,8 @@ CountryIT=Taliansko
 CountryES=Španielsko
 CountryDE=Nemecko
 CountryCH=Švajčiarsko
-CountryGB=Veľká Británia
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=Spojené Kráľovstvo
 CountryUK=Spojené Kráľovstvo
 CountryIE=Írsko
 CountryCN=Čína
diff --git a/htdocs/langs/sk_SK/ecm.lang b/htdocs/langs/sk_SK/ecm.lang
index 9a00eccd295..54ca11128af 100644
--- a/htdocs/langs/sk_SK/ecm.lang
+++ b/htdocs/langs/sk_SK/ecm.lang
@@ -39,9 +39,10 @@ ShowECMSection=Zobraziť adresár
 DeleteSection=Odstráňte adresár
 ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
 ECMDirectoryForFiles=Relatívny adresár pre súbory
-CannotRemoveDirectoryContainsFiles=Nie je možné odstrániť, pretože obsahuje niektoré súbory
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=Správca súborov
-ECMSelectASection=Vyberte adresár na ľavej strane stromu ...
+ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
diff --git a/htdocs/langs/sk_SK/errors.lang b/htdocs/langs/sk_SK/errors.lang
index ec1972457f3..21305653a83 100644
--- a/htdocs/langs/sk_SK/errors.lang
+++ b/htdocs/langs/sk_SK/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Bar code required
 ErrorCustomerCodeAlreadyUsed=Zákaznícky kód už používaný
 ErrorBarCodeAlreadyUsed=Bar code already used
 ErrorPrefixRequired=Prefix nutné
-ErrorBadSupplierCodeSyntax=Bad syntaxe pre kód dodávateľa
-ErrorSupplierCodeRequired=Dodávateľ povinný kód
-ErrorSupplierCodeAlreadyUsed=Dodávateľ kód už používaný
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Bad parametre
 ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
 ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
@@ -87,7 +87,7 @@ ErrorsOnXLines=Chyby na <b>%s</b> zdrojovom zázname (s)
 ErrorFileIsInfectedWithAVirus=Antivírusový program nebol schopný overiť súbor (súbor môže byť napadnutý vírusom)
 ErrorSpecialCharNotAllowedForField=Špeciálne znaky nie sú povolené pre pole &quot;%s&quot;
 ErrorNumRefModel=Existuje odkaz do databázy (%s) a nie je kompatibilný s týmto pravidlom číslovania. Odobrať záznam alebo premenovať odkaz na aktiváciu tohto modulu.
-ErrorQtyTooLowForThisSupplier=Nedostatočné množstvo tohto podniku, alebo nie je definovaná cena k tomuto produktu tohto podniku
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Chyba na masku
 ErrorBadMaskFailedToLocatePosOfSequence=Chyba maska ​​bez poradovým číslom
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
-ErrorSupplierCountryIsNotDefined=Krajina tohto dodávateľa nie je definovaná. Najprv to to treba opraviť.
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
diff --git a/htdocs/langs/sk_SK/install.lang b/htdocs/langs/sk_SK/install.lang
index 717fc92e081..7e272a453e8 100644
--- a/htdocs/langs/sk_SK/install.lang
+++ b/htdocs/langs/sk_SK/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=<b>%s</b> Konfiguračný súbor neexis
 ConfFileCouldBeCreated=<b>%s</b> Konfiguračný súbor môže byť vytvorený.
 ConfFileIsNotWritable=<b>%s</b> Konfiguračný súbor nie je zapisovateľný. Skontrolujte oprávnenia. Pri prvej inštalácii musí byť Váš webový server schopný zapisovať do tohto súboru počas procesu konfigurácie (napr. &quot;chmod 666&quot; na Unixe, a pod.).
 ConfFileIsWritable=Konfiguračný súbor <b>%s</b> je zapisovatelný.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Aktualizuj všetky informácie z konfiguračného súboru.
 PHPSupportSessions=Vaše PHP podporuje relácie.
 PHPSupportPOSTGETOk=Vaše PHP podporuje premenné POST a GET.
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Vytvorenie Dolibarr administratórskeho účtu zlyhalo
 WarningRemoveInstallDir=Pozor, z bezpečnostných dôvodov, akonáhle inštaláciu alebo upgrade je kompletný, aby sa zabránilo používanie inštaláciu nástroja znova, mali by ste pridať súbor s názvom <b>install.lock</b> do adresára dokumentov Dolibarr, aby sa zabránilo škodlivému využitie.
 FunctionNotAvailableInThisPHP=Nie je k dispozícii na tejto PHP
 ChoosedMigrateScript=Vyberte si skript migrácie
-DataMigration=Migrácia dát
-DatabaseMigration=Štruktúra migrácia databázy
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Skript pre spracovanie
 ChooseYourSetupMode=Vyberte si režim inštalácie a kliknite na tlačidlo &quot;Štart&quot; ...
 FreshInstall=Čerstvá inštalácia
@@ -146,7 +147,7 @@ NothingToDo=Nothing to do
 # upgrade
 MigrationFixData=Oprava pre denormalized dát
 MigrationOrder=Migrácia dát pre zákazníkovej objednávky
-MigrationSupplierOrder=Migrácia dát pre dodávateľov objednávky
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Migrácia dát na komerčné návrhov
 MigrationInvoice=Migrácia dát pre zákazníka faktúry
 MigrationContract=Migrácia dát pre zmluvy
@@ -196,6 +197,8 @@ MigrationEvents=Migrácia udalostí za účelom pridania vlastníka udalosti do
 MigrationEventsContact=Migration of events to add event contact into assignement table
 MigrationRemiseEntity=Aktualizácia hodnoty llx_societe_remise
 MigrationRemiseExceptEntity=Aktualizácia hodnoty llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
 MigrationReloadModule=Znovu načítať modul %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 ShowNotAvailableOptions=Zobraziť nedostupné možnosti
diff --git a/htdocs/langs/sk_SK/ldap.lang b/htdocs/langs/sk_SK/ldap.lang
index 5523eca1507..dd629d96d4e 100644
--- a/htdocs/langs/sk_SK/ldap.lang
+++ b/htdocs/langs/sk_SK/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Heslo pre doménu
 YouMustChangePassNextLogon=Heslo pre užívateľské <b>%s</b> na doméne <b>%s</b> musí byť zmenený.
 UserMustChangePassNextLogon=Užívateľ musí zmeniť heslo v doméne %s
 LDAPInformationsForThisContact=Informácie v databáze LDAP pre tento kontakt
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Member type synchronized
 ContactSynchronized=Kontaktujte synchronizované
 ForceSynchronize=Force synchronizácia Dolibarr -&gt; LDAP
 ErrorFailedToReadLDAP=Nepodarilo sa prečítať LDAP databázy. Skontrolujte nastavenie LDAP modul a databázový dostupnosť.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/sk_SK/loan.lang b/htdocs/langs/sk_SK/loan.lang
index 8ea9972c9e6..b6502369886 100644
--- a/htdocs/langs/sk_SK/loan.lang
+++ b/htdocs/langs/sk_SK/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=Kapitál
 Insurance=Insurance
 Interest=Interest
 Nbterms=Number of terms
+Term=Term
 LoanAccountancyCapitalCode=Accounting account capital
 LoanAccountancyInsuranceCode=Accounting account insurance
 LoanAccountancyInterestCode=Accounting account interest
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=Confirm deleting this loan
 LoanDeleted=Loan Deleted Successfully
 ConfirmPayLoan=Confirm classify paid this loan
 LoanPaid=Loan Paid
-# Calc
-LoanCalc=Bank Loans Calculator
-PurchaseFinanceInfo=Purchase & Financing Information
-SalePriceOfAsset=Sale Price of Asset
-PercentageDown=Percentage Down
-LengthOfMortgage=Duration of loan
-AnnualInterestRate=Annual Interest Rate
-ExplainCalculations=Explain Calculations
-ShowMeCalculationsAndAmortization=Show me the calculations and amortization
-MortgagePaymentInformation=Mortgage Payment Information
-DownPayment=Down Payment
-DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
-InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
-MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
-MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
-MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
-MonthlyPaymentDesc=The montly payment is figured out using the following formula
-AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
-AmountFinanced=Amount Financed
-AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
-Totalsforyear=Totals for year
-MonthlyPayment=Monthly Payment
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
-GoToInterest=%s will go towards INTEREST
-GoToPrincipal=%s will go towards PRINCIPAL
-YouWillSpend=You will spend %s in year %s
 ListLoanAssociatedProject=List of loan associated with the project
 AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Interest
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-FinancialCommitment=Financial commitment
 CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/langs/sk_SK/mails.lang b/htdocs/langs/sk_SK/mails.lang
index 8f42bf2ca3c..2e95aa4c1fc 100644
--- a/htdocs/langs/sk_SK/mails.lang
+++ b/htdocs/langs/sk_SK/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Odosielateľ
 MailErrorsTo=Chyby
 MailReply=Odpovedať
 MailTo=Prijímač (s)
+MailToUsers=To user(s)
 MailCC=Kopírovať do
+MailToCCUsers=Copy to users(s)
 MailCCC=Cached kópiu
 MailTopic=EMail téma
 MailText=Správa
@@ -164,4 +166,4 @@ InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Informácie
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/sk_SK/main.lang b/htdocs/langs/sk_SK/main.lang
index 2d76df756fc..cf220a84210 100644
--- a/htdocs/langs/sk_SK/main.lang
+++ b/htdocs/langs/sk_SK/main.lang
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is se
 Administrator=Správca
 Undefined=Undefined
 PasswordForgotten=Password forgotten?
+NoAccount=No account?
 SeeAbove=Pozri vyššie
 HomeArea=Hlavná oblasť
 LastConnexion=Latest connection
@@ -231,7 +232,7 @@ Limit=Obmedzenie
 Limits=Limity
 Logout=Odhlásenie
 NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Spojenie
+Connection=Prihlasovacie meno
 Setup=Setup
 Alert=Upozornenie
 MenuWarnings=Upozornenie
@@ -402,6 +403,7 @@ DefaultTaxRate=Default tax rate
 Average=Priemer
 Sum=Súčet
 Delta=Delta
+RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Voľba
@@ -414,7 +416,7 @@ Favorite=Obľúbené
 ShortInfo=Info.
 Ref=Ref
 ExternalRef=Ref. extern
-RefSupplier=Ref dodávateľ
+RefSupplier=Ref. vendor
 RefPayment=Ref platba
 CommercialProposalsShort=Komerčné návrhy
 Comment=Komentár
@@ -493,7 +495,7 @@ Received=Prijaté
 Paid=Platený
 Topic=Subject
 ByCompanies=Tretími stranami
-ByUsers=Od užívateľov
+ByUsers=By user
 Links=Odkazy
 Link=Odkaz
 Rejects=Odmieta
@@ -619,9 +621,9 @@ BuildDoc=Build Doc
 Entity=Prostredie
 Entities=Subjekty
 CustomerPreview=Zákazník náhľad
-SupplierPreview=Dodávateľ náhľad
+SupplierPreview=Vendor preview
 ShowCustomerPreview=Zobraziť zákaznícku náhľad
-ShowSupplierPreview=Zobraziť náhľad s dodávateľmi
+ShowSupplierPreview=Show vendor preview
 RefCustomer=Ref zákazník
 Currency=Mena
 InfoAdmin=Informácie pre správcov
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=Products or services
 SearchIntoProjects=Projekty
 SearchIntoTasks=Úlohy
 SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Dodávatelské ponuky
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Zásahy
 SearchIntoContracts=Zmluvy
 SearchIntoCustomerShipments=Customer shipments
@@ -941,3 +943,5 @@ Remote=Remote
 LocalAndRemote=Local and Remote
 KeyboardShortcut=Keyboard shortcut
 AssignedTo=Priradené
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/sk_SK/margins.lang b/htdocs/langs/sk_SK/margins.lang
index f4bce25ade6..6edaad446c3 100644
--- a/htdocs/langs/sk_SK/margins.lang
+++ b/htdocs/langs/sk_SK/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=Ako služba
 UseDiscountOnTotal=Na medzisúčet
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Definuje, či globálna zľava je považovaný za výrobok, služba, alebo iba na medzisúčet pre výpočet marže.
 MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best supplier price
+MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Veľkoobchodná cena
 UnitCharges=Jednotkové náklady
 Charges=Poplatky
diff --git a/htdocs/langs/sk_SK/members.lang b/htdocs/langs/sk_SK/members.lang
index e89fffdc06b..a9f0a1ae348 100644
--- a/htdocs/langs/sk_SK/members.lang
+++ b/htdocs/langs/sk_SK/members.lang
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
diff --git a/htdocs/langs/sk_SK/opensurvey.lang b/htdocs/langs/sk_SK/opensurvey.lang
index 643aaee4e22..8d7928f1ed6 100644
--- a/htdocs/langs/sk_SK/opensurvey.lang
+++ b/htdocs/langs/sk_SK/opensurvey.lang
@@ -58,3 +58,4 @@ MoreChoices=Enter more choices for the voters
 SurveyExpiredInfo=The poll has been closed or voting delay has expired.
 EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
 ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/sk_SK/orders.lang b/htdocs/langs/sk_SK/orders.lang
index 0e68718056a..8d69695ab06 100644
--- a/htdocs/langs/sk_SK/orders.lang
+++ b/htdocs/langs/sk_SK/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Zákaznícke objednávky
-SuppliersOrdersArea=Dodávateľské objednávky
+SuppliersOrdersArea=Purchase orders area
 OrderCard=Karta objednávky
 OrderId=ID objednávky
 Order=Objednávka
@@ -13,18 +13,18 @@ OrderToProcess=Objednávka na spracovanie
 NewOrder=Nová objednávka
 ToOrder=Objednať
 MakeOrder=Objednať
-SupplierOrder=Dodávateľská objednávka
-SuppliersOrders=Dodávateliské objednávky
-SuppliersOrdersRunning=Aktuálne dodávatelské objednávky
-CustomerOrder=Zákaznícka objednávka
-CustomersOrders=Customer orders
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=Objednávky zákazníka
+CustomersOrders=Zákazníckych objednávok
 CustomersOrdersRunning=Current customer orders
 CustomersOrdersAndOrdersLines=Customer orders and order lines
 OrdersDeliveredToBill=Customer orders delivered to bill
 OrdersToBill=Customer orders delivered
 OrdersInProcess=Customer orders in process
 OrdersToProcess=Customer orders to process
-SuppliersOrdersToProcess=Supplier orders to process
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=Zrušený
 StatusOrderDraftShort=Návrh
 StatusOrderValidatedShort=Overené
@@ -75,15 +75,15 @@ ShowOrder=Zobraziť objednávku
 OrdersOpened=Orders to process
 NoDraftOrders=Žiadne návrhy objednávky
 NoOrder=No order
-NoSupplierOrder=No supplier order
+NoSupplierOrder=No purchase order
 LastOrders=Latest %s customer orders
 LastCustomerOrders=Latest %s customer orders
-LastSupplierOrders=Latest %s supplier orders
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=Latest %s modified orders
 AllOrders=Všetky objednávky
 NbOfOrders=Počet objednávok
 OrdersStatistics=Objednať si štatistiky
-OrdersStatisticsSuppliers=Dodávateľ, aby si štatistiky
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Počet objednávok mesiace
 AmountOfOrdersByMonthHT=Množstvo objednávok mesačne (bez dane)
 ListOfOrders=Zoznam objednávok
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</
 GenerateBill=Vytvoriť faktúru
 ClassifyShipped=Klasifikovať dodaný
 DraftOrders=Návrh uznesenia
-DraftSuppliersOrders=Draft suppliers orders
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=V procese objednávky
 RefOrder=Ref objednávka
 RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for supplier
-RefOrderSupplierShort=Ref. order supplier
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=Objednávku zašlite poštou
 ActionsOnOrder=Akcie na objednávku
 NoArticleOfTypeProduct=Žiadny článok typu &quot;výrobok&quot;, takže nie je shippable článok pre túto objednávku
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
 DispatchSupplierOrder=Príjem %s dodávateľských objednávok
 FirstApprovalAlreadyDone=First approval already done
 SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=Supplier order %s received %s
-SupplierOrderSubmitedInDolibarr=Supplier order %s submited
-SupplierOrderClassifiedBilled=Supplier order %s set billed
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Ostatné objednávky
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Zástupca nasledujúce-up, aby zákazník
@@ -125,11 +125,11 @@ TypeContact_commande_internal_SHIPPING=Zástupca nasledujúce-up doprava
 TypeContact_commande_external_BILLING=Zákazník faktúra kontakt
 TypeContact_commande_external_SHIPPING=Zákazník doprava kontakt
 TypeContact_commande_external_CUSTOMER=Kontakt so zákazníkom nasledujúce-up, aby
-TypeContact_order_supplier_internal_SALESREPFOLL=Zástupca nasledujúce-up, aby sa s dodávateľmi
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Zástupca nasledujúce-up doprava
-TypeContact_order_supplier_external_BILLING=Dodávateľ faktúru kontakt
-TypeContact_order_supplier_external_SHIPPING=Dodávateľ doprava kontakt
-TypeContact_order_supplier_external_CUSTOMER=S dodávateľmi Spoj sa nasledujúce-up, aby
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Konštantná COMMANDE_SUPPLIER_ADDON nie je definované
 Error_COMMANDE_ADDON_NotDefined=Konštantná COMMANDE_ADDON nie je definované
 Error_OrderNotChecked=Žiadne objednávky do faktúry vybranej
diff --git a/htdocs/langs/sk_SK/other.lang b/htdocs/langs/sk_SK/other.lang
index f0019b9084a..84824afc299 100644
--- a/htdocs/langs/sk_SK/other.lang
+++ b/htdocs/langs/sk_SK/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=Súbory je príliš veľký
 PleaseBePatient=Prosím o chvíľku strpenia ...
 NewPassword=New password
 ResetPassword=Reset password
-RequestToResetPasswordReceived=Požiadavka na zmenu svojej heslo Dolibarr bol prijatý
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=To je vaše nové kľúče k prihláseniu
 NewKeyWillBe=Váš nový kľúč pre prihlásenie do softvéru bude
 ClickHereToGoTo=Kliknite tu pre prechod na %s
@@ -233,6 +233,8 @@ PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=Vývoz plocha
 AvailableFormats=Dostupné formáty
diff --git a/htdocs/langs/sk_SK/productbatch.lang b/htdocs/langs/sk_SK/productbatch.lang
index e374a140122..75f99b9b524 100644
--- a/htdocs/langs/sk_SK/productbatch.lang
+++ b/htdocs/langs/sk_SK/productbatch.lang
@@ -16,7 +16,7 @@ printEatby=Eat-by: %s
 printSellby=Sell-by: %s
 printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic increase/decrease stock mode is forced to shipping validate and manual dispatching for reception and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
 ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
diff --git a/htdocs/langs/sk_SK/products.lang b/htdocs/langs/sk_SK/products.lang
index b7b778b0787..d2703d53229 100644
--- a/htdocs/langs/sk_SK/products.lang
+++ b/htdocs/langs/sk_SK/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Predané množstvo
 PurchasedAmount=Kúpené množstvo
 NewPrice=Nová cena
 MinPrice=Minimálna predajná cena
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=Predajná cena nesmie byť nižšia ako minimálna povolená pre tento produkt (%s bez dane). Toto hlásenie sa môže tiež zobrazí, ak zadáte príliš dôležitú zľavu.
 ContractStatusClosed=Zatvorené
 ErrorProductAlreadyExists=Výrobok s referenčným %s už existuje.
@@ -155,7 +156,7 @@ BuyingPrices=Nákupné ceny
 CustomerPrices=Zákaznícka cena
 SuppliersPrices=Dodávateľská cena
 SuppliersPricesOfProductsOrServices=Dodávateľské ceny (pre produkt aleob službu)
-CustomCode=Customs/Commodity/HS code
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=Krajina pôvodu
 Nature=Príroda
 ShortLabel=Krátky názov
diff --git a/htdocs/langs/sk_SK/projects.lang b/htdocs/langs/sk_SK/projects.lang
index 687623d8776..b8a08f20a35 100644
--- a/htdocs/langs/sk_SK/projects.lang
+++ b/htdocs/langs/sk_SK/projects.lang
@@ -77,6 +77,7 @@ Time=Čas
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=Zoznam obchodných návrhov spojených s projektom
 ListOrdersAssociatedProject=List of customer orders associated with the project
@@ -226,4 +227,4 @@ AllowCommentOnProject=Allow user comments on projects
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/sk_SK/stocks.lang b/htdocs/langs/sk_SK/stocks.lang
index a62a119faf6..e17659246ef 100644
--- a/htdocs/langs/sk_SK/stocks.lang
+++ b/htdocs/langs/sk_SK/stocks.lang
@@ -203,3 +203,4 @@ RegulateStock=Regulate Stock
 ListInventory=Zoznam
 StockSupportServices=Stock management support services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/sk_SK/stripe.lang b/htdocs/langs/sk_SK/stripe.lang
index 3e068895bbd..a4618f5156a 100644
--- a/htdocs/langs/sk_SK/stripe.lang
+++ b/htdocs/langs/sk_SK/stripe.lang
@@ -58,8 +58,8 @@ NameOnCard=Name on card
 CardNumber=Card Number
 ExpiryDate=Expiry Date
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/sk_SK/supplier_proposal.lang b/htdocs/langs/sk_SK/supplier_proposal.lang
index df46e8ec771..53d0284c54f 100644
--- a/htdocs/langs/sk_SK/supplier_proposal.lang
+++ b/htdocs/langs/sk_SK/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Dodávatelská komerčná ponuka
-supplier_proposalDESC=Spravovať cenové požiadavky pre dodávateľov
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
 SupplierProposalNew=Nová cenová požiadávka
 CommRequest=Cenová požiadávka
 CommRequests=Cenové požiadávky
 SearchRequest=Nájsť požiadávku
 DraftRequests=Návrh požiadávky
-SupplierProposalsDraft=Návrh dodávatelskej ponuky
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=Najnovšie %s upravené cenové požiadavky
 RequestsOpened=Otvorené cenoé požiadávky
-SupplierProposalArea=Oblasť dodávateľských ponúk
-SupplierProposalShort=Dodávatelská ponuka
-SupplierProposals=Dodávatelské ponuky
-SupplierProposalsShort=Dodávatelské ponuky
+SupplierProposalArea=Vendor proposals area
+SupplierProposalShort=Vendor proposal
+SupplierProposals=Vendor proposals
+SupplierProposalsShort=Vendor proposals
 NewAskPrice=Nová cenová požiadávka
 ShowSupplierProposal=Zobraziť cenovú požiadávku
 AddSupplierProposal=Vytvoriť cenovú požiadávku
-SupplierProposalRefFourn=Dodávatelská ref.
+SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=Termín dodania
 SupplierProposalRefFournNotice=Pred uzavretím na " Akceptované" , skúste pochopiť dodávatelské referencie.
 ConfirmValidateAsk=Určite chcete overiť túto cenovú požiadávku pod menom <b>%s</b>?
@@ -47,9 +47,9 @@ CommercialAsk=Cenová požiadavka
 DefaultModelSupplierProposalCreate=Predvolené model, tvorba
 DefaultModelSupplierProposalToBill=Základná šablóna pri uzatváraní cenovej požiadávky ( akceptovaná )
 DefaultModelSupplierProposalClosed=Základná šablóna pri uzatváraní cenovej požiadávky ( odmietnutá )
-ListOfSupplierProposals=Zoznam žiadostí o dodávatelskú ponuku
-ListSupplierProposalsAssociatedProject=Zoznam dodávatelských ponúk spojených s projektom
-SupplierProposalsToClose=Dodávatelská ponuka na zavretie
-SupplierProposalsToProcess=Dodávatelská ponuka na spracovanie
+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=Všetky požiadávky
diff --git a/htdocs/langs/sk_SK/suppliers.lang b/htdocs/langs/sk_SK/suppliers.lang
index 95cdc58f38e..526a84108a2 100644
--- a/htdocs/langs/sk_SK/suppliers.lang
+++ b/htdocs/langs/sk_SK/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Dodávatelia
-SuppliersInvoice=Dodávateľská faktúra
-ShowSupplierInvoice=Zobraziť dodávatelskú faktúru
-NewSupplier=Nový dodávateľ
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=História
-ListOfSuppliers=Zoznam dodávateľov
-ShowSupplier=Zobraziť dodávateľa
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=Dátum objednávky
 BuyingPriceMin=Najlepšia nákupná cena
 BuyingPriceMinShort=Najlepšia nákupná cena
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Celková predajná cena podprodukrov
 SomeSubProductHaveNoPrices=Niektoré podradené výrobky nemajú určenú cenu.
 AddSupplierPrice=Pridať nákupnú cenu
 ChangeSupplierPrice=Zmeniť nákupnú cenu
-SupplierPrices=Dodávateľská cena
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Tento odkaz Dodávateľ je už spojená s odkazom: %s
-NoRecordedSuppliers=Žiadni zaznamenaní dodávatelia
-SupplierPayment=Dodávateľská platba
-SuppliersArea=Oblasť dodávateľov
-RefSupplierShort=Referenčný dodávateľ
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=Dostupnosť
-ExportDataset_fournisseur_1=Zoznam dodávateľských faktúr a položiek
-ExportDataset_fournisseur_2=Dodávateľské faktúry a platby
-ExportDataset_fournisseur_3=Dodávateľské objednávky a položky
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=Schváliť túto objednávku
 ConfirmApproveThisOrder=Určite chcete potvrdiť objednávku <b>%s</b>?
 DenyingThisOrder=Odmietnuť objednávku
 ConfirmDenyingThisOrder=Určite chcete zamietnúť objednávku <b>%s</b>?
 ConfirmCancelThisOrder=Určite chcete zrušiť objednávku <b>%s</b>?
-AddSupplierOrder=Vytvoriť dodávateľskú objednávku
-AddSupplierInvoice=Vytvoriť dodávateľskú faktúru
-ListOfSupplierProductForSupplier=Zoznam výrobkov a cien dodávateľa <b>%s</b>
-SentToSuppliers=Odoslané dodávateľom
-ListOfSupplierOrders=Zoznam dodávateľských objednávok
-MenuOrdersSupplierToBill=Vytvoriť faktúru z dodávateľskej objednávky
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Zdržanie dodávky v dňoch
 DescNbDaysToDelivery=Nejväčšie oneskorenie doručenia produktu z tejto objednávky
-SupplierReputation=Reputácia dodávateľa
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Neobjednávať
 NotTheGoodQualitySupplier=Zlý počet
 ReputationForThisProduct=Reputácia
 BuyerName=Meno kupcu
 AllProductServicePrices=All product / service prices
 AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=Dodávateľská cena
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/sk_SK/website.lang b/htdocs/langs/sk_SK/website.lang
index a23076138c6..b09e03c3b1c 100644
--- a/htdocs/langs/sk_SK/website.lang
+++ b/htdocs/langs/sk_SK/website.lang
@@ -73,7 +73,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
diff --git a/htdocs/langs/sk_SK/workflow.lang b/htdocs/langs/sk_SK/workflow.lang
index bf1bd4a0195..4944888de58 100644
--- a/htdocs/langs/sk_SK/workflow.lang
+++ b/htdocs/langs/sk_SK/workflow.lang
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source custome
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/sl_SI/accountancy.lang b/htdocs/langs/sl_SI/accountancy.lang
index 725a2802bc8..9cda4db2e00 100644
--- a/htdocs/langs/sl_SI/accountancy.lang
+++ b/htdocs/langs/sl_SI/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Računovodstvo
 ACCOUNTING_EXPORT_SEPARATORCSV=Ločilo za stolpce za izvozno datoteko
 ACCOUNTING_EXPORT_DATE=Format datuma za izvozno datoteko
 ACCOUNTING_EXPORT_PIECE=Export the number of piece
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Accounts with non zero values
 ListOfAccounts=List of accounts
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers 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
 
-AccountancyArea=Accountancy area
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
 AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
@@ -89,7 +90,7 @@ MenuProductsAccounts=Product accounts
 ProductsBinding=Products accounts
 Ventilation=Binding to accounts
 CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Supplier invoice binding
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=Nakup revij
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Razno revija
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Pregled stroškovnih poročil
 ACCOUNTING_SOCIAL_JOURNAL=Socialna revija
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
 ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
@@ -185,11 +187,12 @@ ListeMvts=List of movements
 ErrorDebitCredit=Debetne in Credit ne more imeti vrednosti hkrati
 AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
-DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=Seznam računovodskih računov
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Group of account
 Pcgsubtype=Subgroup of account
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
 ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=Tukaj poglejte seznam vrstic na računih dobaviteljev in njihovih računovodskih računov
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
 DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report 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 fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Napaka, ne morete izbrisati to računovodsko račun, ker se uporablja
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -293,4 +296,9 @@ Binded=Lines bound
 ToBind=Lines to bind
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index 87f11b669c9..66801ac589e 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS gostitelj (Privzeto v php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS vrata (Ni definiran v PHP na Unix ali podobnih sistemih)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS gostitelj (Ni definiran v PHP na Unix ali podobnih sistemih)
 MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= Sistematično pošilljanje skritih kopij (cc) vseh poslanih emailov za
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=Načini za pošiljanje e-pošte
 MAIN_MAIL_SMTPS_ID=SMTP ID, če je zahtevano preverjanje pristnosti
 MAIN_MAIL_SMTPS_PW=SMTP geslo, če je zahtevano preverjanje pristnosti
@@ -291,7 +292,7 @@ ModuleSetup=Nastavitve modula
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=Sistem
 ModuleFamilyCrm=Upravljanje odnosov s strankami (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Upravljanje proizvodov (Products Management - PM)
 ModuleFamilyHr=Upravljanje s človeškimi viri (Human Resource Management - HR)
 ModuleFamilyProjects=Delo na projektih/sodelovanje
@@ -373,7 +374,8 @@ NoSmsEngine=Na voljo ni nobenega upravljalnika SMS pošiljanja. Upravljalniki SM
 PDF=PDF
 PDFDesc=Nastavite lahko vsak globalne možnosti, povezanih z PDF generacije
 PDFAddressForging=Pravila oblikovati naslov polja
-HideAnyVATInformationOnPDF=Skrij vse informacije v zvezi z DDV za nastali PDF
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=Skrij opis proizvoda v ustvarjenem PDF
@@ -445,7 +447,8 @@ DisplayCompanyInfo=Display company address
 DisplayCompanyManagers=Display manager names
 DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party 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.
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Set this to 1 if you want to attach main document to emai
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=Uporabniki & skupine
 Module0Desc=Users / Employees and Groups management
@@ -479,7 +485,7 @@ Module1Desc=Upravljanje podjetij in kontaktov
 Module2Name=Komerciala
 Module2Desc=Upravljanje komerciale
 Module10Name=Računovodstvo
-Module10Desc=Upravljanje enostavnega računovodstva (računi in plačila)
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=Ponudbe
 Module20Desc=Upravljanje komercialnih ponudb
 Module22Name=Masovno E-pošiljanje
@@ -546,8 +552,8 @@ Module400Name=Projekti/priložnosti/možnosti
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Internetni koledar
 Module410Desc=Integracija internetnega koledarja
-Module500Name=Posebni stroški
-Module500Desc=Upravljanje posebnih stroškov (davki, socialni ali fiskalni prispevki, dividende)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Payment of employee wages
 Module510Desc=Record and follow payment of your employee wages
 Module520Name=Posojilo
@@ -561,14 +567,14 @@ Module700Name=Donacije
 Module700Desc=Upravljanje donacij
 Module770Name=Stroškovno poročilo
 Module770Desc=Poročilo upravljanja in stroškov povračil (prevoz, hrana, ...)
-Module1120Name=Komercialna ponudba dobavitelja
-Module1120Desc=Zahteva za komercialno ponudbo in cene dobavitelja
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Mantis integracija
 Module1520Name=Generiranje dokumenta
 Module1520Desc=Generiranje dokumenta za masovno pošto
 Module1780Name=Značke/kategorije
-Module1780Desc=Ustvari značke/kategorijo (proizvodi, kupci, dobavitelji, kontakti ali člani)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=Fck urejevalnik
 Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
 Module2200Name=Dinamične cene
@@ -576,7 +582,7 @@ Module2200Desc=Omogoči uporabo matematičnih formul za izračun cen
 Module2300Name=Scheduled jobs
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API/Web services (SOAP server)
@@ -613,7 +619,7 @@ Module50100Desc=Point of sales module (POS).
 Module50200Name=Paypal
 Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 Module50400Name=Računovodstvo (napredno)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=Tiskanje IPP
 Module54000Desc=Direktno tiskanje (brez odpiranja dokumenta) z uporabo Cups IPP vmesnika (tiskalnik mora biti viden na strežniku in nameščen mora biti CUPS ).
 Module55000Name=Izberi, oceni ali glasuj
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=Toleranca zakasnitve (v dnevih) pred opozorilom na zak
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Toleranca zakasnitve (v dnevih) pred opozorilom na potrebo po deponiranju čeka
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=Ostale postavke na meniju so namenjene upravljanju opcijskih parametrov.
 LogEvents=Dogodki v zvezi z nadzorovanjem varnosti
 Audit=Nadzor
@@ -1054,8 +1060,9 @@ LogEventDesc=Tukaj lahko omogočite beleženje dnevnika Dolibarr varnostnih dogo
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Sistemske informacije so raznovrstne tehnične informacije, ki so na voljo samo v bralnem načinu in jih vidi samo administrator.
 SystemAreaForAdminOnly=To področje je na voljo samo administratorju. Nobeno od Dolibarr dovoljenj ne more spremeniti teh omejitev.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=Tukaj lahko izberete parametre, ki določajo videz in vtis aplikacije Dolibarr
 AvailableModules=Available app/modules
 ToActivateModule=Za aktivacijo modula, pojdite na področje nastavitev (Domov->Nastavitve->Moduli).
@@ -1188,11 +1195,11 @@ UserMailRequired=Za kreiranje novega uporabnika je zahtevan EMail naslov
 HRMSetup=HRM module setup
 ##### Company setup #####
 CompanySetup=Modul za nastavitve podjetij
-CompanyCodeChecker=Modul za generiranje kode partnerjev in kontrolo (kupec ali dobavitelj)
-AccountCodeManager=Module for accounting code generation (customer or supplier)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
 NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
 ModelModules=Predloge dokumentov
 DocumentModelOdt=Ustvari dokumente iz predlog OpenDocuments (.ODT ali .ODS datoteke v programih OpenOffice, KOffice, TextEdit ,...)
@@ -1203,6 +1210,9 @@ MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
 TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Izvozna povezava na <b>%s</b> format je na voljo na naslednji povezavi: %s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=Poljubno besedilo na komercialni ponudbi
 WatermarkOnDraftProposal=Vodni tisk na osnutkih komercialnih ponudb (brez, če je prazno)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Vprašajte za ciljni bančni račun ponudbe
 ##### SupplierProposal #####
-SupplierProposalSetup=Nastavitev modula cenovnih zahtevkov za dobavitelje
-SupplierProposalNumberingModules=Modeli številčenja cenovnih zahtevkov za dobavitelje
-SupplierProposalPDFModules=Modeli dokumentiranja cenovnih zahtevkov za dobavitelje
-FreeLegalTextOnSupplierProposal=Prosti tekst na cenovnih zahtevkov dobaviteljev
-WatermarkOnDraftSupplierProposal=Vodni tisk na osnutkih cenovnih zahtevkov za dobavitelje (brez, če je prazno)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Vprašaj za končni bančni račun cenovnega zahtevka
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=Nastavitve upravljanja z naročili
 OrdersNumberingModules=Moduli za številčenje naročil
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=Povezava s strežnikom '%s' na bazo podatkov '%s' uporabnika '%
 OSCommerceTestKo1=Povezava s strežnikom '%s' je bila uspešna, vendar baza podatkov '%s' ni dosegljiva.
 OSCommerceTestKo2=Povezava s strežnikom '%s' uporabnika '%s' ni uspela.
 ##### Stock #####
-StockSetup=Nastavitve modula za skladišče
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=Če uporabljate prodajni modul (privzeti POS modul ali drug zunanji modul), bo vaš Point Of Sale modul morda ignoriral to nastavitev. Večina prodajnih modulov privzeto takoj ustvari račun in zmanjša zalogo ne glede na opcijo, ki je tukaj izbrana. Če torej želite ali ne želite zmanjšati zalogo ob prodaji preko prodajnega modula, preverite tudi nastavitve vašega prodajnega modula.
 ##### Menu #####
 MenuDeleted=Izbrisan meni
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
 MultiCompanySetup=Nastavitev modula za več podjetij
 ##### Suppliers #####
 SuppliersSetup=Nastavitev modula za dobavitelje
-SuppliersCommandModel=Celotna predloga naročila dobavitelja (logo...)
-SuppliersInvoiceModel=Celotna predloga računa dobavitelja (logo...)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Modeli številčenja računov dobaviteljev
 IfSetToYesDontForgetPermission=Če je nastavljeno na "da", ne pozabite zagotoviti dovoljenj skupinam ali uporabnikom za drugo odobritev
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=Ne uporabljajte dvoumnih znakov ("1","l","i","|","0","
 SalariesSetup=Nastavitev modula za plače
 SortOrder=Sortiraj naročilo
 Format=Format
-TypePaymentDesc=0:Tip plačila stranke, 1:Tip plačila dobavitelju, 2:Tip plačila stranke in dobavitelju
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Vključi pot (definirana v spremenljivki %s)
 ExpenseReportsSetup=Nastavitev modula za stroškovna poročila
 TemplatePDFExpenseReports=Predloga dokumenta za generiranje stroškovnega poročila
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Instalacijo zunanjega modula iz aplika
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Osvetli vrstice tabele, preko katerih je šla miška
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
-TextTitleColor=Color of page title
+TextTitleColor=Text color of Page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=Barva ozadja za zgornji meni
 TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Barva ozadja za levi meni
 BackgroundTableTitleColor=Background color for Table title line
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Barva ozadja za lihe vrstice tabele
 BackgroundTableLineEvenColor=Barva ozadja za sode vrstice tabele
 MinimumNoticePeriod=Minimalni rok za obvestilo (Vaš zahtevek za odsotnost mora biti podan pred tem rokom)
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=Primer: +2 (uporabite samo, če se pojavijo težave)
 ExpectedChecksum=Pričakovana kontrolna vsota
 CurrentChecksum=Trenutna kontrolna vsota
 ForcedConstants=Required constant values
-MailToSendProposal=Za pošiljanje ponudbe stranki
-MailToSendOrder=Za pošiljanje naročila kupca
-MailToSendInvoice=Za pošiljanje računa za kupca
-MailToSendShipment=Za pošiljanje odpremnice
-MailToSendIntervention=Za pošiljanje intervencije
-MailToSendSupplierRequestForQuotation=Za pošiljanje zahteve za ponudbo dobavitelju
-MailToSendSupplierOrder=Za pošiljanje naročila pri dobavitelju
-MailToSendSupplierInvoice=Za pošiljanje računa dobavitelja
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-MailToMember=To send email from member page
-MailToUser=To send email from user page
-MailToProject= To send email from project page
+MailToSendProposal=Ponudbe kupcu
+MailToSendOrder=Naročila kupca
+MailToSendInvoice=Računi za kupca
+MailToSendShipment=Odpreme
+MailToSendIntervention=Intervencije
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Pogodbe
+MailToThirdparty=Partnerji
+MailToMember=Člani
+MailToUser=Uporabniki
+MailToProject=Projects page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1780,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/sl_SI/bills.lang b/htdocs/langs/sl_SI/bills.lang
index 8ad1c72386e..fe9fa161078 100644
--- a/htdocs/langs/sl_SI/bills.lang
+++ b/htdocs/langs/sl_SI/bills.lang
@@ -109,7 +109,7 @@ CancelBill=Preklic računa
 SendRemindByMail=Pošlji opomin po E-Mailu
 DoPayment=Enter payment
 DoPaymentBack=Enter refund
-ConvertToReduc=Pretvori v bodoči popust
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Vnesi prejeto plačilo od kupca
@@ -120,7 +120,7 @@ BillStatus=Status računa
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Osnutek (potrebna potrditev)
 BillStatusPaid=Plačano
-BillStatusPaidBackOrConverted=Credit note refund or converted into discount
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Opuščeno
 BillStatusValidated=Potrjeno (potrebno plačilo)
@@ -296,10 +296,10 @@ DiscountType=Discount type
 NoteReason=Opomba/Razlog
 ReasonDiscount=Razlog
 DiscountOfferedBy=Odobril
-DiscountStillRemaining=Discounts available
-DiscountAlreadyCounted=Discounts already consumed
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+SupplierDiscounts=Vendors discounts
 BillAddress=Naslov za račun
 HelpEscompte=Ta popust je bil kupcu odobren zaradi plačila pred rokom zapadlosti.
 HelpAbandonBadCustomer=Ta znesek je bil opuščen (Kupec je označen kot 'slab kupec') in se obravnava kot potencialna izguba.
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Every %s days
 FrequencyPer_m=Every %s months
 FrequencyPer_y=Every %s years
@@ -505,9 +511,14 @@ SituationAmount=Vrednost računa za situacijo (neto)
 SituationDeduction=Odštevanje situacije
 ModifyAllLines=Uredi vse vrstice
 CreateNextSituationInvoice=Ustvari naslednjo situacijo
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=Naslednja situacija že obstaja.
 DisabledBecauseFinal=Ta situacija je končna.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=N
 CantBeLessThanMinPercent=Napredek ne more biti manjši, kot je vrednost prejšnje situacije
 NoSituations=Nobena situacija ni odprta
 InvoiceSituationLast=Končni in skupni račun
@@ -532,3 +543,4 @@ AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/sl_SI/categories.lang b/htdocs/langs/sl_SI/categories.lang
index d9012cc7a4c..0dd1219440c 100644
--- a/htdocs/langs/sl_SI/categories.lang
+++ b/htdocs/langs/sl_SI/categories.lang
@@ -16,7 +16,7 @@ MembersCategoriesArea=Področje značk/kategorij članov
 ContactsCategoriesArea=Področje značk/kategorij kontaktov
 AccountsCategoriesArea=Accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
-SubCats=Podkategorije
+SubCats=Sub-categories
 CatList=Seznam značk/kategorij
 NewCategory=Nova značka/kategorija
 ModifCat=Spremeni značko/kategorijo
@@ -85,3 +85,4 @@ CategorieRecursivHelp=Če je aktivirano, bo proizvod po dodajanju v podkategorij
 AddProductServiceIntoCategory=Dodaj sledeči produkt/storitev
 ShowCategory=Pokaži značko/kategorijo
 ByDefaultInList=Privzeto na seznamu
+ChooseCategory=Choose category
diff --git a/htdocs/langs/sl_SI/commercial.lang b/htdocs/langs/sl_SI/commercial.lang
index 11a33152f3a..4451550a05f 100644
--- a/htdocs/langs/sl_SI/commercial.lang
+++ b/htdocs/langs/sl_SI/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=Zapreti
 ActionAC_EMAILING=Poslati skupinski e-mail
 ActionAC_COM=Poslati naročilo kupca po pošti
 ActionAC_SHIP=Pošlji pošiljko po pošti
-ActionAC_SUP_ORD=Poslati naročilo dobavitelju po pošti
-ActionAC_SUP_INV=Poslati račun dobavitelja po pošti
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=Ostalo
 ActionAC_OTH_AUTO=Avtomatsko vnešeni dogodki
 ActionAC_MANUAL=Ročno vnešeni dogodki
diff --git a/htdocs/langs/sl_SI/companies.lang b/htdocs/langs/sl_SI/companies.lang
index 8ec7f29265f..a8670fb6d16 100644
--- a/htdocs/langs/sl_SI/companies.lang
+++ b/htdocs/langs/sl_SI/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Are you sure you want to delete this contact and all inheri
 MenuNewThirdParty=Nov partner
 MenuNewCustomer=Nov kupec
 MenuNewProspect=Nova možna stranka
-MenuNewSupplier=Nov dobavitelj
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=Nov posameznik
-NewCompany=Novo podjetje (možna stranka, kupec, dobavitelj)
-NewThirdParty=Nov partner (možna stranka, kupec, dobavitelj)
-CreateDolibarrThirdPartySupplier=Kreiraj partnerja (dobavitelj)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=Ustvari partnerja
 CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Področje možnih strank
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=Možne stranke
 ThirdPartyCustomers=Kupci
 ThirdPartyCustomersStats=Kupci
 ThirdPartyCustomersWithIdProf12=Kupci z %s ali %s
-ThirdPartySuppliers=Dobavitelji
+ThirdPartySuppliers=Vendors
 ThirdPartyType=Vrsta partnerja
 Individual=Posameznik
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
@@ -77,11 +77,11 @@ Web=Spletna stran
 Poste= Položaj
 DefaultLang=Privzet jezik
 VATIsUsed=Sales tax is used
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
-ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Ponudbe
 OverAllOrders=Naročila
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=RE tip
 TypeLocaltax2ES=IRPF tip
 WrongCustomerCode=Napačna koda kupca
-WrongSupplierCode=Napačna koda dobavitelja
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Model kode kupca
-SupplierCodeModel=Model kode dobavitelja
+SupplierCodeModel=Vendor code model
 Gencod=Črtna koda
 ##### Professional ID #####
 ProfId1Short=Mat. št.
@@ -267,7 +267,7 @@ Prospect=Možna stranka
 CustomerCard=Kartica kupca
 Customer=Kupec
 CustomerRelativeDiscount=Relativni popust za kupca
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=Relativni popust
 CustomerAbsoluteDiscountShort=Absolutni popust
 CompanyHasRelativeDiscount=Temu kupcu pripada popust v višini <b>%s%%</b>
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this suppl
 CompanyHasNoAbsoluteDiscount=Ta kupec nima diskontnega kredita
 CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
 CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=Brez popusta
 Supplier=Dobavitelj
 AddContact=Ustvari kntakt
@@ -304,13 +304,13 @@ DeleteACompany=Izbriši podjetje
 PersonalInformations=Osebni podatki
 AccountancyCode=Računovodstvo račun
 CustomerCode=Koda kupca
-SupplierCode=Koda dobavitelja
+SupplierCode=Vendor code
 CustomerCodeShort=Koda kupca
-SupplierCodeShort=Koda dobavitelja
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=Edinstvena koda kupca
-SupplierCodeDesc=Edinstvena koda dobavitelja
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=Obvezno, če je partner kupec ali možna stranka
-RequiredIfSupplier=Obvezno, če je partner dobavitelj
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=Kontrola veljavnosti z modulom
 ThisIsModuleRules=To so pravila za ta modul
 ProspectToContact=Možna stranka v kontakt
@@ -338,7 +338,7 @@ MyContacts=Moji kontakti
 Capital=Kapital
 CapitalOf=Kapital %s
 EditCompany=Uredi podjetje
-ThisUserIsNot=Ta uporabnik ni možna stranka, kupec ali dobavitelj
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=Kontrola
 VATIntraCheckDesc=Povezava <b>%s</b> omogoča poizvedbo v evropskem sistemu za kontrolo DDV številk. Za delovanje te storitve mora imeti strežnik zunanji internetni dostop.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -396,7 +396,7 @@ ImportDataset_company_4=Third parties/Sales representatives (Assign sales repres
 PriceLevel=Cenovni nivo
 DeliveryAddress=Naslov za dostavo
 AddAddress=Dodaj naslov
-SupplierCategory=Kategorija dobavitelja
+SupplierCategory=Vendor category
 JuridicalStatus200=Independent
 DeleteFile=Izbriši datoteko
 ConfirmDeleteFile=Ali zares želite izbrisati to datoteko?
@@ -406,7 +406,7 @@ FiscalYearInformation=Informacije o fiskalnem letu
 FiscalMonthStart=Začetni mesec fiskalnega leta
 YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
 YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
-ListSuppliersShort=Seznam dobaviteljev
+ListSuppliersShort=List of vendors
 ListProspectsShort=Seznam možnih strank
 ListCustomersShort=Seznam kupcev
 ThirdPartiesArea=Področje partnerjev in kontaktov
@@ -420,7 +420,7 @@ CurrentOutstandingBill=Trenutni neplačan račun
 OutstandingBill=Max. za neplačan račun
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Predlaga kodo kupca v formatu %syymm-nnnn in kodo dobavitelja v formatu %syymm-nnnn kjer je yy leto, mm mesec in nnnn zaporedna številka brez presledka, večja od 0.
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=Koda kupca / dobavitelja po želji. Lahko jo kadarkoli spremenite.
 ManagingDirectors=Ime direktorja(ev) (CEO, direktor, predsednik...)
 MergeOriginThirdparty=Podvojen partner (partner, ki ga želite zbrisati)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/sl_SI/compta.lang b/htdocs/langs/sl_SI/compta.lang
index 40bc4bdcba1..6c0e40be738 100644
--- a/htdocs/langs/sl_SI/compta.lang
+++ b/htdocs/langs/sl_SI/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=Neto odliv
 VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
-VATSummary=Tax Balance
+VATSummary=Tax monthly
+VATBalance=Tax Balance
 VATPaid=Tax paid
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=Področje računovodstva/blagajne
 NewPayment=Novo plačilo
 Payments=Plačila
 PaymentCustomerInvoice=Plačilo računa kupca
-PaymentSupplierInvoice=Plačilo računa dobavitelju
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Plačilo socialnega/fiskalnega davka
 PaymentVat=Plačilo DDV
 ListPayment=Seznam plačil
 ListOfCustomerPayments=Seznam plačil kupcev
-ListOfSupplierPayments=Seznam plačil dobaviteljem
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Začetni datum obdobja
 DateEndPeriod=Končni datum obdobja
 newLT1Payment=New tax 2 payment
@@ -110,7 +111,7 @@ ShowVatPayment=Prikaži plačilo DDV
 TotalToPay=Skupaj za plačilo
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
 CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
 SupplierAccountancyCodeShort=Sup. account. code
 AccountNumber=Številka konta
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Poročilo tretjih oseb IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Poročilo o pobranem in plačanem DDV po kupcih
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Chart of accounts models
 Pcg_type=Pcg način
 Pcg_subtype=Pcg podtip
 InvoiceLinesToDispatch=Vrstice računa za odpremo
-ByProductsAndServices=Po proizvodih in storitvah
+ByProductsAndServices=By product and service
 RefExt=Externa ref
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
 LinkedOrder=Povezava do naročila
@@ -215,7 +218,8 @@ Mode1=Metoda 1
 Mode2=Metoda 2
 CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
 CalculationRuleDescSupplier=According to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Način kalkulacije
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
@@ -242,3 +246,10 @@ FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/sl_SI/dict.lang b/htdocs/langs/sl_SI/dict.lang
index dc60dfcbe56..33052989974 100644
--- a/htdocs/langs/sl_SI/dict.lang
+++ b/htdocs/langs/sl_SI/dict.lang
@@ -5,6 +5,7 @@ CountryIT=Italija
 CountryES=Španija
 CountryDE=Nemčija
 CountryCH=Švica
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
 CountryGB=Velika Britanija
 CountryUK=Velika Britanija
 CountryIE=Irska
diff --git a/htdocs/langs/sl_SI/ecm.lang b/htdocs/langs/sl_SI/ecm.lang
index 790e0dfa4f0..441aefe22c2 100644
--- a/htdocs/langs/sl_SI/ecm.lang
+++ b/htdocs/langs/sl_SI/ecm.lang
@@ -39,9 +39,10 @@ ShowECMSection=Prikaži mapo
 DeleteSection=Odstrani mapo
 ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
 ECMDirectoryForFiles=Odvisna mapa za datoteke
-CannotRemoveDirectoryContainsFiles=Odstranitev ni možna, ker mapa vsebuje datoteke
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=Upravljanje z datotekami
-ECMSelectASection=Izberite mapo na levi drevesni strukturi...
+ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
diff --git a/htdocs/langs/sl_SI/errors.lang b/htdocs/langs/sl_SI/errors.lang
index 58482d10514..106c288072c 100644
--- a/htdocs/langs/sl_SI/errors.lang
+++ b/htdocs/langs/sl_SI/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Bar code required
 ErrorCustomerCodeAlreadyUsed=Koda kupca je že uporabljena
 ErrorBarCodeAlreadyUsed=Bar code already used
 ErrorPrefixRequired=Obvezna predpona
-ErrorBadSupplierCodeSyntax=Napačna koda dobavitelja
-ErrorSupplierCodeRequired=Obvezna koda dobavitelja
-ErrorSupplierCodeAlreadyUsed=Koda dobavitelja je že uporabljena
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Napačni parametri
 ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
 ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
@@ -87,7 +87,7 @@ ErrorsOnXLines=Napake v <b>%s</b> vrsticah izvorne kode
 ErrorFileIsInfectedWithAVirus=Antivirusni program ni mogel potrditi datoteke (datoteka je morda okužena)
 ErrorSpecialCharNotAllowedForField=Posebni znaki niso dovoljeni v polju "%s"
 ErrorNumRefModel=V bazi podatkov obstaja referenca (%s), ki ni kompatibilna s tem pravilom za številčenje. Odstranite zapis ali preimenujte referenco za aktivacijo tega modula.
-ErrorQtyTooLowForThisSupplier=Premajhna količina za tega dobavitelja ali ni določena cena tega izdelka za tega dobavitelja
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Napaka na maski
 ErrorBadMaskFailedToLocatePosOfSequence=Napaka, maska je brez zaporedne številke
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
-ErrorSupplierCountryIsNotDefined=Država tega dobavitelja ni določena. Najprej popravite to.
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
diff --git a/htdocs/langs/sl_SI/install.lang b/htdocs/langs/sl_SI/install.lang
index 90c421c506c..dc31f6a1b32 100644
--- a/htdocs/langs/sl_SI/install.lang
+++ b/htdocs/langs/sl_SI/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=Konfiguracijska datoteka <b>%s</b> Ne
 ConfFileCouldBeCreated=Konfiguracijska datoteka <b>%s</b> se lahko kreira.
 ConfFileIsNotWritable=V konfiguracijsko datoteko <b>%s</b> ni možno zapisovanje. Preverite dovoljenja. Pri prvi instalaciji mora vaš strežnik dovoljevati možnost zapisovanja v to datoteko med postopkom konfiguracije(na primer "chmod 666" na Unix in podobnih OS).
 ConfFileIsWritable=V konfiguracijsko datoteka <b>%s</b> je možno zapisovanje.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Ponovno naložite vse informacije iz konfiguracijske datoteke.
 PHPSupportSessions=Ta PHP podpira seje.
 PHPSupportPOSTGETOk=Ta PHP podpira spremenljivke POST in GET.
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
 WarningRemoveInstallDir=Pozor, zaradi varnostnih razlogov morate po končani namestitvi ali nadgradnji odstraniti mapo <b>install<b> ali jo preimenovati v <b>install.lock</b>, da bi preprečili njeno zlonamerno uporabo.
 FunctionNotAvailableInThisPHP=Ni na voljo pri tem PHP
 ChoosedMigrateScript=Izberite skript za selitev
-DataMigration=Selitev podatkov
-DatabaseMigration=Selitev strukture baze podatkov
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Obdelava skripta
 ChooseYourSetupMode=Izberite vaš način namestitve in kliknite "Start"...
 FreshInstall=Sveža namestitev
@@ -146,7 +147,7 @@ NothingToDo=Nothing to do
 # upgrade
 MigrationFixData=Popravek denormaliziranih podatkov
 MigrationOrder=Prenos podatkov o naročilih kupcev
-MigrationSupplierOrder=Prenos podatkov o naročilih pri dobaviteljih
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Prenos podatkov o komercialnih ponudbah
 MigrationInvoice=Prenos podatkov o računih za kupce
 MigrationContract=Prenos podatkov o pogodbah
@@ -196,6 +197,8 @@ MigrationEvents=Migracija dogodkov za dodajanje lastnika dogodka v dodelitveno t
 MigrationEventsContact=Migration of events to add event contact into assignement table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
 MigrationReloadModule=Ponovno naložite modul %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 ShowNotAvailableOptions=Prikaži opcije, ki niso na voljo
diff --git a/htdocs/langs/sl_SI/ldap.lang b/htdocs/langs/sl_SI/ldap.lang
index 2b1e3d748ff..528e6e23f6f 100644
--- a/htdocs/langs/sl_SI/ldap.lang
+++ b/htdocs/langs/sl_SI/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Geslo za domeno
 YouMustChangePassNextLogon=Geslo za uporabnika <b>%s</b> na domeni <b>%s</b> je potrebno spremeniti.
 UserMustChangePassNextLogon=Uporabnik mora spremeniti geslo na domeni %s
 LDAPInformationsForThisContact=Informacija v LDAP bazi podatkov za ta kontakt
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Member type synchronized
 ContactSynchronized=Kontakt sinhroniziran
 ForceSynchronize=Vsili sinhronizacijo Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Branje LDAP baze podatkov ni uspelo. Preverite nastavitev LDAP modula in dostopnost baze podatkov.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/sl_SI/loan.lang b/htdocs/langs/sl_SI/loan.lang
index 4791f1375ed..fe25f91babd 100644
--- a/htdocs/langs/sl_SI/loan.lang
+++ b/htdocs/langs/sl_SI/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=Kapital
 Insurance=Insurance
 Interest=Interest
 Nbterms=Number of terms
+Term=Term
 LoanAccountancyCapitalCode=Accounting account capital
 LoanAccountancyInsuranceCode=Accounting account insurance
 LoanAccountancyInterestCode=Accounting account interest
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=Confirm deleting this loan
 LoanDeleted=Loan Deleted Successfully
 ConfirmPayLoan=Confirm classify paid this loan
 LoanPaid=Loan Paid
-# Calc
-LoanCalc=Bank Loans Calculator
-PurchaseFinanceInfo=Purchase & Financing Information
-SalePriceOfAsset=Sale Price of Asset
-PercentageDown=Percentage Down
-LengthOfMortgage=Duration of loan
-AnnualInterestRate=Annual Interest Rate
-ExplainCalculations=Explain Calculations
-ShowMeCalculationsAndAmortization=Show me the calculations and amortization
-MortgagePaymentInformation=Mortgage Payment Information
-DownPayment=Down Payment
-DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
-InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
-MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
-MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
-MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
-MonthlyPaymentDesc=The montly payment is figured out using the following formula
-AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
-AmountFinanced=Amount Financed
-AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
-Totalsforyear=Totals for year
-MonthlyPayment=Monthly Payment
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
-GoToInterest=%s will go towards INTEREST
-GoToPrincipal=%s will go towards PRINCIPAL
-YouWillSpend=You will spend %s in year %s
 ListLoanAssociatedProject=List of loan associated with the project
 AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Interest
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-FinancialCommitment=Financial commitment
 CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/langs/sl_SI/mails.lang b/htdocs/langs/sl_SI/mails.lang
index b1a66572cde..8300445eecd 100644
--- a/htdocs/langs/sl_SI/mails.lang
+++ b/htdocs/langs/sl_SI/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Pošiljatelj
 MailErrorsTo=Naslov za napake
 MailReply=Odgovoriti
 MailTo=Za
+MailToUsers=To user(s)
 MailCC=Kopija
+MailToCCUsers=Copy to users(s)
 MailCCC=Skrita kopija
 MailTopic=Zadeva
 MailText=Sporočilo
@@ -164,4 +166,4 @@ InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Informacija
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang
index 0afe08d1d6f..f55ec1cfed2 100644
--- a/htdocs/langs/sl_SI/main.lang
+++ b/htdocs/langs/sl_SI/main.lang
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is se
 Administrator=Administrator
 Undefined=Nedefinirano
 PasswordForgotten=Password forgotten?
+NoAccount=No account?
 SeeAbove=Glejte zgoraj
 HomeArea=Domače področje
 LastConnexion=Latest connection
@@ -231,7 +232,7 @@ Limit=Omejitev
 Limits=Omejitve
 Logout=Odjava
 NoLogoutProcessWithAuthMode=Ni zahtevana funkcija odklopa pri avtentifikacijskem načinu <b>%s</b>
-Connection=Prijava
+Connection=Uporabniško ime
 Setup=Nastavitve
 Alert=Opozorilo
 MenuWarnings=Opozorila
@@ -402,6 +403,7 @@ DefaultTaxRate=Default tax rate
 Average=Povprečje
 Sum=Vsota
 Delta=Razlika
+RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Opcija
@@ -414,7 +416,7 @@ Favorite=Priljubljen
 ShortInfo=Info.
 Ref=Ref.
 ExternalRef=Zunanja ref.
-RefSupplier=Ref. dobavitelj
+RefSupplier=Ref. vendor
 RefPayment=Ref. plačilo
 CommercialProposalsShort=Komercialne ponudbe
 Comment=Komentar
@@ -493,7 +495,7 @@ Received=Prejet
 Paid=Plačan
 Topic=Predmet
 ByCompanies=S podjetji
-ByUsers=Z uporabniki
+ByUsers=By user
 Links=Povezave
 Link=Povezava
 Rejects=Zavrnitve
@@ -619,9 +621,9 @@ BuildDoc=Izdelaj Doc
 Entity=Entiteta
 Entities=Entitete
 CustomerPreview=Predogled kupca
-SupplierPreview=Predogled dobavitelja
+SupplierPreview=Vendor preview
 ShowCustomerPreview=Prikaži pregled kupca
-ShowSupplierPreview=Prikaži pregled dobavitelja
+ShowSupplierPreview=Show vendor preview
 RefCustomer=Ref. kupca
 Currency=Valuta
 InfoAdmin=Informacija za administratorje
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=Proizvodi ali storitve
 SearchIntoProjects=Projekti
 SearchIntoTasks=Naloge
 SearchIntoCustomerInvoices=Računi za kupca
-SearchIntoSupplierInvoices=Računi dobavitelja
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Naročila kupca
-SearchIntoSupplierOrders=Naročila pri dobavitelju
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=Ponudbe kupcu
-SearchIntoSupplierProposals=Ponudbe dobavitelja
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Intervencije
 SearchIntoContracts=Pogodbe
 SearchIntoCustomerShipments=Customer shipments
@@ -941,3 +943,5 @@ Remote=Remote
 LocalAndRemote=Local and Remote
 KeyboardShortcut=Keyboard shortcut
 AssignedTo=Se nanaša na
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/sl_SI/margins.lang b/htdocs/langs/sl_SI/margins.lang
index 3456bec6485..82ef67e05d1 100644
--- a/htdocs/langs/sl_SI/margins.lang
+++ b/htdocs/langs/sl_SI/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=Kot storitev
 UseDiscountOnTotal=V delni vsoti
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Določa, če se globalni popust smatra kot proizvod, storitev, ali samo delna vsota pri izračunu marže.
 MARGIN_TYPE=Privzeto predlagana nabavna cena s stroški za izračun marže
-MargeType1=Marža na najboljšo nabavno ceno
+MargeType1=Margin on Best vendor price
 MargeType2=Marža na uravnoteženo povprečno ceno (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Stroškovna cena
 UnitCharges=Stroški po enoti
 Charges=Stroški
diff --git a/htdocs/langs/sl_SI/members.lang b/htdocs/langs/sl_SI/members.lang
index 7bf2af5986b..56fe27bf110 100644
--- a/htdocs/langs/sl_SI/members.lang
+++ b/htdocs/langs/sl_SI/members.lang
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
diff --git a/htdocs/langs/sl_SI/opensurvey.lang b/htdocs/langs/sl_SI/opensurvey.lang
index 884bcbaa33c..3161187f69f 100644
--- a/htdocs/langs/sl_SI/opensurvey.lang
+++ b/htdocs/langs/sl_SI/opensurvey.lang
@@ -58,3 +58,4 @@ MoreChoices=Vnesite več možnih izbir za glasovalce
 SurveyExpiredInfo=The poll has been closed or voting delay has expired.
 EmailSomeoneVoted=%s je izpolnil vrstico.\nVašo anketo lahko najdete na povezavi: \n%s
 ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/sl_SI/orders.lang b/htdocs/langs/sl_SI/orders.lang
index 425de37ddf8..cf0f1e34266 100644
--- a/htdocs/langs/sl_SI/orders.lang
+++ b/htdocs/langs/sl_SI/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Področje naročil kupcev
-SuppliersOrdersArea=Področje naročil pri dobaviteljih
+SuppliersOrdersArea=Purchase orders area
 OrderCard=Kartica naročila
 OrderId=ID naročila
 Order=Naročilo
@@ -13,18 +13,18 @@ OrderToProcess=Naročilo za obdelavo
 NewOrder=Novo naročilo
 ToOrder=Potrebno naročiti
 MakeOrder=Izdelaj naročilo
-SupplierOrder=Naročilo pri dobavitelju
-SuppliersOrders=Naročila pri dobaviteljih
-SuppliersOrdersRunning=Trenutna naročila pri dobaviteljih
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=Naročilo kupca
-CustomersOrders=Naročila kupca
+CustomersOrders=Naročila kupcev
 CustomersOrdersRunning=Trenutna naročila kupca
 CustomersOrdersAndOrdersLines=Naročila kupca in vrrstice naročil
 OrdersDeliveredToBill=Customer orders delivered to bill
 OrdersToBill=Dobavljena naročila kupca
 OrdersInProcess=Naročila kupca v postopku
 OrdersToProcess=Naročila kupca za procesiranje
-SuppliersOrdersToProcess=Naročila pri dobavitelju za procesiranje
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=Preklicano
 StatusOrderDraftShort=Osnutek
 StatusOrderValidatedShort=Potrjeno
@@ -75,15 +75,15 @@ ShowOrder=Prikaži naročilo
 OrdersOpened=Naročila za procesiranje
 NoDraftOrders=Ni osnutkov naročil
 NoOrder=No order
-NoSupplierOrder=No supplier order
+NoSupplierOrder=No purchase order
 LastOrders=Latest %s customer orders
 LastCustomerOrders=Latest %s customer orders
-LastSupplierOrders=Latest %s supplier orders
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=Latest %s modified orders
 AllOrders=Vsa naročila
 NbOfOrders=Število naročil
 OrdersStatistics=Statistika naročil
-OrdersStatisticsSuppliers=Statistika naročil pri dobaviteljih
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Število naročil po mesecih
 AmountOfOrdersByMonthHT=Znesek naročil po mesecih (brez DDV)
 ListOfOrders=Seznam naročil
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</
 GenerateBill=Kreiraj račun
 ClassifyShipped=Označi kot dobavljeno
 DraftOrders=Osnutki naročil
-DraftSuppliersOrders=Draft suppliers orders
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=Naročila v obdelavi
 RefOrder=Ref. naročilo
 RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for supplier
-RefOrderSupplierShort=Ref. order supplier
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=Pošlji naročilo po pošti
 ActionsOnOrder=Aktivnosti ob naročilu
 NoArticleOfTypeProduct=Na tem naročilu ni artiklov tipa 'proizvod', zato ni potrebna odprema
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
 DispatchSupplierOrder=Prejem naročila od dobavitelja %s
 FirstApprovalAlreadyDone=Prva odobritev je že narejena
 SecondApprovalAlreadyDone=Druga odobritev je že narejena
-SupplierOrderReceivedInDolibarr=Supplier order %s received %s
-SupplierOrderSubmitedInDolibarr=Supplier order %s submited
-SupplierOrderClassifiedBilled=Supplier order %s set billed
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Ostala naročila
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Referent za sledenje naročila kupca
@@ -125,11 +125,11 @@ TypeContact_commande_internal_SHIPPING=Referent za sledenje odpreme
 TypeContact_commande_external_BILLING=Kontakt za račune pri kupcu
 TypeContact_commande_external_SHIPPING=Kontakt za dobave pri kupcu
 TypeContact_commande_external_CUSTOMER=Kontakt za sledenje naročila pri kupcu
-TypeContact_order_supplier_internal_SALESREPFOLL=Referent za sledenje naročila od dobavitelja
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Referent za sledenje odpreme od dobavitelja
-TypeContact_order_supplier_external_BILLING=Kontakt za račune pri dobavitelju
-TypeContact_order_supplier_external_SHIPPING=Kontakt za odpreme pri dobavitelju
-TypeContact_order_supplier_external_CUSTOMER=Kontakt za sledenje naročila pri dobavitelju
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Konstanta COMMANDE_SUPPLIER_ADDON ni definirana
 Error_COMMANDE_ADDON_NotDefined=Konstanta COMMANDE_ADDON ni definirana
 Error_OrderNotChecked=Ni izbranih naročil za račun
diff --git a/htdocs/langs/sl_SI/other.lang b/htdocs/langs/sl_SI/other.lang
index 0578fea32f3..dfa7c127dbf 100644
--- a/htdocs/langs/sl_SI/other.lang
+++ b/htdocs/langs/sl_SI/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=Datoteke so prevelike
 PleaseBePatient=Prosim, bodite potrpežljivi...
 NewPassword=New password
 ResetPassword=Reset password
-RequestToResetPasswordReceived=Prejet je bil zahtevek za spremembo vašega Dolibarr gesla
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=To so vaši novi podatki za prijavo
 NewKeyWillBe=Vaši novi podatki za prijavo v program bodo
 ClickHereToGoTo=K.iknite tukaj za vstop v %s
@@ -233,6 +233,8 @@ PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=Področje izvoza
 AvailableFormats=Možni formati
diff --git a/htdocs/langs/sl_SI/productbatch.lang b/htdocs/langs/sl_SI/productbatch.lang
index 7729354dcb8..80b78d893bc 100644
--- a/htdocs/langs/sl_SI/productbatch.lang
+++ b/htdocs/langs/sl_SI/productbatch.lang
@@ -16,7 +16,7 @@ printEatby=Eat-by: %s
 printSellby=Sell-by: %s
 printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic increase/decrease stock mode is forced to shipping validate and manual dispatching for reception and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
 ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
diff --git a/htdocs/langs/sl_SI/products.lang b/htdocs/langs/sl_SI/products.lang
index 4e9dacc6aa9..6a985f7c75f 100644
--- a/htdocs/langs/sl_SI/products.lang
+++ b/htdocs/langs/sl_SI/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=Nova cena
 MinPrice=Min. prodajna cena
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=Prodajna cena ne more biti nižja od minimalne za ta proizvod (%s brez DDV). To sporočilo se pojavi lahko tudi, če vnesete prevelik popust
 ContractStatusClosed=Zaprta
 ErrorProductAlreadyExists=Proizvod z referenco %s že obstaja.
@@ -155,7 +156,7 @@ BuyingPrices=Buying prices
 CustomerPrices=Cene za kupce
 SuppliersPrices=Cene dobavitelja
 SuppliersPricesOfProductsOrServices=Cene dobavitelja (proizvodov ali storitev)
-CustomCode=Customs/Commodity/HS code
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=Država porekla
 Nature=Narava
 ShortLabel=Kratek naziv
diff --git a/htdocs/langs/sl_SI/projects.lang b/htdocs/langs/sl_SI/projects.lang
index 9a0419d4cb7..ae4e29c5d25 100644
--- a/htdocs/langs/sl_SI/projects.lang
+++ b/htdocs/langs/sl_SI/projects.lang
@@ -77,6 +77,7 @@ Time=Čas
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=Seznam komercialnih ponudb, povezanih s projektom
 ListOrdersAssociatedProject=List of customer orders associated with the project
@@ -226,4 +227,4 @@ AllowCommentOnProject=Allow user comments on projects
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/sl_SI/stocks.lang b/htdocs/langs/sl_SI/stocks.lang
index 9c6c400c022..03955edcd25 100644
--- a/htdocs/langs/sl_SI/stocks.lang
+++ b/htdocs/langs/sl_SI/stocks.lang
@@ -203,3 +203,4 @@ RegulateStock=Regulate Stock
 ListInventory=Seznam
 StockSupportServices=Stock management support services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/sl_SI/stripe.lang b/htdocs/langs/sl_SI/stripe.lang
index 2c80a5bba3d..c0ee4a81af8 100644
--- a/htdocs/langs/sl_SI/stripe.lang
+++ b/htdocs/langs/sl_SI/stripe.lang
@@ -58,8 +58,8 @@ NameOnCard=Name on card
 CardNumber=Card Number
 ExpiryDate=Expiry Date
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/sl_SI/supplier_proposal.lang b/htdocs/langs/sl_SI/supplier_proposal.lang
index 8822667d131..4659c562862 100644
--- a/htdocs/langs/sl_SI/supplier_proposal.lang
+++ b/htdocs/langs/sl_SI/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Supplier commercial proposals
-supplier_proposalDESC=Manage price requests to suppliers
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
 SupplierProposalNew=New price request
 CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
-SupplierProposalsDraft=Draft supplier proposals
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=Latest %s modified price requests
 RequestsOpened=Open price requests
-SupplierProposalArea=Supplier proposals area
-SupplierProposalShort=Supplier proposal
-SupplierProposals=Ponudbe dobavitelja
-SupplierProposalsShort=Ponudbe dobavitelja
+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=Supplier ref
+SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=Datum dobave
 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>?
@@ -47,9 +47,9 @@ CommercialAsk=Price request
 DefaultModelSupplierProposalCreate=Ustvarjanje privzetega modela
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposals=List of supplier proposal requests
-ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
-SupplierProposalsToClose=Supplier proposals to close
-SupplierProposalsToProcess=Supplier proposals to process
+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
diff --git a/htdocs/langs/sl_SI/suppliers.lang b/htdocs/langs/sl_SI/suppliers.lang
index 1b449f7c360..e236893244a 100644
--- a/htdocs/langs/sl_SI/suppliers.lang
+++ b/htdocs/langs/sl_SI/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Dobavitelji
-SuppliersInvoice=Računi dobavitelja
-ShowSupplierInvoice=Pokaži račun dobavitelja
-NewSupplier=Nov dobavitelj
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=Zgodovina
-ListOfSuppliers=Seznam dobaviteljev
-ShowSupplier=Prikaži dobavitelja
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=Datum naročila
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Nekateri pod-proizvodi nimajo določenih cen
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
-SupplierPrices=Cene dobavitelja
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Ta referenčni dobavitelj je že povezan z referenco: %s
-NoRecordedSuppliers=Ni vnesenih dobaviteljev
-SupplierPayment=Plačilo dobavitelju
-SuppliersArea=Področje dobaviteljev
-RefSupplierShort=Ref. dobavitelja
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=Razpoložljivost
-ExportDataset_fournisseur_1=Seznam računov dobavitelja in vrstic računa
-ExportDataset_fournisseur_2=Računi dobaviteljev in plačila
-ExportDataset_fournisseur_3=Naročila pri dobaviteljih in vrstice naročila
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=Odobri to naročilo
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Zavrni to naročilo
 ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
 ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
-AddSupplierOrder=Kreirajte naročilo pri dobavitelju
-AddSupplierInvoice=Kreirajte račun dobavitelja
-ListOfSupplierProductForSupplier=Seznam proizvodov in cen dobavitelja <b>%s</b>
-SentToSuppliers=Pošlji dobaviteljem
-ListOfSupplierOrders=Seznam naročil dobaviitelja
-MenuOrdersSupplierToBill=Zaračunavanje naročil dobavitelja
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Zakasnitev dobave v dnevih
 DescNbDaysToDelivery=Največja zamuda pri dobavi proizvodov iz tega naročila
-SupplierReputation=Supplier reputation
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
 AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=Cene dobavitelja
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/sl_SI/website.lang b/htdocs/langs/sl_SI/website.lang
index f49f7d53304..3a2df365141 100644
--- a/htdocs/langs/sl_SI/website.lang
+++ b/htdocs/langs/sl_SI/website.lang
@@ -73,7 +73,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
diff --git a/htdocs/langs/sl_SI/workflow.lang b/htdocs/langs/sl_SI/workflow.lang
index 355cd876152..14d4f94791e 100644
--- a/htdocs/langs/sl_SI/workflow.lang
+++ b/htdocs/langs/sl_SI/workflow.lang
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source custome
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=Samodejno generiranje
 AutomaticClassification=Samodejno spreminjanje statusa
diff --git a/htdocs/langs/sq_AL/accountancy.lang b/htdocs/langs/sq_AL/accountancy.lang
index 8c98e90477d..ebf2334a2e4 100644
--- a/htdocs/langs/sq_AL/accountancy.lang
+++ b/htdocs/langs/sq_AL/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Accounting
 ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
 ACCOUNTING_EXPORT_DATE=Date format for export file
 ACCOUNTING_EXPORT_PIECE=Export the number of piece
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Accounts with non zero values
 ListOfAccounts=List of accounts
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers 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
 
-AccountancyArea=Accountancy area
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
 AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
@@ -89,7 +90,7 @@ MenuProductsAccounts=Product accounts
 ProductsBinding=Products accounts
 Ventilation=Binding to accounts
 CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Supplier invoice binding
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
 ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
@@ -185,11 +187,12 @@ ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
-DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Group of account
 Pcgsubtype=Subgroup of account
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
 ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
 DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report 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 fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -293,4 +296,9 @@ Binded=Lines bound
 ToBind=Lines to bind
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang
index 2a8e9865efb..ca325184a2e 100644
--- a/htdocs/langs/sq_AL/admin.lang
+++ b/htdocs/langs/sq_AL/admin.lang
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems)
 MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=Method to use to send EMails
 MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
 MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
@@ -291,7 +292,7 @@ ModuleSetup=Konfigurimi i modulit
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=Sistemi
 ModuleFamilyCrm=Menaxhimi i lidhjes me klientёt (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Menaxhimi i produkteve (PM)
 ModuleFamilyHr=Menaxhimi i Burimeve Njerёzore (BNJ)
 ModuleFamilyProjects=Projects/Collaborative work
@@ -373,7 +374,8 @@ NoSmsEngine=No SMS sender manager available. SMS sender manager are not installe
 PDF=PDF
 PDFDesc=You can set each global options related to the PDF generation
 PDFAddressForging=Rules to forge address boxes
-HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=Hide products description on generated PDF
@@ -445,7 +447,8 @@ DisplayCompanyInfo=Display company address
 DisplayCompanyManagers=Display manager names
 DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party 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.
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Set this to 1 if you want to attach main document to emai
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -479,7 +485,7 @@ Module1Desc=Companies and contact management (customers, prospects...)
 Module2Name=Commercial
 Module2Desc=Commercial management
 Module10Name=Accounting
-Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching.
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=Proposals
 Module20Desc=Commercial proposal management
 Module22Name=Mass E-mailings
@@ -546,8 +552,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
-Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Payment of employee wages
 Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
@@ -561,14 +567,14 @@ Module700Name=Dhurimet
 Module700Desc=Donation management
 Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Mantis integration
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
 Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=Editor WYSIWYG
 Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
 Module2200Name=Dynamic Prices
@@ -576,7 +582,7 @@ Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Scheduled jobs
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API/Web services (SOAP server)
@@ -613,7 +619,7 @@ Module50100Desc=Point of sales module (POS).
 Module50200Name=Paypal
 Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Poll, Survey or Vote
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed memb
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=Other menu entries manage optional parameters.
 LogEvents=Security audit events
 Audit=Audit
@@ -1054,8 +1060,9 @@ LogEventDesc=You can enable here the logging for Dolibarr security events. Admin
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1188,11 +1195,11 @@ UserMailRequired=EMail required to create a new user
 HRMSetup=HRM module setup
 ##### Company setup #####
 CompanySetup=Companies module setup
-CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier)
-AccountCodeManager=Module for accounting code generation (customer or supplier)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
 NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
 ModelModules=Documents templates
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
@@ -1203,6 +1210,9 @@ MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
 TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=Free text on commercial proposals
 WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
 ##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=Order management setup
 OrdersNumberingModules=Orders numbering models
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe
 OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
 OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
 ##### Stock #####
-StockSetup=Warehouse module setup
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
 ##### Menu #####
 MenuDeleted=Menu deleted
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
 MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
 SuppliersSetup=Supplier module setup
-SuppliersCommandModel=Complete template of supplier order (logo...)
-SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","
 SalariesSetup=Setup of module salaries
 SortOrder=Sort order
 Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Install of external module from applic
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
-TextTitleColor=Color of page title
+TextTitleColor=Text color of Page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=Background color for Top menu
 TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
 ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-MailToMember=To send email from member page
-MailToUser=To send email from user page
-MailToProject= To send email from project page
+MailToSendProposal=Customer proposals
+MailToSendOrder=Customer orders
+MailToSendInvoice=Customer invoices
+MailToSendShipment=Shipments
+MailToSendIntervention=Interventions
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Contracts
+MailToThirdparty=Third parties
+MailToMember=Members
+MailToUser=Users
+MailToProject=Projects page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1780,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/sq_AL/bills.lang b/htdocs/langs/sq_AL/bills.lang
index 764caee52e2..0d647d39eb5 100644
--- a/htdocs/langs/sq_AL/bills.lang
+++ b/htdocs/langs/sq_AL/bills.lang
@@ -109,7 +109,7 @@ CancelBill=Cancel an invoice
 SendRemindByMail=Send reminder by EMail
 DoPayment=Enter payment
 DoPaymentBack=Enter refund
-ConvertToReduc=Convert into future discount
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
@@ -120,7 +120,7 @@ BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
 BillStatusPaid=Paid
-BillStatusPaidBackOrConverted=Credit note refund or converted into discount
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Abandoned
 BillStatusValidated=Validated (needs to be paid)
@@ -296,10 +296,10 @@ DiscountType=Discount type
 NoteReason=Note/Reason
 ReasonDiscount=Reason
 DiscountOfferedBy=Granted by
-DiscountStillRemaining=Discounts available
-DiscountAlreadyCounted=Discounts already consumed
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+SupplierDiscounts=Vendors discounts
 BillAddress=Bill address
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Çdo %s ditë
 FrequencyPer_m=Çdo %s muaj
 FrequencyPer_y=Çdo %s vjet
@@ -505,9 +511,14 @@ SituationAmount=Situation invoice amount(net)
 SituationDeduction=Situation subtraction
 ModifyAllLines=Modify all lines
 CreateNextSituationInvoice=Create next situation
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=S
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
 NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
@@ -532,3 +543,4 @@ AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/sq_AL/categories.lang b/htdocs/langs/sq_AL/categories.lang
index 412a77f8ff4..dcc6a3db18f 100644
--- a/htdocs/langs/sq_AL/categories.lang
+++ b/htdocs/langs/sq_AL/categories.lang
@@ -16,7 +16,7 @@ MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
-SubCats=Subcategories
+SubCats=Sub-categories
 CatList=List of tags/categories
 NewCategory=New tag/category
 ModifCat=Modify tag/category
@@ -85,3 +85,4 @@ CategorieRecursivHelp=If activated, product will also linked to parent category
 AddProductServiceIntoCategory=Add the following product/service
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
+ChooseCategory=Choose category
diff --git a/htdocs/langs/sq_AL/commercial.lang b/htdocs/langs/sq_AL/commercial.lang
index 3a17d6f7a64..e1f9968bd40 100644
--- a/htdocs/langs/sq_AL/commercial.lang
+++ b/htdocs/langs/sq_AL/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=Mbyll
 ActionAC_EMAILING=Send mass email
 ActionAC_COM=Send customer order by mail
 ActionAC_SHIP=Send shipping by mail
-ActionAC_SUP_ORD=Send supplier order by mail
-ActionAC_SUP_INV=Send supplier invoice by mail
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=Tjetër
 ActionAC_OTH_AUTO=Njarje tё futura nё mёnyrё automatike
 ActionAC_MANUAL=Njarje tё futura manualisht
diff --git a/htdocs/langs/sq_AL/companies.lang b/htdocs/langs/sq_AL/companies.lang
index 164562e1106..943f8dc2a0f 100644
--- a/htdocs/langs/sq_AL/companies.lang
+++ b/htdocs/langs/sq_AL/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Are you sure you want to delete this contact and all inheri
 MenuNewThirdParty=New third party
 MenuNewCustomer=Klient i ri
 MenuNewProspect=New prospect
-MenuNewSupplier=Furnitor i ri
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=New private individual
-NewCompany=New company (prospect, customer, supplier)
-NewThirdParty=New third party (prospect, customer, supplier)
-CreateDolibarrThirdPartySupplier=Create a third party (supplier)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=Create third party
 CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Prospection area
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=Prospects
 ThirdPartyCustomers=Klientёt
 ThirdPartyCustomersStats=Klientёt
 ThirdPartyCustomersWithIdProf12=Customers with %s or %s
-ThirdPartySuppliers=Furnitorët
+ThirdPartySuppliers=Vendors
 ThirdPartyType=Third party type
 Individual=Private individual
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
@@ -77,11 +77,11 @@ Web=Web
 Poste= Position
 DefaultLang=Language by default
 VATIsUsed=Sales tax is used
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
-ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Proposals
 OverAllOrders=Orders
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=RE Type
 TypeLocaltax2ES=IRPF Type
 WrongCustomerCode=Customer code invalid
-WrongSupplierCode=Supplier code invalid
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Customer code model
-SupplierCodeModel=Supplier code model
+SupplierCodeModel=Vendor code model
 Gencod=Bar code
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
@@ -267,7 +267,7 @@ Prospect=Prospect
 CustomerCard=Customer Card
 Customer=Klienti
 CustomerRelativeDiscount=Relative customer discount
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=Relative discount
 CustomerAbsoluteDiscountShort=Absolute discount
 CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this suppl
 CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
 CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
 CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=None
 Supplier=Supplier
 AddContact=Create contact
@@ -304,13 +304,13 @@ DeleteACompany=Fshij kompani
 PersonalInformations=Të dhëna personale
 AccountancyCode=Accounting account
 CustomerCode=Customer code
-SupplierCode=Supplier code
+SupplierCode=Vendor code
 CustomerCodeShort=Customer code
-SupplierCodeShort=Supplier code
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=Customer code, unique for all customers
-SupplierCodeDesc=Supplier code, unique for all suppliers
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=Required if third party is a customer or prospect
-RequiredIfSupplier=Required if third party is a supplier
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=Validity controled by module
 ThisIsModuleRules=This is rules for this module
 ProspectToContact=Prospect to contact
@@ -338,7 +338,7 @@ MyContacts=My contacts
 Capital=Capital
 CapitalOf=Capital of %s
 EditCompany=Edit company
-ThisUserIsNot=This user is not a prospect, customer nor supplier
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=Check
 VATIntraCheckDesc=The link <b>%s</b> allows to ask the european VAT checker service. An external internet access from server is required for this service to work.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -396,7 +396,7 @@ ImportDataset_company_4=Third parties/Sales representatives (Assign sales repres
 PriceLevel=Price level
 DeliveryAddress=Delivery address
 AddAddress=Shto adresë
-SupplierCategory=Supplier category
+SupplierCategory=Vendor category
 JuridicalStatus200=Independent
 DeleteFile=Fshi skedar
 ConfirmDeleteFile=Are you sure you want to delete this file?
@@ -406,7 +406,7 @@ FiscalYearInformation=Information on the fiscal year
 FiscalMonthStart=Starting month of the fiscal year
 YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
 YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
-ListSuppliersShort=List of suppliers
+ListSuppliersShort=List of vendors
 ListProspectsShort=List of prospects
 ListCustomersShort=List of customers
 ThirdPartiesArea=Third parties and contact area
@@ -420,7 +420,7 @@ CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/sq_AL/compta.lang b/htdocs/langs/sq_AL/compta.lang
index ddaa4c2377b..d3f01d1b91a 100644
--- a/htdocs/langs/sq_AL/compta.lang
+++ b/htdocs/langs/sq_AL/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=Net paid
 VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
-VATSummary=Tax Balance
+VATSummary=Tax monthly
+VATBalance=Tax Balance
 VATPaid=Tax paid
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=Accountancy/Treasury area
 NewPayment=New payment
 Payments=Payments
 PaymentCustomerInvoice=Customer invoice payment
-PaymentSupplierInvoice=Supplier invoice payment
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
-ListOfSupplierPayments=List of supplier payments
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -110,7 +111,7 @@ ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
 CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
 SupplierAccountancyCodeShort=Sup. account. code
 AccountNumber=Account number
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
 Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
-ByProductsAndServices=By products and services
+ByProductsAndServices=By product and service
 RefExt=External ref
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
 LinkedOrder=Link to order
@@ -215,7 +218,8 @@ Mode1=Method 1
 Mode2=Method 2
 CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
 CalculationRuleDescSupplier=According to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
@@ -242,3 +246,10 @@ FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/sq_AL/dict.lang b/htdocs/langs/sq_AL/dict.lang
index c3d329407e9..a9752d40757 100644
--- a/htdocs/langs/sq_AL/dict.lang
+++ b/htdocs/langs/sq_AL/dict.lang
@@ -5,7 +5,8 @@ CountryIT=Itali
 CountryES=Spanjë
 CountryDE=Gjermani
 CountryCH=Zvicër
-CountryGB=Britani e Madhe
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=United Kingdom
 CountryUK=United Kingdom
 CountryIE=Irlandë
 CountryCN=Kinë
diff --git a/htdocs/langs/sq_AL/ecm.lang b/htdocs/langs/sq_AL/ecm.lang
index d6ddf736fe2..e5c26493a46 100644
--- a/htdocs/langs/sq_AL/ecm.lang
+++ b/htdocs/langs/sq_AL/ecm.lang
@@ -39,9 +39,10 @@ ShowECMSection=Show directory
 DeleteSection=Remove directory
 ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
 ECMDirectoryForFiles=Relative directory for files
-CannotRemoveDirectoryContainsFiles=Removed not possible because it contains some files
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=File manager
-ECMSelectASection=Select a directory on left tree...
+ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
diff --git a/htdocs/langs/sq_AL/errors.lang b/htdocs/langs/sq_AL/errors.lang
index ec036b28bc5..0ca7488b8cb 100644
--- a/htdocs/langs/sq_AL/errors.lang
+++ b/htdocs/langs/sq_AL/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Bar code required
 ErrorCustomerCodeAlreadyUsed=Customer code already used
 ErrorBarCodeAlreadyUsed=Bar code already used
 ErrorPrefixRequired=Prefix required
-ErrorBadSupplierCodeSyntax=Bad syntax for supplier code
-ErrorSupplierCodeRequired=Supplier code required
-ErrorSupplierCodeAlreadyUsed=Supplier code already used
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Bad parameters
 ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
 ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
@@ -87,7 +87,7 @@ ErrorsOnXLines=Errors on <b>%s</b> source record(s)
 ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
 ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s"
 ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
-ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Error on mask
 ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
-ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
diff --git a/htdocs/langs/sq_AL/install.lang b/htdocs/langs/sq_AL/install.lang
index d012acf8f3c..f48dabb7e9f 100644
--- a/htdocs/langs/sq_AL/install.lang
+++ b/htdocs/langs/sq_AL/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not
 ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
 ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be granted to be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reload all information from configuration file.
 PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
 WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called <b>install.lock</b> into Dolibarr document directory, in order to avoid malicious use of it.
 FunctionNotAvailableInThisPHP=Not available on this PHP
 ChoosedMigrateScript=Choose migration script
-DataMigration=Data migration
-DatabaseMigration=Structure database migration
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script processing
 ChooseYourSetupMode=Choose your setup mode and click "Start"...
 FreshInstall=Fresh install
@@ -146,7 +147,7 @@ NothingToDo=Nothing to do
 # upgrade
 MigrationFixData=Fix for denormalized data
 MigrationOrder=Data migration for customer's orders
-MigrationSupplierOrder=Data migration for supplier's orders
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Data migration for commercial proposals
 MigrationInvoice=Data migration for customer's invoices
 MigrationContract=Data migration for contracts
@@ -196,6 +197,8 @@ MigrationEvents=Migration of events to add event owner into assignement table
 MigrationEventsContact=Migration of events to add event contact into assignement table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 ShowNotAvailableOptions=Show not available options
diff --git a/htdocs/langs/sq_AL/ldap.lang b/htdocs/langs/sq_AL/ldap.lang
index 414ad5fcc5e..2552e911258 100644
--- a/htdocs/langs/sq_AL/ldap.lang
+++ b/htdocs/langs/sq_AL/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Password for domain
 YouMustChangePassNextLogon=Password for user <b>%s</b> on the domain <b>%s</b> must be changed.
 UserMustChangePassNextLogon=User must change password on the domain %s
 LDAPInformationsForThisContact=Information in LDAP database for this contact
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Member type synchronized
 ContactSynchronized=Contact synchronized
 ForceSynchronize=Force synchronizing Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Failed to read LDAP database. Check LDAP module setup and database accessibility.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/sq_AL/loan.lang b/htdocs/langs/sq_AL/loan.lang
index 9aae3869cc3..534dee08867 100644
--- a/htdocs/langs/sq_AL/loan.lang
+++ b/htdocs/langs/sq_AL/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=Capital
 Insurance=Insurance
 Interest=Interest
 Nbterms=Number of terms
+Term=Term
 LoanAccountancyCapitalCode=Accounting account capital
 LoanAccountancyInsuranceCode=Accounting account insurance
 LoanAccountancyInterestCode=Accounting account interest
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=Confirm deleting this loan
 LoanDeleted=Loan Deleted Successfully
 ConfirmPayLoan=Confirm classify paid this loan
 LoanPaid=Loan Paid
-# Calc
-LoanCalc=Bank Loans Calculator
-PurchaseFinanceInfo=Purchase & Financing Information
-SalePriceOfAsset=Sale Price of Asset
-PercentageDown=Percentage Down
-LengthOfMortgage=Duration of loan
-AnnualInterestRate=Annual Interest Rate
-ExplainCalculations=Explain Calculations
-ShowMeCalculationsAndAmortization=Show me the calculations and amortization
-MortgagePaymentInformation=Mortgage Payment Information
-DownPayment=Down Payment
-DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
-InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
-MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
-MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
-MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
-MonthlyPaymentDesc=The montly payment is figured out using the following formula
-AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
-AmountFinanced=Amount Financed
-AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
-Totalsforyear=Totals for year
-MonthlyPayment=Monthly Payment
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
-GoToInterest=%s will go towards INTEREST
-GoToPrincipal=%s will go towards PRINCIPAL
-YouWillSpend=You will spend %s in year %s
 ListLoanAssociatedProject=List of loan associated with the project
 AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Interest
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-FinancialCommitment=Financial commitment
 CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/langs/sq_AL/mails.lang b/htdocs/langs/sq_AL/mails.lang
index 8085bb381cb..da9c86bb939 100644
--- a/htdocs/langs/sq_AL/mails.lang
+++ b/htdocs/langs/sq_AL/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Dërguesi
 MailErrorsTo=Errors to
 MailReply=Reply to
 MailTo=Receiver(s)
+MailToUsers=To user(s)
 MailCC=Copy to
+MailToCCUsers=Copy to users(s)
 MailCCC=Cached copy to
 MailTopic=EMail topic
 MailText=Message
@@ -164,4 +166,4 @@ InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/sq_AL/main.lang b/htdocs/langs/sq_AL/main.lang
index fcc2cb23d4e..f4030155579 100644
--- a/htdocs/langs/sq_AL/main.lang
+++ b/htdocs/langs/sq_AL/main.lang
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is se
 Administrator=Administrator
 Undefined=Undefined
 PasswordForgotten=Password forgotten?
+NoAccount=No account?
 SeeAbove=See above
 HomeArea=Home area
 LastConnexion=Latest connection
@@ -231,7 +232,7 @@ Limit=Limit
 Limits=Limits
 Logout=Logout
 NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Connection
+Connection=Login
 Setup=Konfiguro
 Alert=Alert
 MenuWarnings=Alerts
@@ -402,6 +403,7 @@ DefaultTaxRate=Default tax rate
 Average=Average
 Sum=Sum
 Delta=Delta
+RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
@@ -414,7 +416,7 @@ Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
 ExternalRef=Ref. extern
-RefSupplier=Ref. supplier
+RefSupplier=Ref. vendor
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
 Comment=Koment
@@ -493,7 +495,7 @@ Received=Received
 Paid=Paid
 Topic=Subject
 ByCompanies=By third parties
-ByUsers=By users
+ByUsers=By user
 Links=Links
 Link=Link
 Rejects=Rejects
@@ -619,9 +621,9 @@ BuildDoc=Build Doc
 Entity=Environment
 Entities=Entities
 CustomerPreview=Customer preview
-SupplierPreview=Supplier preview
+SupplierPreview=Vendor preview
 ShowCustomerPreview=Show customer preview
-ShowSupplierPreview=Show supplier preview
+ShowSupplierPreview=Show vendor preview
 RefCustomer=Ref. customer
 Currency=Currency
 InfoAdmin=Information for administrators
@@ -679,7 +681,7 @@ Color=Color
 Documents=Linked files
 Documents2=Documents
 UploadDisabled=Upload disabled
-MenuAccountancy=Accountancy
+MenuAccountancy=Accounting
 MenuECM=Documents
 MenuAWStats=AWStats
 MenuMembers=Members
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=Products or services
 SearchIntoProjects=Projects
 SearchIntoTasks=Tasks
 SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Interventions
 SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
@@ -941,3 +943,5 @@ Remote=Remote
 LocalAndRemote=Local and Remote
 KeyboardShortcut=Keyboard shortcut
 AssignedTo=Assigned to
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/sq_AL/margins.lang b/htdocs/langs/sq_AL/margins.lang
index 9f590ef3718..b9d52dcfdc6 100644
--- a/htdocs/langs/sq_AL/margins.lang
+++ b/htdocs/langs/sq_AL/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=As a service
 UseDiscountOnTotal=On subtotal
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
 MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best supplier price
+MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Cost price
 UnitCharges=Unit charges
 Charges=Charges
diff --git a/htdocs/langs/sq_AL/members.lang b/htdocs/langs/sq_AL/members.lang
index 9a43a470e8d..f15d085c5d1 100644
--- a/htdocs/langs/sq_AL/members.lang
+++ b/htdocs/langs/sq_AL/members.lang
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
diff --git a/htdocs/langs/sq_AL/opensurvey.lang b/htdocs/langs/sq_AL/opensurvey.lang
index 87e6a74913a..76684955e56 100644
--- a/htdocs/langs/sq_AL/opensurvey.lang
+++ b/htdocs/langs/sq_AL/opensurvey.lang
@@ -58,3 +58,4 @@ MoreChoices=Enter more choices for the voters
 SurveyExpiredInfo=The poll has been closed or voting delay has expired.
 EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
 ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/sq_AL/orders.lang b/htdocs/langs/sq_AL/orders.lang
index 67c1d112ebd..32a85f0839d 100644
--- a/htdocs/langs/sq_AL/orders.lang
+++ b/htdocs/langs/sq_AL/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Customers orders area
-SuppliersOrdersArea=Suppliers orders area
+SuppliersOrdersArea=Purchase orders area
 OrderCard=Order card
 OrderId=Order Id
 Order=Order
@@ -13,18 +13,18 @@ OrderToProcess=Order to process
 NewOrder=New order
 ToOrder=Make order
 MakeOrder=Make order
-SupplierOrder=Supplier order
-SuppliersOrders=Suppliers orders
-SuppliersOrdersRunning=Current suppliers orders
-CustomerOrder=Customer order
-CustomersOrders=Customer orders
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=Customer Order
+CustomersOrders=Customer Orders
 CustomersOrdersRunning=Current customer orders
 CustomersOrdersAndOrdersLines=Customer orders and order lines
 OrdersDeliveredToBill=Customer orders delivered to bill
 OrdersToBill=Customer orders delivered
 OrdersInProcess=Customer orders in process
 OrdersToProcess=Customer orders to process
-SuppliersOrdersToProcess=Supplier orders to process
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=Anulluar
 StatusOrderDraftShort=Draft
 StatusOrderValidatedShort=Validated
@@ -75,15 +75,15 @@ ShowOrder=Show order
 OrdersOpened=Orders to process
 NoDraftOrders=No draft orders
 NoOrder=No order
-NoSupplierOrder=No supplier order
+NoSupplierOrder=No purchase order
 LastOrders=Latest %s customer orders
 LastCustomerOrders=Latest %s customer orders
-LastSupplierOrders=Latest %s supplier orders
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=Latest %s modified orders
 AllOrders=All orders
 NbOfOrders=Number of orders
 OrdersStatistics=Order's statistics
-OrdersStatisticsSuppliers=Supplier order's statistics
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Number of orders by month
 AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
 ListOfOrders=List of orders
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</
 GenerateBill=Generate invoice
 ClassifyShipped=Classify delivered
 DraftOrders=Draft orders
-DraftSuppliersOrders=Draft suppliers orders
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=In process orders
 RefOrder=Ref. order
 RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for supplier
-RefOrderSupplierShort=Ref. order supplier
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=Send order by mail
 ActionsOnOrder=Events on order
 NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
 DispatchSupplierOrder=Receiving supplier order %s
 FirstApprovalAlreadyDone=First approval already done
 SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=Supplier order %s received %s
-SupplierOrderSubmitedInDolibarr=Supplier order %s submited
-SupplierOrderClassifiedBilled=Supplier order %s set billed
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Other orders
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
@@ -125,11 +125,11 @@ TypeContact_commande_internal_SHIPPING=Representative following-up shipping
 TypeContact_commande_external_BILLING=Customer invoice contact
 TypeContact_commande_external_SHIPPING=Customer shipping contact
 TypeContact_commande_external_CUSTOMER=Customer contact following-up order
-TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
-TypeContact_order_supplier_external_BILLING=Supplier invoice contact
-TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact
-TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
 Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
 Error_OrderNotChecked=No orders to invoice selected
diff --git a/htdocs/langs/sq_AL/other.lang b/htdocs/langs/sq_AL/other.lang
index 5eff375f6f0..83e7bcbe997 100644
--- a/htdocs/langs/sq_AL/other.lang
+++ b/htdocs/langs/sq_AL/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=Files is too big
 PleaseBePatient=Please be patient...
 NewPassword=New password
 ResetPassword=Reset password
-RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
@@ -233,6 +233,8 @@ PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=Exports area
 AvailableFormats=Available formats
diff --git a/htdocs/langs/sq_AL/productbatch.lang b/htdocs/langs/sq_AL/productbatch.lang
index 1c2d22395ce..54270c4a23b 100644
--- a/htdocs/langs/sq_AL/productbatch.lang
+++ b/htdocs/langs/sq_AL/productbatch.lang
@@ -16,7 +16,7 @@ printEatby=Eat-by: %s
 printSellby=Sell-by: %s
 printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic increase/decrease stock mode is forced to shipping validate and manual dispatching for reception and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
 ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
diff --git a/htdocs/langs/sq_AL/products.lang b/htdocs/langs/sq_AL/products.lang
index 2244867f340..fd43347775e 100644
--- a/htdocs/langs/sq_AL/products.lang
+++ b/htdocs/langs/sq_AL/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
 MinPrice=Min. selling price
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
 ContractStatusClosed=Mbyllur
 ErrorProductAlreadyExists=A product with reference %s already exists.
@@ -155,7 +156,7 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Supplier prices
 SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
-CustomCode=Customs/Commodity/HS code
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
 Nature=Nature
 ShortLabel=Short label
diff --git a/htdocs/langs/sq_AL/projects.lang b/htdocs/langs/sq_AL/projects.lang
index 02b7d1b40cc..9eded2361e9 100644
--- a/htdocs/langs/sq_AL/projects.lang
+++ b/htdocs/langs/sq_AL/projects.lang
@@ -77,6 +77,7 @@ Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer orders associated with the project
@@ -226,4 +227,4 @@ AllowCommentOnProject=Allow user comments on projects
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/sq_AL/stocks.lang b/htdocs/langs/sq_AL/stocks.lang
index c53abe3016a..1f4791245a3 100644
--- a/htdocs/langs/sq_AL/stocks.lang
+++ b/htdocs/langs/sq_AL/stocks.lang
@@ -203,3 +203,4 @@ RegulateStock=Regulate Stock
 ListInventory=List
 StockSupportServices=Stock management support services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/sq_AL/stripe.lang b/htdocs/langs/sq_AL/stripe.lang
index 4ed4aebf311..c2969b25a3a 100644
--- a/htdocs/langs/sq_AL/stripe.lang
+++ b/htdocs/langs/sq_AL/stripe.lang
@@ -58,8 +58,8 @@ NameOnCard=Name on card
 CardNumber=Card Number
 ExpiryDate=Expiry Date
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/sq_AL/supplier_proposal.lang b/htdocs/langs/sq_AL/supplier_proposal.lang
index 02e9b798e47..a00b405e867 100644
--- a/htdocs/langs/sq_AL/supplier_proposal.lang
+++ b/htdocs/langs/sq_AL/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Supplier commercial proposals
-supplier_proposalDESC=Manage price requests to suppliers
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
 SupplierProposalNew=New price request
 CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
-SupplierProposalsDraft=Draft supplier proposals
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=Latest %s modified price requests
 RequestsOpened=Open price requests
-SupplierProposalArea=Supplier proposals area
-SupplierProposalShort=Supplier proposal
-SupplierProposals=Supplier proposals
-SupplierProposalsShort=Supplier proposals
+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=Supplier ref
+SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=Delivery date
 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>?
@@ -47,9 +47,9 @@ CommercialAsk=Price request
 DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposals=List of supplier proposal requests
-ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
-SupplierProposalsToClose=Supplier proposals to close
-SupplierProposalsToProcess=Supplier proposals to process
+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
diff --git a/htdocs/langs/sq_AL/suppliers.lang b/htdocs/langs/sq_AL/suppliers.lang
index f6a316836f7..38fce69b684 100644
--- a/htdocs/langs/sq_AL/suppliers.lang
+++ b/htdocs/langs/sq_AL/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Furnitorët
-SuppliersInvoice=Suppliers invoice
-ShowSupplierInvoice=Show Supplier Invoice
-NewSupplier=Furnitor i ri
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=History
-ListOfSuppliers=List of suppliers
-ShowSupplier=Show supplier
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=Order date
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
-SupplierPrices=Supplier prices
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
-NoRecordedSuppliers=No suppliers recorded
-SupplierPayment=Supplier payment
-SuppliersArea=Suppliers area
-RefSupplierShort=Ref. supplier
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=Availability
-ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
-ExportDataset_fournisseur_2=Supplier invoices and payments
-ExportDataset_fournisseur_3=Supplier orders and order lines
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=Approve this order
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
 ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
 ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
-AddSupplierOrder=Create supplier order
-AddSupplierInvoice=Create supplier invoice
-ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
-SentToSuppliers=Sent to suppliers
-ListOfSupplierOrders=List of supplier orders
-MenuOrdersSupplierToBill=Supplier orders to invoice
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-SupplierReputation=Supplier reputation
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Emri i blerësit
 AllProductServicePrices=All product / service prices
 AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=Supplier prices
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/sq_AL/website.lang b/htdocs/langs/sq_AL/website.lang
index 0350da13f8f..0f0673e3716 100644
--- a/htdocs/langs/sq_AL/website.lang
+++ b/htdocs/langs/sq_AL/website.lang
@@ -73,7 +73,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
diff --git a/htdocs/langs/sq_AL/workflow.lang b/htdocs/langs/sq_AL/workflow.lang
index a50bd91595b..783373ad66d 100644
--- a/htdocs/langs/sq_AL/workflow.lang
+++ b/htdocs/langs/sq_AL/workflow.lang
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source custome
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/sr_RS/accountancy.lang b/htdocs/langs/sr_RS/accountancy.lang
index 802487be9e1..d73eaab343b 100644
--- a/htdocs/langs/sr_RS/accountancy.lang
+++ b/htdocs/langs/sr_RS/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Računovodstvo
 ACCOUNTING_EXPORT_SEPARATORCSV=Separator kolona datoteke za izvoz
 ACCOUNTING_EXPORT_DATE=Format datuma datoteke za izvoz
 ACCOUNTING_EXPORT_PIECE=Izvezi broj delova
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Accounts with non zero values
 ListOfAccounts=List of accounts
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers 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
 
-AccountancyArea=Accountancy area
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
 AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
@@ -89,7 +90,7 @@ MenuProductsAccounts=Product accounts
 ProductsBinding=Products accounts
 Ventilation=Binding to accounts
 CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Supplier invoice binding
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=Izveštaj nabavke
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Ostali izveštaji
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Izveštaj troškova
 ACCOUNTING_SOCIAL_JOURNAL=Izveštaj društvenih aktivnosti
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
 ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
@@ -185,11 +187,12 @@ ListeMvts=List of movements
 ErrorDebitCredit=Debit i Kredit ne smeju imati vrednost u isto vreme
 AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
-DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=Lista računovodstvenih naloga
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Group of account
 Pcgsubtype=Subgroup of account
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
 ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=Konslutuj ovde listu linija faktura dobavljača i njihovih računovdstvenih naloga
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
 DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report 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 fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Greška, ne možete opbrisati ovaj računovodstveni nalog, jer  je u upotrebi
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -293,4 +296,9 @@ Binded=Lines bound
 ToBind=Lines to bind
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/sr_RS/admin.lang b/htdocs/langs/sr_RS/admin.lang
index 782ccb2363f..96c32d54162 100644
--- a/htdocs/langs/sr_RS/admin.lang
+++ b/htdocs/langs/sr_RS/admin.lang
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems)
 MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=Method to use to send EMails
 MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
 MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
@@ -291,7 +292,7 @@ ModuleSetup=Module setup
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projects/Collaborative work
@@ -373,7 +374,8 @@ NoSmsEngine=No SMS sender manager available. SMS sender manager are not installe
 PDF=PDF
 PDFDesc=You can set each global options related to the PDF generation
 PDFAddressForging=Rules to forge address boxes
-HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=Hide products description on generated PDF
@@ -445,7 +447,8 @@ DisplayCompanyInfo=Display company address
 DisplayCompanyManagers=Display manager names
 DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party 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.
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Set this to 1 if you want to attach main document to emai
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -479,7 +485,7 @@ Module1Desc=Companies and contact management (customers, prospects...)
 Module2Name=Commercial
 Module2Desc=Commercial management
 Module10Name=Accounting
-Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching.
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=Proposals
 Module20Desc=Commercial proposal management
 Module22Name=Mass E-mailings
@@ -546,8 +552,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
-Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Payment of employee wages
 Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
@@ -561,14 +567,14 @@ Module700Name=Donations
 Module700Desc=Donation management
 Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Mantis integration
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
 Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
 Module2200Name=Dynamic Prices
@@ -576,7 +582,7 @@ Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Planirane operacije
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API/Web services (SOAP server)
@@ -613,7 +619,7 @@ Module50100Desc=Point of sales module (POS).
 Module50200Name=Paypal
 Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Anketa ili Glasanje
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed memb
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
 Delays_MAIN_DELAY_EXPENSEREPORTS=Prag tolerancije (u danima) pre pojavljivanja upozorenja za odobrenje troškova
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=Other menu entries manage optional parameters.
 LogEvents=Security audit events
 Audit=Audit
@@ -1054,8 +1060,9 @@ LogEventDesc=You can enable here the logging for Dolibarr security events. Admin
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1188,11 +1195,11 @@ UserMailRequired=EMail required to create a new user
 HRMSetup=Podešavanja HRM modula
 ##### Company setup #####
 CompanySetup=Companies module setup
-CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier)
-AccountCodeManager=Module for accounting code generation (customer or supplier)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
 NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
 ModelModules=Documents templates
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
@@ -1203,6 +1210,9 @@ MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
 TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=Free text on commercial proposals
 WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
 ##### SupplierProposal #####
-SupplierProposalSetup=Podešavanja modula zahteva za cene doavljača
-SupplierProposalNumberingModules=Modeli numerisanja zahteva za cene dobavljača
-SupplierProposalPDFModules=Modeli dokumenata zahteva za cene dobavljača
-FreeLegalTextOnSupplierProposal=Slobodan tekst za zahteve za cene dobavljača
-WatermarkOnDraftSupplierProposal=Vodeni žig na draft verziji zahteva za cene dobavljača (bez oznake ako je prazno)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Pitaj bankovni račun destinacije zahteva za cene
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Pitaj za izvorni magacin za narudžbinu
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=Order management setup
 OrdersNumberingModules=Orders numbering models
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe
 OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
 OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
 ##### Stock #####
-StockSetup=Warehouse module setup
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
 ##### Menu #####
 MenuDeleted=Menu deleted
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
 MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
 SuppliersSetup=Supplier module setup
-SuppliersCommandModel=Complete template of supplier order (logo...)
-SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","
 SalariesSetup=Setup of module salaries
 SortOrder=Sort order
 Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Install of external module from applic
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Boja kojom će linija biti označena kada se mišem pređe preko nje (ostavite prazno kako linija ne bi bila označena)
-TextTitleColor=Color of page title
+TextTitleColor=Text color of Page title
 LinkColor=Boja linkova
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=Background color for Top menu
 TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Pozadinska boja za naslovnu liniju tabela
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=Primer: +2 (uneti samo u slučaju problema)
 ExpectedChecksum=Očekivani checksum
 CurrentChecksum=Trenutni checksum
 ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-MailToMember=To send email from member page
-MailToUser=To send email from user page
-MailToProject= To send email from project page
+MailToSendProposal=Ponude klijenata
+MailToSendOrder=Narudžbine klijenata
+MailToSendInvoice=Fakture klijenata
+MailToSendShipment=Isporuke
+MailToSendIntervention=Intervencije
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Ugovori
+MailToThirdparty=Subjekti
+MailToMember=Članovi
+MailToUser=Korisnici
+MailToProject=Projects page
 ByDefaultInList=Prikaži po defaultu na prikazu liste
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Primer poruke koju možete koristiti da biste najavili novu verziju (možete je koristiti na Vašim sajtovima)
@@ -1780,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/sr_RS/bills.lang b/htdocs/langs/sr_RS/bills.lang
index b2dea98d368..5d5f1357901 100644
--- a/htdocs/langs/sr_RS/bills.lang
+++ b/htdocs/langs/sr_RS/bills.lang
@@ -109,7 +109,7 @@ CancelBill=Otkaži račun
 SendRemindByMail=Pošalji podsetnik Emailom
 DoPayment=Unesite uplatu
 DoPaymentBack=Enter refund
-ConvertToReduc=Konvertuj u budući popust
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Unesi prijem uplate kupca
@@ -120,7 +120,7 @@ BillStatus=Status računa
 StatusOfGeneratedInvoices=Status generisanih računa
 BillStatusDraft=Nacrt (treba da se potvrdi)
 BillStatusPaid=Plaćeno
-BillStatusPaidBackOrConverted=Knjižno odobrenje refundirano ili konvertovano u popust
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Napušteno
 BillStatusValidated=Potvrdjeno (potrebno izvršiti plaćanje)
@@ -296,10 +296,10 @@ DiscountType=Discount type
 NoteReason=Note/Reason
 ReasonDiscount=Reason
 DiscountOfferedBy=Granted by
-DiscountStillRemaining=Dostupni popusti
-DiscountAlreadyCounted=Popusti su već iskorišćeni
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+SupplierDiscounts=Vendors discounts
 BillAddress=Bill address
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Svakih %s dana
 FrequencyPer_m=Svakih %s meseci
 FrequencyPer_y=Svakih %s godina
@@ -505,9 +511,14 @@ SituationAmount=Situation invoice amount(net)
 SituationDeduction=Situation subtraction
 ModifyAllLines=Modify all lines
 CreateNextSituationInvoice=Create next situation
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=N
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
 NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
@@ -532,3 +543,4 @@ AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/sr_RS/categories.lang b/htdocs/langs/sr_RS/categories.lang
index 611b53e0c3d..dc4a1dda898 100644
--- a/htdocs/langs/sr_RS/categories.lang
+++ b/htdocs/langs/sr_RS/categories.lang
@@ -16,7 +16,7 @@ MembersCategoriesArea=Oblast naziva/kategorije članova
 ContactsCategoriesArea=Oblast naziva/kategorija kontakata
 AccountsCategoriesArea=Accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
-SubCats=Podkategorije
+SubCats=Sub-categories
 CatList=Lista naziva/kategorija
 NewCategory=Nov naziv/kategorija
 ModifCat=Izmeni naziv/kategoriju
@@ -85,3 +85,4 @@ CategorieRecursivHelp=Ako aktiviran, proizvod će takođe biti povezan sa nadre
 AddProductServiceIntoCategory=Dodaj sledeći proizvod/uslugu
 ShowCategory=Prikaži naziv/kategoriju
 ByDefaultInList=Podrazumevano u listi
+ChooseCategory=Choose category
diff --git a/htdocs/langs/sr_RS/commercial.lang b/htdocs/langs/sr_RS/commercial.lang
index a9826e8923f..f50463d51e1 100644
--- a/htdocs/langs/sr_RS/commercial.lang
+++ b/htdocs/langs/sr_RS/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=Zatvori
 ActionAC_EMAILING=Pošalji grupni mejl
 ActionAC_COM=Pošalji narudžbinu klijenta mejlom
 ActionAC_SHIP=Pošalji isporuku mejlom
-ActionAC_SUP_ORD=Pošalji narudžbinu dobavljača mejlom
-ActionAC_SUP_INV=Pošalji fakturu dobavljača mejlom
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=Drugo
 ActionAC_OTH_AUTO=Automatski uneti događaji
 ActionAC_MANUAL=Ručno uneti događaji
diff --git a/htdocs/langs/sr_RS/companies.lang b/htdocs/langs/sr_RS/companies.lang
index fb91aa4c95a..dc043bc5ae4 100644
--- a/htdocs/langs/sr_RS/companies.lang
+++ b/htdocs/langs/sr_RS/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Are you sure you want to delete this contact and all inheri
 MenuNewThirdParty=Novi subjekt
 MenuNewCustomer=Novi klijent
 MenuNewProspect=Novi kandidat
-MenuNewSupplier=Nov dobavljač
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=Novo fizičko lice
-NewCompany=Nova kompanija (kandidat, klijent, dobavljač)
-NewThirdParty=Novi subjekt (kandidat, klijent, dobavljač)
-CreateDolibarrThirdPartySupplier=Kreiraj subjekt (dobavljača)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=Kreiraj subjekt
 CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Oblast istraživanja
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=Kandidati
 ThirdPartyCustomers=Klijenti
 ThirdPartyCustomersStats=Klijenti
 ThirdPartyCustomersWithIdProf12=Klijenti sa %s ili %s
-ThirdPartySuppliers=Dobavljači
+ThirdPartySuppliers=Vendors
 ThirdPartyType=Tip subjekta
 Individual=Fizičko lice
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
@@ -77,11 +77,11 @@ Web=Web
 Poste= Pozicija
 DefaultLang=Jezik po default-u
 VATIsUsed=Sales tax is used
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
-ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Ponude
 OverAllOrders=Narudžbine
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=RE Type
 TypeLocaltax2ES=IRPF Type
 WrongCustomerCode=Kod klijenta nije validan
-WrongSupplierCode=Kod dobavljača nije validan
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Model koda klijenta
-SupplierCodeModel=Model koda dobavljača
+SupplierCodeModel=Vendor code model
 Gencod=Bar kod
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
@@ -267,7 +267,7 @@ Prospect=Kandidat
 CustomerCard=Kartica klijenta
 Customer=Klijent
 CustomerRelativeDiscount=Relativni popust klijenta
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=Relativni popust
 CustomerAbsoluteDiscountShort=Apsolutni popust
 CompanyHasRelativeDiscount=Klijent ima default popust od <b>%s%%</b>
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this suppl
 CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
 CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
 CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=Nema
 Supplier=Dobavljač
 AddContact=kreiraj kontakt
@@ -304,13 +304,13 @@ DeleteACompany=Obriši kompaniju
 PersonalInformations=Lični podaci
 AccountancyCode=Računovodstveni nalog
 CustomerCode=Kod klijenta
-SupplierCode=Kod dobavljača
+SupplierCode=Vendor code
 CustomerCodeShort=Kod klijenta
-SupplierCodeShort=Kod dobavljača
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=Kod klijenta, jedinstven za sve klijente
-SupplierCodeDesc=Kod dobavljača, jedinstven za sve dobavljače
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=Obavezno ako je subjekt klijent ili kandidat
-RequiredIfSupplier=Obavezno ako je subjekt dobavljač
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=Ispravnost je kontrolisana u modulu
 ThisIsModuleRules=Ovo su pravila za ovaj modul
 ProspectToContact=Kandidat za kontaktiranje
@@ -338,7 +338,7 @@ MyContacts=Moji kontakti
 Capital=Kapital
 CapitalOf=Kapital od %s
 EditCompany=Izmeni kompaniju
-ThisUserIsNot=Ovaj korisnik nije kandidat, klijent ni dobavljač
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=Proveri
 VATIntraCheckDesc=The link <b>%s</b> allows to ask the european VAT checker service. An external internet access from server is required for this service to work.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -396,7 +396,7 @@ ImportDataset_company_4=Third parties/Sales representatives (Assign sales repres
 PriceLevel=Nivo cene
 DeliveryAddress=Adresa dostave
 AddAddress=Add address
-SupplierCategory=Kategorija dobavljača
+SupplierCategory=Vendor category
 JuridicalStatus200=Independent
 DeleteFile=Obriši fajl
 ConfirmDeleteFile=Da li ste sigurni da želite da obrišete fajl?
@@ -406,7 +406,7 @@ FiscalYearInformation=Informacije o fiskalnoj godini
 FiscalMonthStart=Prvi mesec fiskalne godine
 YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
 YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
-ListSuppliersShort=Lista dobavljača
+ListSuppliersShort=List of vendors
 ListProspectsShort=Lista kandidata
 ListCustomersShort=Lista klijenata
 ThirdPartiesArea=Subjekti i obast kontakta
@@ -420,7 +420,7 @@ CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Ime menadžera (CEO, direktor, predsednik...)
 MergeOriginThirdparty=Duplirani subjekt (subjekt kojeg želite obrisati)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/sr_RS/compta.lang b/htdocs/langs/sr_RS/compta.lang
index 3aeb8cf44d5..613a41a47ec 100644
--- a/htdocs/langs/sr_RS/compta.lang
+++ b/htdocs/langs/sr_RS/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=Plaćeno neto
 VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
-VATSummary=Tax Balance
+VATSummary=Tax monthly
+VATBalance=Tax Balance
 VATPaid=Tax paid
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=Oblast računovodstva/trezora
 NewPayment=Nova uplata
 Payments=Uplate
 PaymentCustomerInvoice=Uplata po računu klijenta
-PaymentSupplierInvoice=Uplata po računu dobavljača
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Uplata poreza/doprinosa
 PaymentVat=PDV uplata
 ListPayment=Lista uplata
 ListOfCustomerPayments=Lista uplata klijenata
-ListOfSupplierPayments=Lista uplata dobavljača
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Početak perioda
 DateEndPeriod=Kraj perioda
 newLT1Payment=Nova uplata takse 2
@@ -110,7 +111,7 @@ ShowVatPayment=Prikaži PDV uplatu
 TotalToPay=Ukupno za uplatu
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
 CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Rač. kod klijenta
 SupplierAccountancyCodeShort=Rač. kod dobavljača
 AccountNumber=Broj naloga
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=Izveštaj po RE subjektima
 LT2ReportByCustomersES=Izveštaj po subjektu IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Izveštaj po prihodovanom i isplaćenom PDV-u po subjektu 
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Chart of accounts models
 Pcg_type=Pcg tip
 Pcg_subtype=Pcg pod-tip
 InvoiceLinesToDispatch=Linije fakture za otpremu
-ByProductsAndServices=Po proizvodima i uslugama
+ByProductsAndServices=By product and service
 RefExt=Eksterna ref.
 ToCreateAPredefinedInvoice=Da kreirate šablon fakture, kreirajte običnu fakturu pa onda, bez potvrđivanja, kliknite na dugme "%s".
 LinkedOrder=Link ka narudžbini
@@ -215,7 +218,8 @@ Mode1=Metoda 1
 Mode2=Metoda 2
 CalculationRuleDesc=Da biste izračunali ukupan PDV, postoje 2 metode:<br>Metoda 1 je zaokruživanje PDV-a na svakoj liniji i zatim sumiranje svih PDV vrednosti.<br>Metoda 2 je sumiranje svih PDV vrednosti i zatim zaokruživanje rezultata.<br>Krajnji rezultat se može razlikovati za nekoliko centi. Default metoda je <b>%s</b>.
 CalculationRuleDescSupplier=Izaberite odgovarajuću metodu kako biste koristili ista pravila računanja koja koristi i dobavljač.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Izveštaj obrta po proizvodu nije bitan kada se koristi <b>gotovinsko računovodstvo</b>. Ovaj izveštaj je samo dostupan kada se koristi <b>obavezujuće računovodstvo</b> (pogledajte podešavanja modula računovodstvo).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Naćin obračuna
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=Dupliraj porez/doprinos
 ConfirmCloneTax=Potvrdi dupliranje uplate poreza/doprinosa
@@ -242,3 +246,10 @@ FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/sr_RS/dict.lang b/htdocs/langs/sr_RS/dict.lang
index ebc0418f60c..b38d2727d9c 100644
--- a/htdocs/langs/sr_RS/dict.lang
+++ b/htdocs/langs/sr_RS/dict.lang
@@ -5,7 +5,8 @@ CountryIT=Italija
 CountryES=Španija
 CountryDE=Nemačka
 CountryCH=Švajcarska
-CountryGB=Velika Britanija
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=United Kingdom
 CountryUK=United Kingdom
 CountryIE=Irska
 CountryCN=Kina
diff --git a/htdocs/langs/sr_RS/ecm.lang b/htdocs/langs/sr_RS/ecm.lang
index 98682bf430c..86091a7c03d 100644
--- a/htdocs/langs/sr_RS/ecm.lang
+++ b/htdocs/langs/sr_RS/ecm.lang
@@ -39,9 +39,10 @@ ShowECMSection=Pokaži folder
 DeleteSection=Obriši folder
 ConfirmDeleteSection=Da li potvrđjujete da želite da obrišete direktorijum <b>%s</b>?
 ECMDirectoryForFiles=Relativni folder za fajlove
-CannotRemoveDirectoryContainsFiles=Brisanje je nemoguće jer folder sadrži fajlove
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=File manager
-ECMSelectASection=Izaberite folder u strukturi levo...
+ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
diff --git a/htdocs/langs/sr_RS/errors.lang b/htdocs/langs/sr_RS/errors.lang
index dba4709a064..6d5b40cf554 100644
--- a/htdocs/langs/sr_RS/errors.lang
+++ b/htdocs/langs/sr_RS/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Barcode je obavezan
 ErrorCustomerCodeAlreadyUsed=Kod klijenta je već u upotrebi
 ErrorBarCodeAlreadyUsed=Barcode je već u upotrebi
 ErrorPrefixRequired=Obavezan je prefix
-ErrorBadSupplierCodeSyntax=Pogrešna sintaksa dobavljačkog koda
-ErrorSupplierCodeRequired=Dobavljački kod je obavezan
-ErrorSupplierCodeAlreadyUsed=Dobavljački kod je već u upotrebi
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Pogrešni parametri
 ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
 ErrorBadImageFormat=Slika nije u podržanom formatu (Vaš PHP ne podržava konvertovanje slika u ovom formatu)
@@ -87,7 +87,7 @@ ErrorsOnXLines=Greške na <b>%s</b> izvornih linija.
 ErrorFileIsInfectedWithAVirus=Antivirus nije mogao da potvrdi fajl (moguće je da postoji virus)
 ErrorSpecialCharNotAllowedForField=Specijalni karakteri nisu dozvoljeni u polju "%s"
 ErrorNumRefModel=U bazi postoji referenca (%s) koja nije kompatibilna sa ovim pravilom. Uklonite taj red ili preimenujte referencu kako biste aktivirali ovaj modul.
-ErrorQtyTooLowForThisSupplier=Količina previše mala za ovog dobavljača ili nema definisane cen za ovaj proizvod kod ovog dobavljača
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Greška za masku
 ErrorBadMaskFailedToLocatePosOfSequence=Greška, maska bez broja sekvence
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Pogrešna definicija Menu Array
 ErrorSavingChanges=Došlo je do greške prilikom čuvanja promena.
 ErrorWarehouseRequiredIntoShipmentLine=Magacin je neophodan na liniji do isporuke
 ErrorFileMustHaveFormat=Mora imati format %s
-ErrorSupplierCountryIsNotDefined=Zemlja dobavljača mora biti definisana.
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
diff --git a/htdocs/langs/sr_RS/install.lang b/htdocs/langs/sr_RS/install.lang
index 564fcb27e57..fa9eb6ce246 100644
--- a/htdocs/langs/sr_RS/install.lang
+++ b/htdocs/langs/sr_RS/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=Konfiguracioni fajl <b>%s</b> ne posto
 ConfFileCouldBeCreated=Konfiguracioni fajl <b>%s</b> može biti kreiran.
 ConfFileIsNotWritable=Nemoguće izmeniti konfiguracioni fajl <b>%s</b>. Proverite prava. Za prvu instalaciju, Vaš web server mora imati mogućnost da izmeni ovaj fajl prilikom konfiguracije ("chmod 666" na primer na *NIX sistemu).
 ConfFileIsWritable=Konfiguracioni fajl <b>%s</b> može biti izmenjen.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Učitaj sve informacije iz konfiguracionog fajla.
 PHPSupportSessions=PHP podržava sesije.
 PHPSupportPOSTGETOk=PHP podržava POST i GET promenljive
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
 WarningRemoveInstallDir=Upozorenje, iz bezbednosnih razloga, kada završite instalaciju ili nadogradnju, kako bi ste izbegli ponovno korišćenje instalacionih alata, dodajte fajl <b>install.lock</b> u Dolibarr document direktorijum, radi sprečavanja zloupotrebe.
 FunctionNotAvailableInThisPHP=Nije dostupno na ovoj verziji PHP-a
 ChoosedMigrateScript=Izaberite skriptu za migraciju
-DataMigration=Migracija podataka
-DatabaseMigration=Migracija strukture baze
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Procesuiranje skripte
 ChooseYourSetupMode=Izaberite mod setup-a i kliknite na "Start"...
 FreshInstall=Nova instalacija
@@ -146,7 +147,7 @@ NothingToDo=Nothing to do
 # upgrade
 MigrationFixData=Fix za denormalizovane podatke
 MigrationOrder=Migracija podataka narudžbina klijenata
-MigrationSupplierOrder=Migracija podataka narudžbina dobavljača
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Migracija podataka komercijalnih ponuda
 MigrationInvoice=Migracija podataka računa klijenata
 MigrationContract=Migracija podataka ugovora
@@ -196,6 +197,8 @@ MigrationEvents=Migracija događaja i dodavanje vlasnika događaja u assignment
 MigrationEventsContact=Migration of events to add event contact into assignement table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
 MigrationReloadModule=Ponovo učitavanje modula %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 ShowNotAvailableOptions=Prikaži nedostupne opcije
diff --git a/htdocs/langs/sr_RS/ldap.lang b/htdocs/langs/sr_RS/ldap.lang
index 93326ae182a..4ad591b5209 100644
--- a/htdocs/langs/sr_RS/ldap.lang
+++ b/htdocs/langs/sr_RS/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Šifra domena
 YouMustChangePassNextLogon=Šifra za korisnika <b>%s</b> na domenu <b>%s</b> mora biti promenjena.
 UserMustChangePassNextLogon=Korisnik mora promeniti šifru na domenu %s
 LDAPInformationsForThisContact=Informacije iz LDAP baze za ovaj kontakt
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Member type synchronized
 ContactSynchronized=Kontakt sinhronizovan
 ForceSynchronize=Forsiraj sinhronizaciju Dolibarr > LDAP
 ErrorFailedToReadLDAP=Greška prilikom čitanja LDAP baze. Proverite podešavanja LDAP modula i dostupnost baze.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/sr_RS/loan.lang b/htdocs/langs/sr_RS/loan.lang
index fc09b956443..c58c93ddd76 100644
--- a/htdocs/langs/sr_RS/loan.lang
+++ b/htdocs/langs/sr_RS/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=Kapital
 Insurance=Osiguranje
 Interest=Kamata
 Nbterms=Broj uslova
+Term=Term
 LoanAccountancyCapitalCode=Accounting account capital
 LoanAccountancyInsuranceCode=Accounting account insurance
 LoanAccountancyInterestCode=Accounting account interest
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=Potvrdi brisanje ovog kredita
 LoanDeleted=Kredit uspešno obrisan
 ConfirmPayLoan=Potvrdi klasiranje ovog kredita kao isplaćen
 LoanPaid=Kredit isplaćen
-# Calc
-LoanCalc=Kreditni kalkulator
-PurchaseFinanceInfo=Informacije o kupovini i finansiranju
-SalePriceOfAsset=Prodajna cena proizvoda
-PercentageDown=Smanjenje u procentima
-LengthOfMortgage=Duration of loan
-AnnualInterestRate=Godišnja kamatna rata
-ExplainCalculations=Objasni kalkulacije
-ShowMeCalculationsAndAmortization=Prikaži kalkulacije i amortizaciju
-MortgagePaymentInformation=Informacije isplate kredita
-DownPayment=Ulog
-DownPaymentDesc=<b>Ulog</b> = Cena nekretnine pomnožena sa procentima smanjenja i podeljena sa 100 (za 5% ulog postaje 5/100 ili 0.05)
-InterestRateDesc=<b>Kamatna stopa</b> = Godišnja kamata podeljena sa 100
-MonthlyFactorDesc=<b>Mesečni faktor</b> = rezultat sledeće formule
-MonthlyInterestRateDesc=<b>Mesečna kamatna stopa</b> = Godišnja kamatna stopa podeljena sa 12 (za 12 meseci u godini)
-MonthTermDesc=<b>Mesčno trajanje</b> kredita u mesecima = Broj godina trajanja kredita puta 12
-MonthlyPaymentDesc=Mesečna isplata je sračunata koristeći sledeću formulu
-AmortizationPaymentDesc=<a href="#amortization">Amortizacija</a> izražava koliko od Vaše mesečne isplate ide na kamatu a koliko na glavnicu kredita.
-AmountFinanced=Finansirani iznos
-AmortizationMonthlyPaymentOverYears=Amortizacija za Mesečnu Isplatu: <b>%s</b> kroz %s godina
-Totalsforyear=Ukupno za godinu
-MonthlyPayment=Mesečna isplata
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
-GoToInterest=%s odlazi na KAMATU
-GoToPrincipal=%s odlazi na GLAVNICU
-YouWillSpend=You will spend %s in year %s
 ListLoanAssociatedProject=List of loan associated with the project
 AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Kamata
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=Konfiguracija modula Krediti
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-FinancialCommitment=Financial commitment
 CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/langs/sr_RS/mails.lang b/htdocs/langs/sr_RS/mails.lang
index aaaac6e20b0..f5ad0717a43 100644
--- a/htdocs/langs/sr_RS/mails.lang
+++ b/htdocs/langs/sr_RS/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Pošiljalac
 MailErrorsTo=Greške za
 MailReply=Odgovori
 MailTo=Primalac(oci)
+MailToUsers=To user(s)
 MailCC=CC
+MailToCCUsers=Copy to users(s)
 MailCCC=BCC
 MailTopic=Tema maila
 MailText=Poruka
@@ -164,4 +166,4 @@ InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Informacija
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/sr_RS/main.lang b/htdocs/langs/sr_RS/main.lang
index 096cf0c9e2e..3fc6b3310fd 100644
--- a/htdocs/langs/sr_RS/main.lang
+++ b/htdocs/langs/sr_RS/main.lang
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is se
 Administrator=Administrator
 Undefined=Nedefinisano
 PasswordForgotten=Password forgotten?
+NoAccount=No account?
 SeeAbove=Pogledajte iznad
 HomeArea=Oblast Home
 LastConnexion=Latest connection
@@ -231,7 +232,7 @@ Limit=Limit
 Limits=Limiti
 Logout=Logout
 NoLogoutProcessWithAuthMode=Nema funkcionalnosti za diskonekciju sa <b>%s</b> modom autentifikacije
-Connection=Konekcija
+Connection=Login
 Setup=Podešavanja
 Alert=Alert
 MenuWarnings=Alerts
@@ -402,6 +403,7 @@ DefaultTaxRate=Default tax rate
 Average=Prosek
 Sum=Suma
 Delta=Razlika
+RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Opcija
@@ -414,7 +416,7 @@ Favorite=Preferirani
 ShortInfo=Info.
 Ref=Ref.
 ExternalRef=Eksterna ref.
-RefSupplier=Ref. dobavljača
+RefSupplier=Ref. vendor
 RefPayment=Ref. plaćanja
 CommercialProposalsShort=Komercijalne svrhe
 Comment=Komentar
@@ -493,7 +495,7 @@ Received=Primljeno
 Paid=Plaćeno
 Topic=Objekat
 ByCompanies=Po subjektima
-ByUsers=Po korisnicima
+ByUsers=By user
 Links=Linkovi
 Link=Link
 Rejects=Odbijeni
@@ -619,9 +621,9 @@ BuildDoc=Generiši Doc
 Entity=Okruženje
 Entities=Objekti
 CustomerPreview=Preview klijenta
-SupplierPreview=Preview dobavljača
+SupplierPreview=Vendor preview
 ShowCustomerPreview=Prikaži preview klijenta
-ShowSupplierPreview=Prikaži preview dobavljača
+ShowSupplierPreview=Show vendor preview
 RefCustomer=Ref. klijenta
 Currency=Valuta
 InfoAdmin=Informacija za administratore
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=Proizvodi ili usluge
 SearchIntoProjects=Projekti
 SearchIntoTasks=Zadaci
 SearchIntoCustomerInvoices=Fakture klijenata
-SearchIntoSupplierInvoices=Fakture dobavljača
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Narudžbine klijenata
-SearchIntoSupplierOrders=Narudžbine dobavljača
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=Ponude klijenata
-SearchIntoSupplierProposals=Ponude dobavljača
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Intervencije
 SearchIntoContracts=Ugovori
 SearchIntoCustomerShipments=Customer shipments
@@ -941,3 +943,5 @@ Remote=Remote
 LocalAndRemote=Local and Remote
 KeyboardShortcut=Keyboard shortcut
 AssignedTo=Dodeljeno
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/sr_RS/margins.lang b/htdocs/langs/sr_RS/margins.lang
index 3efba630555..b94a04bd436 100644
--- a/htdocs/langs/sr_RS/margins.lang
+++ b/htdocs/langs/sr_RS/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=Kao usluga
 UseDiscountOnTotal=Pod-zbir
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Definiše da li je globalni popust tretiran kao proizvod, usluga ili se primenjuje samo na pod-zbiru za uračunanje marže.
 MARGIN_TYPE=Default nabavna cena za računanje marže
-MargeType1=Marža na najpovoljniju cenu dobavljača
+MargeType1=Margin on Best vendor price
 MargeType2=Marža na prosečnu cenu (PC)
 MargeType3=Marža na cenu koštanja
-MarginTypeDesc=* Marža na najbolju kupovnu cenu = Prodajna cena - Najbolja cena dobavljača definisana na kartici proizvoda<br>* Marža na izračunatu prosečnu cenu (WAP) = Prodajna cena - Proivod izračun na osnovu prosečne cene  (WAP)  ili najbolja cena dobavljača ako WAP nije još definisan<br>* Marža na cenu koštanja = Prodajna cena definisana na kratici proizvoda ili WAP ako cena koštanja nije definisana, ili najbolja cena dobavjlača ako WAP nije još definisan
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Cena koštanja
 UnitCharges=Unitarni troškovi
 Charges=Troškovi
diff --git a/htdocs/langs/sr_RS/members.lang b/htdocs/langs/sr_RS/members.lang
index 98832aeeeb7..653e83ffbe7 100644
--- a/htdocs/langs/sr_RS/members.lang
+++ b/htdocs/langs/sr_RS/members.lang
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
diff --git a/htdocs/langs/sr_RS/opensurvey.lang b/htdocs/langs/sr_RS/opensurvey.lang
index 7817f060dd2..a4ec31269a4 100644
--- a/htdocs/langs/sr_RS/opensurvey.lang
+++ b/htdocs/langs/sr_RS/opensurvey.lang
@@ -58,3 +58,4 @@ MoreChoices=Unesite više izbora za glasače
 SurveyExpiredInfo=The poll has been closed or voting delay has expired.
 EmailSomeoneVoted=%s je ispunio liniju.\nMožete naći svoj upitnik na linku: \n%s
 ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/sr_RS/orders.lang b/htdocs/langs/sr_RS/orders.lang
index 196b814ceaf..7bb4eb91d61 100644
--- a/htdocs/langs/sr_RS/orders.lang
+++ b/htdocs/langs/sr_RS/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Oblast narudžbina klijenta
-SuppliersOrdersArea=Oblast narudžbina dobavljača
+SuppliersOrdersArea=Purchase orders area
 OrderCard=Kartica narudžbine
 OrderId=Id narudžbine
 Order=Narudžbina
@@ -13,18 +13,18 @@ OrderToProcess=Narudžbina za obradu
 NewOrder=Nova narudžbina
 ToOrder=Kreiraj narudžbinu
 MakeOrder=Kreiraj narudžbinu
-SupplierOrder=Narudžbina dobavljača
-SuppliersOrders=Narudžbine dobavljača
-SuppliersOrdersRunning=Aktivne narudžbine dobavljača
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=Narudžbina klijenta
-CustomersOrders=Narudžbine klijenta
+CustomersOrders=Customer Orders
 CustomersOrdersRunning=Aktivne narudžbine klijenta
 CustomersOrdersAndOrdersLines=Narudžbina klijenta i linije narudžbine
 OrdersDeliveredToBill=Customer orders delivered to bill
 OrdersToBill=Isporučene narudžbine klijenta
 OrdersInProcess=Narudžbine klijenta u toku
 OrdersToProcess=Narudžbine klijenta na čekanju
-SuppliersOrdersToProcess=Narudžbine dobavljača na čekanju
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=Otkazano
 StatusOrderDraftShort=Nacrt
 StatusOrderValidatedShort=Odobreno
@@ -75,15 +75,15 @@ ShowOrder=Pokaži narudžbinu
 OrdersOpened=Narudžbine za obradu
 NoDraftOrders=Nema drafg narudžbina
 NoOrder=Nema narudžbine
-NoSupplierOrder=Nema narudžbine dobavjača
+NoSupplierOrder=No purchase order
 LastOrders=Latest %s customer orders
 LastCustomerOrders=Latest %s customer orders
-LastSupplierOrders=Latest %s supplier orders
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=Latest %s modified orders
 AllOrders=Sve narudžbine
 NbOfOrders=Broj narudžbina
 OrdersStatistics=Statistike narudžbina
-OrdersStatisticsSuppliers=Statistike narudžbina dobavljača
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Broj narudžbina po mesecu
 AmountOfOrdersByMonthHT=Suma narudžbina po mesecu (neto)
 ListOfOrders=Lista narudžbina
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</
 GenerateBill=Generiši račun
 ClassifyShipped=Označi kao ispostavljeno
 DraftOrders=Nacrt narudžbine
-DraftSuppliersOrders=Drat narudžbine dobavljača
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=Narudžbine u toku
 RefOrder=Ref. narudžbine
 RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for supplier
-RefOrderSupplierShort=Ref. order supplier
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=Pošalji narudžbinu mailom
 ActionsOnOrder=Događaji na narudžbini
 NoArticleOfTypeProduct=Nema artikla tipa "proizvod" tako da nema isporučivog artikla za ovu narudžbinu
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
 DispatchSupplierOrder=Primanje narudžbine dobavljača %s
 FirstApprovalAlreadyDone=Prvo odobrenje je već završeno
 SecondApprovalAlreadyDone=Drugo odobrenje je već završeno
-SupplierOrderReceivedInDolibarr=Supplier order %s received %s
-SupplierOrderSubmitedInDolibarr=Supplier order %s submited
-SupplierOrderClassifiedBilled=Supplier order %s set billed
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Druge narudžbine
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Osoba koja prati narudžbinu klijenta
@@ -125,11 +125,11 @@ TypeContact_commande_internal_SHIPPING=Osoba koja prati isporuku
 TypeContact_commande_external_BILLING=Kontakt klijenta sa računa
 TypeContact_commande_external_SHIPPING=Kontakt klijenta za isporuku
 TypeContact_commande_external_CUSTOMER=Kontakt klijenta za pratnju narudžbine
-TypeContact_order_supplier_internal_SALESREPFOLL=Osoba koja prati narudžbinu dobavljača
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Osoba koja prati isporuku
-TypeContact_order_supplier_external_BILLING=Kontakt dobavljača sa računa
-TypeContact_order_supplier_external_SHIPPING=Kontakt dobavljača za isporuku
-TypeContact_order_supplier_external_CUSTOMER=Kontakt dobavljača za praćenje narudžbine
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
 Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
 Error_OrderNotChecked=Nema narudžbina za odabrani račun
diff --git a/htdocs/langs/sr_RS/other.lang b/htdocs/langs/sr_RS/other.lang
index ef18367bf22..c8cb3e1bd2f 100644
--- a/htdocs/langs/sr_RS/other.lang
+++ b/htdocs/langs/sr_RS/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=Fajlovi su preveilki
 PleaseBePatient=Molimo sačekajte...
 NewPassword=New password
 ResetPassword=Reset password
-RequestToResetPasswordReceived=Zahtev za promenu Vaše Dolibarr lozinke je primljen
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=Ovo su nove informacije za login
 NewKeyWillBe=Vaša nova informacija za login za softver će biti
 ClickHereToGoTo=Kliknite ovde da otvorite %s
@@ -233,6 +233,8 @@ PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=Oblast exporta
 AvailableFormats=Dostupni formati
diff --git a/htdocs/langs/sr_RS/productbatch.lang b/htdocs/langs/sr_RS/productbatch.lang
index a2934871b4f..ab098fa1139 100644
--- a/htdocs/langs/sr_RS/productbatch.lang
+++ b/htdocs/langs/sr_RS/productbatch.lang
@@ -16,7 +16,7 @@ printEatby=Rok trajanja: %s
 printSellby=Rok prodaje: %s
 printQty=Kol: %d
 AddDispatchBatchLine=Dodaj liniju za "Shelf Life" raspodelu 
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic increase/decrease stock mode is forced to shipping validate and manual dispatching for reception and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=Ovaj proizvod ne koristi serijski broj
 ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
diff --git a/htdocs/langs/sr_RS/products.lang b/htdocs/langs/sr_RS/products.lang
index febbbfe8489..cf02948dfe4 100644
--- a/htdocs/langs/sr_RS/products.lang
+++ b/htdocs/langs/sr_RS/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=Nova cena
 MinPrice=Min. prodajna cena
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=Prodajna cena ne može biti niža od dozvoljenog minimuma za ovaj proizvod (%s neto). Ova poruka se takođe može pojaviti ukoliko ste uneli preveliki popust.
 ContractStatusClosed=Zatvoren
 ErrorProductAlreadyExists=Proizvod sa referencom %s već postoji
@@ -155,7 +156,7 @@ BuyingPrices=Kupovne cene
 CustomerPrices=Cene klijenta
 SuppliersPrices=Cene dobavljača
 SuppliersPricesOfProductsOrServices=Cene dobavljača (proizvoda ili usluga)
-CustomCode=Customs/Commodity/HS code
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=Zemlja porekla
 Nature=Priroda
 ShortLabel=Kratak naziv
diff --git a/htdocs/langs/sr_RS/projects.lang b/htdocs/langs/sr_RS/projects.lang
index cfe09906b11..5dfbd336f27 100644
--- a/htdocs/langs/sr_RS/projects.lang
+++ b/htdocs/langs/sr_RS/projects.lang
@@ -77,6 +77,7 @@ Time=Vreme
 ListOfTasks=Lista zadataka
 GoToListOfTimeConsumed=Idi na listu utrošenog vremena
 GoToListOfTasks=Idi na listu zadataka
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=Lista komercijalnih ponuda vezanih za projekat
 ListOrdersAssociatedProject=List of customer orders associated with the project
@@ -226,4 +227,4 @@ AllowCommentOnProject=Allow user comments on projects
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/sr_RS/stocks.lang b/htdocs/langs/sr_RS/stocks.lang
index 8a079b53790..d7060cedf04 100644
--- a/htdocs/langs/sr_RS/stocks.lang
+++ b/htdocs/langs/sr_RS/stocks.lang
@@ -203,3 +203,4 @@ RegulateStock=Regulate Stock
 ListInventory=Lista
 StockSupportServices=Stock management support services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/sr_RS/suppliers.lang b/htdocs/langs/sr_RS/suppliers.lang
index aa9259ff594..5d6ee042aba 100644
--- a/htdocs/langs/sr_RS/suppliers.lang
+++ b/htdocs/langs/sr_RS/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Dobavljači
-SuppliersInvoice=Račun dobavljača
-ShowSupplierInvoice=Prikaži fakturu dobavljača
-NewSupplier=Novi dobavljač
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=Istorija
-ListOfSuppliers=Lista dobavljača
-ShowSupplier=Prikaži dobavljača
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=Datum porudžbine
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Neki od pod-proizvoda nemaju definisanu cenu
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
-SupplierPrices=Cene dobavljača
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Ovaj dobavljač je već vezan za referencu: %s
-NoRecordedSuppliers=Nema sačuvanih dobavljača
-SupplierPayment=Uplata dobavljača
-SuppliersArea=Oblast dobavljača
-RefSupplierShort=Ref. dobavljača
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=Dostupnost
-ExportDataset_fournisseur_1=Lista računa dobavljača
-ExportDataset_fournisseur_2=Računi i uplate dobavljača
-ExportDataset_fournisseur_3=Narudžbine dobavljača
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=Odobri ovu narudžbinu
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Odbij narudžbinu
 ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
 ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
-AddSupplierOrder=Kreiraj narudžbinu dobavljača
-AddSupplierInvoice=Kreiraj račun dobavljača
-ListOfSupplierProductForSupplier=Lista proizvoda i cena za dobavljača <b>%s</b> 
-SentToSuppliers=Poslato dobavljačima
-ListOfSupplierOrders=Lista narudžbina dobavljača
-MenuOrdersSupplierToBill=Narudžbine dobavljača za naplatu
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Kašnjenje isporuke u danima
 DescNbDaysToDelivery=Najduže kašnjenje isporuke proizvoda iz ove narudžbine
-SupplierReputation=Supplier reputation
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
 AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=Cene dobavljača
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/sr_RS/workflow.lang b/htdocs/langs/sr_RS/workflow.lang
index 2d6ca3b4b19..1c2572bb994 100644
--- a/htdocs/langs/sr_RS/workflow.lang
+++ b/htdocs/langs/sr_RS/workflow.lang
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source custome
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=Automatsko kriranje
 AutomaticClassification=Automatsko klasifikovanje
diff --git a/htdocs/langs/sv_SE/accountancy.lang b/htdocs/langs/sv_SE/accountancy.lang
index d321ffa7980..23809957c49 100644
--- a/htdocs/langs/sv_SE/accountancy.lang
+++ b/htdocs/langs/sv_SE/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Redovisning
 ACCOUNTING_EXPORT_SEPARATORCSV=Kolumnseparator för exportfil
 ACCOUNTING_EXPORT_DATE=Datumformat för exportfil
 ACCOUNTING_EXPORT_PIECE=Export the number of piece
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Accounts with non zero values
 ListOfAccounts=List of accounts
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers 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
 
-AccountancyArea=Accountancy area
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
 AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
@@ -89,7 +90,7 @@ MenuProductsAccounts=Product accounts
 ProductsBinding=Products accounts
 Ventilation=Binding to accounts
 CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Supplier invoice binding
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=Bara tidskrift
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Diverse tidskrift
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Utgiftsjournal
 ACCOUNTING_SOCIAL_JOURNAL=Social tidskrift
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
 ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
@@ -185,11 +187,12 @@ ListeMvts=List of movements
 ErrorDebitCredit=Debit och kredit kan inte ha ett värde på samma gång
 AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
-DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=Förteckning över redovisningskonton
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Group of account
 Pcgsubtype=Subgroup of account
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
 ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=Konsul här listan med linjerna av fakturor leverantör och deras bokföringskonto
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
 DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report 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 fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Fel, du kan inte ta bort denna redovisningskonto eftersom den används
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -293,4 +296,9 @@ Binded=Lines bound
 ToBind=Lines to bind
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index 967169857bb..a4d42117fcf 100644
--- a/htdocs/langs/sv_SE/admin.lang
+++ b/htdocs/langs/sv_SE/admin.lang
@@ -3,8 +3,8 @@ Foundation=Stiftelse
 Version=Version
 Publisher=Publisher
 VersionProgram=Programversion
-VersionLastInstall=Initial install version
-VersionLastUpgrade=Latest version upgrade
+VersionLastInstall=Ursprunglig installerad version
+VersionLastUpgrade=Senast installerade version
 VersionExperimental=Experimentell
 VersionDevelopment=Utveckling
 VersionUnknown=Okänd
@@ -29,7 +29,7 @@ SessionId=Session ID
 SessionSaveHandler=Handler för att spara sessioner
 SessionSavePath=Lagring session lokalisering
 PurgeSessions=Utrensning av sessioner
-ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
+ConfirmPurgeSessions=Vill du verkligen tömma alla sessioner? Detta kommer logga ut alla användare (förutom dig själv).
 NoSessionListWithThisHandler=Spara session hanterare konfigureras i din PHP inte är möjligt att lista all löpande sessioner.
 LockNewSessions=Lås nya förbindelser
 ConfirmLockNewSessions=Är du säker på att du vill begränsa alla nya Dolibarr anknytning till dig själv. Endast användare <b>%s</b> kommer att kunna ansluta efter det.
@@ -107,7 +107,7 @@ MenuIdParent=Överordnade menyn ID
 DetailMenuIdParent=ID överordnade menyn (0 för en toppmenyn)
 DetailPosition=Sortera nummer att definiera menyposition
 AllMenus=Alla
-NotConfigured=Module/Application not configured
+NotConfigured=Modul/Applikation är inte konfigurerad
 Active=Aktiv
 SetupShort=Inställning
 OtherOptions=Andra alternativ
@@ -130,7 +130,7 @@ YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to a
 HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server.
 Box=Widget
 Boxes=Widgets
-MaxNbOfLinesForBoxes=Max number of lines for widgets
+MaxNbOfLinesForBoxes=Max antal rader för widget
 AllWidgetsWereEnabled=All available widgets are enabled
 PositionByDefault=Standard för
 Position=Position
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=SMTP / SMTPs Host (som standard i php.ini: <b>%s)</b>
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP / SMTPs Port (Ej definierad i PHP på Unix-liknande system)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPs Host (Ej definierad i PHP på Unix-liknande system)
 MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= Skicka systematiskt en dold kol-kopia av alla skickade email till
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=Metod för att skicka e-post
 MAIN_MAIL_SMTPS_ID=SMTP-ID om autentisering krävs
 MAIN_MAIL_SMTPS_PW=SMTP-lösenord om autentisering krävs
@@ -291,7 +292,7 @@ ModuleSetup=Modul setup
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projekt / gemensamt arbete
@@ -373,7 +374,8 @@ NoSmsEngine=Ingen SMS-avsändare Manager, som finns. SMS-avsändare chef inte in
 PDF=PDF
 PDFDesc=Du kan ställa in varje globala alternativ för PDF generation
 PDFAddressForging=Regler för att förfalska adress lådor
-HideAnyVATInformationOnPDF=Göm all information som rör moms på genererade PDF
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=Dölj produktbeskrivningar i genererad PDF
@@ -445,7 +447,8 @@ DisplayCompanyInfo=Display company address
 DisplayCompanyManagers=Display manager names
 DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party 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.
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Set this to 1 if you want to attach main document to emai
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=Användare & grupper
 Module0Desc=Users / Employees and Groups management
@@ -479,7 +485,7 @@ Module1Desc=Företag och kontakt ledning
 Module2Name=Kommersiella
 Module2Desc=Kommersiell förvaltning
 Module10Name=Bokföring
-Module10Desc=Enkel bokföring och redovisning (faktura och betalning avsändandet)
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=Förslag
 Module20Desc=Hantering av affärsförslag
 Module22Name=Massutskick av e-utskick
@@ -546,8 +552,8 @@ Module400Name=Projekt / Möjligheter / Leads
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=WebCalendar
 Module410Desc=WebCalendar integration
-Module500Name=Särskilda kostnader
-Module500Desc=Förvaltning av särskilda kostnader (skatter, sociala eller skattemässiga skatter, utdelningar)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Payment of employee wages
 Module510Desc=Record and follow payment of your employee wages
 Module520Name=Lån
@@ -561,14 +567,14 @@ Module700Name=Donationer
 Module700Desc=Donation ledning
 Module770Name=Räkningar
 Module770Desc=Förvaltnings- och anspråk räkningar (transport, måltid, ...)
-Module1120Name=Leverantör kommersiell förslag
-Module1120Desc=Begär leverantör kommersiella förslag och priser
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Mantis integration
 Module1520Name=Dokument Generation
 Module1520Desc=Mass post dokumentgenerering
 Module1780Name=Taggar/Kategorier
-Module1780Desc=Skapa taggar / kategori (produkter, kunder, leverantörer, kontakter eller medlemmar)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=FCKeditor
 Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
 Module2200Name=Dynamiska priser
@@ -576,7 +582,7 @@ Module2200Desc=Aktivera användningen av matematiska uttryck för priser
 Module2300Name=Schemalagda jobb
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API/Web services (SOAP server)
@@ -613,7 +619,7 @@ Module50100Desc=Point of sales module (POS).
 Module50200Name=Paypal
 Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 Module50400Name=Redovisning (avancerad)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=PrintIPP
 Module54000Desc=Direktutskrift (utan att öppna dokumenten) använder Cups IPP-gränssnitt (skrivare måste vara synlig från servern, och CUPS måste vara installerad på servern).
 Module55000Name=Poll, Survey or Vote
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerans fördröjning (i dagar) före registrering om
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerans fördröjning (i dagar) före registrering om kontroller insättning för att göra
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=Andra menyalternativ hantera valfria parametrar.
 LogEvents=Säkerhetsgranskning evenemang
 Audit=Revision
@@ -1054,8 +1060,9 @@ LogEventDesc=Du kan aktivera här loggning för Dolibarr säkerhet händelser. A
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information diverse teknisk information får du i skrivskyddad läge och synlig för administratörer bara.
 SystemAreaForAdminOnly=Detta område är tillgänglig för administratören användare. Ingen av de Dolibarr behörigheter kan minska denna gräns.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=Du kan välja varje parameter i samband med Dolibarr utseendet här
 AvailableModules=Available app/modules
 ToActivateModule=För att aktivera moduler, gå på Setup-menyn (Hem-> Inställningar-> Modules).
@@ -1188,11 +1195,11 @@ UserMailRequired=E krävs för att skapa en ny användare
 HRMSetup=HRM module setup
 ##### Company setup #####
 CompanySetup=Företag modul setup
-CompanyCodeChecker=Modul för tredje part kodgenerering och kontroll (kund eller leverantör)
-AccountCodeManager=Module for accounting code generation (customer or supplier)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
 NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
 ModelModules=Dokument mallar
 DocumentModelOdt=Generera dokument från OpenDocuments mallar (.odt eller .ods filer för Openoffice, KOffice, Textedit, ...)
@@ -1203,6 +1210,9 @@ MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
 TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=En export länk till <b>%s</b> format finns på följande länk: %s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=Fri text på affärsförslag
 WatermarkOnDraftProposal=Vattenstämpel på utkast till affärsförslag (ingen om tom)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Be om bankkonto destination förslag
 ##### SupplierProposal #####
-SupplierProposalSetup=Pris begär leverantörer modul konfiguration
-SupplierProposalNumberingModules=Pris förfrågningar leverantörer numrerings modeller
-SupplierProposalPDFModules=Pris begär leverantörer dokument modeller
-FreeLegalTextOnSupplierProposal=Fritext på förfrågningar pris leverantörer
-WatermarkOnDraftSupplierProposal=Vattenstämpel om förslaget pris begär leverantörer (ingen om tom)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Fråga efter bankkonto destination pris begäran
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=Beställ ledning setup
 OrdersNumberingModules=Beställningar numrering moduler
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=Anslutning till servern &quot;%s&quot; på databas %s &quot;med
 OSCommerceTestKo1=Anslutning till servern &quot;%s&quot; lyckas, men databas %s &quot;kunde inte nås.
 OSCommerceTestKo2=Anslutning till servern &quot;%s&quot; med användare &quot;%s&quot; misslyckades.
 ##### Stock #####
-StockSetup=Lagermodul inställnings
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=Om du använder en Point of Sale-modul (POS modul som standard eller annan extern modul), kan denna inställning ignoreras av din Point Of Sale modul. De flesta point of sales moduler är utformade för att skapa omedelbart en faktura och minska lager som standard oavsett är alternativ här. Så, om du behöver eller inte ha ett bestånd minskar när du registrerar en sälja från din Point of Sale, kolla även din POS-modul inrättas.
 ##### Menu #####
 MenuDeleted=Meny utgår
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
 MultiCompanySetup=Multi-bolag modul setup
 ##### Suppliers #####
 SuppliersSetup=Leverantör modul setup
-SuppliersCommandModel=Fullständig mall av leverantör för (logo. ..)
-SuppliersInvoiceModel=Komplett mall leverantörsfaktura (logo. ..)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Leverantörsfakturor numrerings modeller
 IfSetToYesDontForgetPermission=Om satt till ja, glöm inte att ge behörighet till grupper eller användare som tillåts för den andra godkännande
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=Använd inte tvetydiga tecken ("1", "l", "i", "|", "0"
 SalariesSetup=Inställning av modul löner
 SortOrder=Sorteringsordning
 Format=Format
-TypePaymentDesc=0: Kundbetalning typ, 1: Leverantörsbetalnings typ, 2: Både kunder och leverantörer betalnings typ
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Inkludera sökväg (definerad i variabel %s)
 ExpenseReportsSetup=Inställning av modulräkningar
 TemplatePDFExpenseReports=Dokumentmallar för att skapa reseräkning dokument
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Installation av extern modul från ans
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Markera tabelllinjer när musen flytta passerar över
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
-TextTitleColor=Color of page title
+TextTitleColor=Text color of Page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=Bakgrundsfärg för Huvudmeny
 TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Bakgrundsfärg för vänstermenyn
 BackgroundTableTitleColor=Background color for Table title line
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Bakgrundsfärg för udda bords linjer
 BackgroundTableLineEvenColor=Bakgrundsfärg för ännu bords linjer
 MinimumNoticePeriod=Minsta varseltid (Din ledighet begäran måste göras innan denna försening)
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
 ForcedConstants=Required constant values
-MailToSendProposal=Om du vill skicka kunden förslag
-MailToSendOrder=Om du vill skicka kundorder
-MailToSendInvoice=Om du vill skicka kundfaktura
-MailToSendShipment=Om du vill skicka försändelsen
-MailToSendIntervention=Om du vill skicka ingripande
-MailToSendSupplierRequestForQuotation=Om du vill skicka Offertförfrågan till leverantör
-MailToSendSupplierOrder=Om du vill skicka leverantör ordning
-MailToSendSupplierInvoice=Om du vill skicka leverantörsfaktura
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-MailToMember=To send email from member page
-MailToUser=To send email from user page
-MailToProject= To send email from project page
+MailToSendProposal=Customer proposals
+MailToSendOrder=Customer orders
+MailToSendInvoice=Customer invoices
+MailToSendShipment=Transporter
+MailToSendIntervention=Insatser
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Kontrakt
+MailToThirdparty=Tredje part
+MailToMember=Medlemmar
+MailToUser=Användare
+MailToProject=Projects page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1780,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/sv_SE/bills.lang b/htdocs/langs/sv_SE/bills.lang
index 065a884cf00..ecc26bfef3f 100644
--- a/htdocs/langs/sv_SE/bills.lang
+++ b/htdocs/langs/sv_SE/bills.lang
@@ -109,7 +109,7 @@ CancelBill=Avbryt en faktura
 SendRemindByMail=Skicka påminnelse via e-post
 DoPayment=Enter payment
 DoPaymentBack=Enter refund
-ConvertToReduc=Konvertera till framtida rabatt
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Skriv in avgifter från kunderna
@@ -120,7 +120,7 @@ BillStatus=Faktura status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Utkast (måste valideras)
 BillStatusPaid=Betald
-BillStatusPaidBackOrConverted=Credit note refund or converted into discount
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Övergiven
 BillStatusValidated=Validerad (måste betalas)
@@ -296,10 +296,10 @@ DiscountType=Discount type
 NoteReason=Not/orsak
 ReasonDiscount=Orsak
 DiscountOfferedBy=Beviljats av
-DiscountStillRemaining=Discounts available
-DiscountAlreadyCounted=Discounts already consumed
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+SupplierDiscounts=Vendors discounts
 BillAddress=Faktureringsadress
 HelpEscompte=Denna rabatt är en rabatt som kund eftersom betalningen gjordes före sikt.
 HelpAbandonBadCustomer=Detta belopp har övergivits (kund sägs vara en dålig kund) och anses som en exceptionell lös.
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Every %s days
 FrequencyPer_m=Every %s months
 FrequencyPer_y=Every %s years
@@ -505,9 +511,14 @@ SituationAmount=Löpande faktura belopp (netto)
 SituationDeduction=Löpande räkning avdrag
 ModifyAllLines=Ändra alla rader
 CreateNextSituationInvoice=Skapa nästa löpande faktura
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=Påföljande avstämning finns redan.
 DisabledBecauseFinal=Denna avstämning är slutlig.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=S
 CantBeLessThanMinPercent=Framsteget kan inte vara mindre än dess värde vid förra avstämningen.
 NoSituations=No open situations
 InvoiceSituationLast=Slutlig sammanställningsfaktura.
@@ -532,3 +543,4 @@ AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/sv_SE/categories.lang b/htdocs/langs/sv_SE/categories.lang
index fccb656f5bc..8ed5203cf6c 100644
--- a/htdocs/langs/sv_SE/categories.lang
+++ b/htdocs/langs/sv_SE/categories.lang
@@ -16,7 +16,7 @@ MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
-SubCats=Underkategorier
+SubCats=Sub-categories
 CatList=List of tags/categories
 NewCategory=New tag/category
 ModifCat=Modify tag/category
@@ -85,3 +85,4 @@ CategorieRecursivHelp=Om aktiverad kommer produkten även länkas till förälde
 AddProductServiceIntoCategory=Lägg till följande produkt / tjänst
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
+ChooseCategory=Choose category
diff --git a/htdocs/langs/sv_SE/commercial.lang b/htdocs/langs/sv_SE/commercial.lang
index aa6d5763e4c..81813814b9d 100644
--- a/htdocs/langs/sv_SE/commercial.lang
+++ b/htdocs/langs/sv_SE/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=Stäng
 ActionAC_EMAILING=Skicka mängd-e-post
 ActionAC_COM=Skicka kundorder per post
 ActionAC_SHIP=Skicka Leverans med e-post
-ActionAC_SUP_ORD=Skicka leverantör beställning av e-post
-ActionAC_SUP_INV=Skicka leverantörsfaktura med post
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=Andra
 ActionAC_OTH_AUTO=Automatiskt införda händelser
 ActionAC_MANUAL=Manuellt införda händelser
diff --git a/htdocs/langs/sv_SE/companies.lang b/htdocs/langs/sv_SE/companies.lang
index 48e23cc431e..3360604cebf 100644
--- a/htdocs/langs/sv_SE/companies.lang
+++ b/htdocs/langs/sv_SE/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Are you sure you want to delete this contact and all inheri
 MenuNewThirdParty=Ny tredje part
 MenuNewCustomer=Ny kund
 MenuNewProspect=Ny möjlig kund
-MenuNewSupplier=Ny leverantör
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=Nya privatperson
-NewCompany=Nytt företag (möjlig kund, kund, leverantör)
-NewThirdParty=Ny tredje part (möjlig kund, kund, leverantör)
-CreateDolibarrThirdPartySupplier=Skapa tredje part (leverantör)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=Skapa tredje part
 CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Prospektering område
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=Möjliga kunder
 ThirdPartyCustomers=Kunder
 ThirdPartyCustomersStats=Kunder
 ThirdPartyCustomersWithIdProf12=Kunder med %s eller %s
-ThirdPartySuppliers=Leverantörer
+ThirdPartySuppliers=Vendors
 ThirdPartyType=Tredje part typ
 Individual=Privatperson
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
@@ -77,11 +77,11 @@ Web=Webb
 Poste= Position
 DefaultLang=Språk som standard
 VATIsUsed=Sales tax is used
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
-ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Förslag
 OverAllOrders=Beställningar
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=RE Typ
 TypeLocaltax2ES=IRPF Typ
 WrongCustomerCode=Kundkod ogiltig
-WrongSupplierCode=Leverantörkod ogiltig
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Kundkod, mall
-SupplierCodeModel=Leverantörkod, mall
+SupplierCodeModel=Vendor code model
 Gencod=Streckkod
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
@@ -267,7 +267,7 @@ Prospect=Möjlig kund
 CustomerCard=Kundkort
 Customer=Kund
 CustomerRelativeDiscount=Relativ kundrabatt
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=Relativ rabatt
 CustomerAbsoluteDiscountShort=Absolut rabatt
 CompanyHasRelativeDiscount=Denna kund har en rabatt på <b>%s%%</b>
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this suppl
 CompanyHasNoAbsoluteDiscount=Denna kund har inga rabatttillgodohavanden
 CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
 CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=Ingen
 Supplier=Leverantör
 AddContact=Skapa kontakt
@@ -304,13 +304,13 @@ DeleteACompany=Ta bort ett företag
 PersonalInformations=Personuppgifter
 AccountancyCode=Redovisningskonto
 CustomerCode=Kundnummer
-SupplierCode=Leverantörnummer
+SupplierCode=Vendor code
 CustomerCodeShort=Kundnummer
-SupplierCodeShort=Leverantörnummer
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=Kundnummer, unik för varje kund
-SupplierCodeDesc=Leverantörnummer, unik för varje leverantör
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=Krävs om tredje part är en kund eller möjlig kund
-RequiredIfSupplier=Krävs om tredje part är en leverantör
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=Giltigheten kontrolleras av modul
 ThisIsModuleRules=Detta är reglerna för denna modul
 ProspectToContact=Möjlig kund att kontakta
@@ -338,7 +338,7 @@ MyContacts=Mina kontakter
 Capital=Kapital
 CapitalOf=Kapital %s
 EditCompany=Redigera företag
-ThisUserIsNot=Denna användare är vare sig möjlig kund, kund eller leverantör
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=Kontrollera
 VATIntraCheckDesc=Länken <b>%s</b> gör det möjligt att söka Europeiska moms tjänsten. Tillgång till internet från servern krävs för att denna tjänst ska fungera.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -396,7 +396,7 @@ ImportDataset_company_4=Third parties/Sales representatives (Assign sales repres
 PriceLevel=Prisnivå
 DeliveryAddress=Leveransadress
 AddAddress=Lägg till adress
-SupplierCategory=Leverantör kategori
+SupplierCategory=Vendor category
 JuridicalStatus200=Independent
 DeleteFile=Ta bort fil
 ConfirmDeleteFile=Är du säker på att du vill ta bort denna fil?
@@ -406,7 +406,7 @@ FiscalYearInformation=Information om räkenskapsåret
 FiscalMonthStart=Första månad av verksamhetsåret
 YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
 YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
-ListSuppliersShort=Lista över leverantörer
+ListSuppliersShort=List of vendors
 ListProspectsShort=Lista över möjliga kunder
 ListCustomersShort=Lista över kunder
 ThirdPartiesArea=Tredje part och kontaktyta
@@ -420,7 +420,7 @@ CurrentOutstandingBill=Obetalda fakturor
 OutstandingBill=Max för obetald faktura
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Ger nummer med format %syymm-nnnn för kundnummer och %syymm-nnnn för leverantörnummer där YY är år, mm månad och nnnn är en sekvens utan avbrott och utan återgång till 0.
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=Kund / leverantör-nummer är ledig. Denna kod kan ändras när som helst.
 ManagingDirectors=Företagledares namn (vd, direktör, ordförande ...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/sv_SE/compta.lang b/htdocs/langs/sv_SE/compta.lang
index 9b27afcee5e..40933d8552e 100644
--- a/htdocs/langs/sv_SE/compta.lang
+++ b/htdocs/langs/sv_SE/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=Net betalas
 VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
-VATSummary=Tax Balance
+VATSummary=Tax monthly
+VATBalance=Tax Balance
 VATPaid=Tax paid
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=Bokföring / Treasury område
 NewPayment=Ny betalning
 Payments=Betalningar
 PaymentCustomerInvoice=Kundfaktura betalning
-PaymentSupplierInvoice=Leverantörsfaktura betalning
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Sociala och skattemässiga betalningar
 PaymentVat=Moms betalning
 ListPayment=Lista över betalningar
 ListOfCustomerPayments=Förteckning över kundbetalningar
-ListOfSupplierPayments=Förteckning över leverantörsbetalningar
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Datum startperiod
 DateEndPeriod=Slutdatum perioden
 newLT1Payment=New tax 2 payment
@@ -110,7 +111,7 @@ ShowVatPayment=Visa mervärdesskatteskäl
 TotalToPay=Totalt att betala
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
 CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
 SupplierAccountancyCodeShort=Sup. account. code
 AccountNumber=Kontonummer
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=Rapport från tredje part RE
 LT2ReportByCustomersES=Rapport från tredje part IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Rapport av kunden moms samlas och betalas
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Chart of accounts models
 Pcg_type=Pcg typ
 Pcg_subtype=Pcg subtyp
 InvoiceLinesToDispatch=Faktura linjer avsändandet
-ByProductsAndServices=Genom produkter och tjänster
+ByProductsAndServices=By product and service
 RefExt=Extern ref
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
 LinkedOrder=Länk för att beställa
@@ -215,7 +218,8 @@ Mode1=Metod 1
 Mode2=Metod 2
 CalculationRuleDesc=För att beräkna den totala mervärdesskatt, finns det två metoder: <br> Metod 1 är avrundning moms på varje rad, sedan summera dem. <br> Metod 2 är summera all moms på varje rad, sedan avrundning resultatet. <br> Slutresultat kan skiljer sig från några cent. Standardläget är <b>läget% s.</b>
 CalculationRuleDescSupplier=According to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Omsättning rapport per produkt, när du använder en <b>kontantredovisningsläge</b> inte är relevant. Denna rapport är endast tillgänglig när du använder <b>engagemang bokföring</b> läge (se inställning av bokföring modul).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Beräkning läge
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
@@ -242,3 +246,10 @@ FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/sv_SE/dict.lang b/htdocs/langs/sv_SE/dict.lang
index 133b4b136fc..cacce0376e9 100644
--- a/htdocs/langs/sv_SE/dict.lang
+++ b/htdocs/langs/sv_SE/dict.lang
@@ -5,7 +5,8 @@ CountryIT=Italien
 CountryES=Spanien
 CountryDE=Tyskland
 CountryCH=Schweiz
-CountryGB=STORBRITANNIEN
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=United Kingdom
 CountryUK=United Kingdom
 CountryIE=Irland
 CountryCN=Kina
diff --git a/htdocs/langs/sv_SE/ecm.lang b/htdocs/langs/sv_SE/ecm.lang
index 56f9ef4133c..5ee5d95bcb1 100644
--- a/htdocs/langs/sv_SE/ecm.lang
+++ b/htdocs/langs/sv_SE/ecm.lang
@@ -14,11 +14,11 @@ ECMNbOfFilesInDir=Antalet filer i katalogen
 ECMNbOfSubDir=Antal underkataloger
 ECMNbOfFilesInSubDir=Antalet filer i underkataloger
 ECMCreationUser=Creator
-ECMArea=DMS/ECM area
+ECMArea=DMS/ECM yta
 ECMAreaDesc=The DMS/ECM (Document Management System / Electronic Content Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
 ECMAreaDesc2=* Automatisk kataloger fylls automatiskt när man lägger till dokument från kort av ett element. <br> * Manuell kataloger kan användas för att spara dokument inte är knutna till ett visst element.
 ECMSectionWasRemoved=Nummer <b>%s</b> har tagits bort.
-ECMSectionWasCreated=Directory <b>%s</b> has been created.
+ECMSectionWasCreated=Mapp <b>%s</b> har skapats.
 ECMSearchByKeywords=Sök på nyckelord
 ECMSearchByEntity=Sök på objektet
 ECMSectionOfDocuments=Register över handlingar
@@ -33,18 +33,19 @@ ECMDocsByProducts=Dokument med koppling till produkter
 ECMDocsByProjects=Handlingar som är kopplade till projekt
 ECMDocsByUsers=Dokument länkade till användare
 ECMDocsByInterventions=Dokument länkade till ärenden
-ECMDocsByExpenseReports=Documents linked to expense reports
+ECMDocsByExpenseReports=Dokument länkade till utgiftsrapporter
 ECMNoDirectoryYet=Ingen katalog skapas
 ShowECMSection=Visa katalog
 DeleteSection=Ta bort katalog
-ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
+ConfirmDeleteSection=Kan du bekräfta att du vill ta bort mappen <b>%s</b>?
 ECMDirectoryForFiles=Relativ katalog för filer
-CannotRemoveDirectoryContainsFiles=Flyttat inte möjligt eftersom det innehåller några filer
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=Filhanteraren
-ECMSelectASection=Välj en katalog på vänster träd ...
+ECMSelectASection=Välj en mapp i trädet...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
-ReSyncListOfDir=Resync list of directories
-HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
-NoDirectoriesFound=No directories found
+ReSyncListOfDir=Uppdatera lista med mappar
+HashOfFileContent=Hash av filinnehåll
+FileNotYetIndexedInDatabase=Filen är inte indexerad i databasen (försök ladda upp igen)
+FileSharedViaALink=Fil delad via länk
+NoDirectoriesFound=Inga mappar funna
diff --git a/htdocs/langs/sv_SE/errors.lang b/htdocs/langs/sv_SE/errors.lang
index 59cc9a8ed17..d41fdfe2cd4 100644
--- a/htdocs/langs/sv_SE/errors.lang
+++ b/htdocs/langs/sv_SE/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Streckkod krävs
 ErrorCustomerCodeAlreadyUsed=Kund-kod som används redan
 ErrorBarCodeAlreadyUsed=Streckkod som redan används
 ErrorPrefixRequired=Prefix krävs
-ErrorBadSupplierCodeSyntax=Bad syntax för leverantör kod
-ErrorSupplierCodeRequired=Leverantör som erfordras
-ErrorSupplierCodeAlreadyUsed=Leverantör kod som används redan
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Dåliga parametrar
 ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
 ErrorBadImageFormat=Bildfilen har inte ett format som stöds (Din PHP stöder inte funktioner för att konvertera bilder av det här formatet)
@@ -87,7 +87,7 @@ ErrorsOnXLines=Fel på <b>%s</b> källrader
 ErrorFileIsInfectedWithAVirus=Antivirusprogrammet inte har kunnat validera (fil kan vara smittade av ett virus)
 ErrorSpecialCharNotAllowedForField=Speciella tecken är inte tillåtna för användning i fält &quot;%s&quot;
 ErrorNumRefModel=En hänvisning finns i databasen (%s) och är inte förenligt med denna numrering regel. Ta bort post eller bytt namn hänvisning till aktivera den här modulen.
-ErrorQtyTooLowForThisSupplier=Kvantitet för låg för denna leverantör eller något pris som anges på denna produkt för denna leverantör
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Fel på masken
 ErrorBadMaskFailedToLocatePosOfSequence=Fel, mask utan löpnummer
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
-ErrorSupplierCountryIsNotDefined=Land för denna leverantör är inte definierat. Korrigera detta först.
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
diff --git a/htdocs/langs/sv_SE/install.lang b/htdocs/langs/sv_SE/install.lang
index 47e52b0c4db..7026f541115 100644
--- a/htdocs/langs/sv_SE/install.lang
+++ b/htdocs/langs/sv_SE/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=Konfigurationsfilen <b>%s</b> finns in
 ConfFileCouldBeCreated=Konfigurationsfil <b>%s</b> skulle kunna skapas.
 ConfFileIsNotWritable=Konfigurationsfilen <b>%s</b> är inte skrivbar. Kontrollera behörigheter. För den första installationen, måste din webbserver beviljas för att kunna skriva i denna fil under konfigurationen ("chmod 666" till exempel på en UNIX-liknande OS).
 ConfFileIsWritable=Konfigurationsfilen <b>%s</b> är skrivbar.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Ladda all information från konfigurationsfilen.
 PHPSupportSessions=Detta stöder PHP sessioner.
 PHPSupportPOSTGETOk=Detta stöder PHP variabler POST och GET.
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
 WarningRemoveInstallDir=Varning, av säkerhetsskäl, när installera eller uppgradera är klar, bör du ta bort <b>installationskatalogen eller döp om den till install.lock för att undvika dess skadliga användning.</b>
 FunctionNotAvailableInThisPHP=Ej tillgängligt för denna PHP
 ChoosedMigrateScript=Välj migration script
-DataMigration=Migrering av data
-DatabaseMigration=Struktur databas migration
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script bearbetning
 ChooseYourSetupMode=Välj din setup-funktionen och klicka på &quot;Start&quot; ...
 FreshInstall=Ny installation
@@ -146,7 +147,7 @@ NothingToDo=Nothing to do
 # upgrade
 MigrationFixData=Fix för denormalized data
 MigrationOrder=Migrering av data för kundens order
-MigrationSupplierOrder=Migrering av data för leverantörens order
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Migrering av data för kommersiella förslag
 MigrationInvoice=Migrering av data för kundens fakturor
 MigrationContract=Migrering av data för kontrakt
@@ -196,6 +197,8 @@ MigrationEvents=Överföring av händelser för att lägga till händelseägaren
 MigrationEventsContact=Migration of events to add event contact into assignement table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 ShowNotAvailableOptions=Visa ej tillgängliga val
diff --git a/htdocs/langs/sv_SE/ldap.lang b/htdocs/langs/sv_SE/ldap.lang
index 51d0c0d6e61..d798df68b43 100644
--- a/htdocs/langs/sv_SE/ldap.lang
+++ b/htdocs/langs/sv_SE/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Lösenord för domän
 YouMustChangePassNextLogon=Lösenord för användare <b>%s</b> på domänen <b>%s</b> måste ändras.
 UserMustChangePassNextLogon=Användaren måste byta lösenord på domänen %s
 LDAPInformationsForThisContact=Information i LDAP-databas för denna kontakt
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Member type synchronized
 ContactSynchronized=Kontakta synkroniseras
 ForceSynchronize=Tvinga synkronisering Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Misslyckades med att läsa LDAP-databas. Kontrollera LDAP-modul setup och databas tillgänglighet.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/sv_SE/loan.lang b/htdocs/langs/sv_SE/loan.lang
index 9c45a41f71f..4e63a1366b3 100644
--- a/htdocs/langs/sv_SE/loan.lang
+++ b/htdocs/langs/sv_SE/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=Kapital
 Insurance=Försäkring
 Interest=Ränta
 Nbterms=Antal termer
+Term=Term
 LoanAccountancyCapitalCode=Accounting account capital
 LoanAccountancyInsuranceCode=Accounting account insurance
 LoanAccountancyInterestCode=Accounting account interest
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=Bekräfta borttagning av lån
 LoanDeleted=Lånet borttaget
 ConfirmPayLoan=Bekräfta klassificeringen av detta lån 
 LoanPaid=Lånet betalt
-# Calc
-LoanCalc=Banklånskalkylator
-PurchaseFinanceInfo=Inköp och finansinformation
-SalePriceOfAsset=Försäljningspris för tillgång
-PercentageDown=Procentuell nedgång 
-LengthOfMortgage=Duration of loan
-AnnualInterestRate=Årlig ränta
-ExplainCalculations=Förklara beräkning
-ShowMeCalculationsAndAmortization=Visa beräkningen och avbetlningsplanen
-MortgagePaymentInformation=Hupotekslånsinformation
-DownPayment=Handpenning
-DownPaymentDesc=<b> handpenningen </b> = Priset på hemmet multiplicerat med procent dividerat med 100 (5% ner blir 5/100 eller 0,05)
-InterestRateDesc=<b>Räntan</b> = den årliga räntesatsen delat med 100
-MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
-MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
-MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
-MonthlyPaymentDesc=The montly payment is figured out using the following formula
-AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
-AmountFinanced=Amount Financed
-AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
-Totalsforyear=Totals for year
-MonthlyPayment=Monthly Payment
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
-GoToInterest=%s will go towards INTEREST
-GoToPrincipal=%s will go towards PRINCIPAL
-YouWillSpend=You will spend %s in year %s
 ListLoanAssociatedProject=List of loan associated with the project
 AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Ränta
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-FinancialCommitment=Financial commitment
 CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/langs/sv_SE/mails.lang b/htdocs/langs/sv_SE/mails.lang
index bd4b056fcde..144c6657549 100644
--- a/htdocs/langs/sv_SE/mails.lang
+++ b/htdocs/langs/sv_SE/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Avsändare
 MailErrorsTo=Fel på
 MailReply=Svara
 MailTo=Mottagare (s)
+MailToUsers=To user(s)
 MailCC=Kopiera till
+MailToCCUsers=Copy to users(s)
 MailCCC=Cachad kopia till
 MailTopic=E-post ämne
 MailText=Meddelande
@@ -164,4 +166,4 @@ InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang
index 45e42f96156..f423673f62c 100644
--- a/htdocs/langs/sv_SE/main.lang
+++ b/htdocs/langs/sv_SE/main.lang
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is se
 Administrator=Administratör
 Undefined=Odefinierad
 PasswordForgotten=Password forgotten?
+NoAccount=No account?
 SeeAbove=Se ovan
 HomeArea=Hem område
 LastConnexion=Latest connection
@@ -231,7 +232,7 @@ Limit=Gräns
 Limits=Gränser
 Logout=Logga ut
 NoLogoutProcessWithAuthMode=Ingen applikativ koppling funktionen med autentisering läge <b>%s</b>
-Connection=Anslutning
+Connection=Inlogg
 Setup=Setup
 Alert=Alert
 MenuWarnings=Varningar
@@ -402,6 +403,7 @@ DefaultTaxRate=Default tax rate
 Average=Genomsnittlig
 Sum=Summa
 Delta=Delta
+RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Alternativ
@@ -414,7 +416,7 @@ Favorite=Favorit
 ShortInfo=Info
 Ref=Ref.
 ExternalRef=Ref. extern
-RefSupplier=Ref. leverantör
+RefSupplier=Ref. vendor
 RefPayment=Ref. betalning
 CommercialProposalsShort=Kommersiella förslag
 Comment=Kommentar
@@ -493,7 +495,7 @@ Received=Mottagna
 Paid=Betald
 Topic=Subject
 ByCompanies=Av tredje part
-ByUsers=Av användare
+ByUsers=By user
 Links=Länkar
 Link=Länk
 Rejects=Rejects
@@ -619,9 +621,9 @@ BuildDoc=Bygg Doc
 Entity=Entity
 Entities=Enheter
 CustomerPreview=Kunden förhandsgranska
-SupplierPreview=Leverantör förhandsgranska
+SupplierPreview=Vendor preview
 ShowCustomerPreview=Visa kunden förhandsgranskning
-ShowSupplierPreview=Visa leverantör förhandsgranskning
+ShowSupplierPreview=Show vendor preview
 RefCustomer=Ref. kund
 Currency=Valuta
 InfoAdmin=Information för administratörer
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=Products or services
 SearchIntoProjects=Projekt
 SearchIntoTasks=Uppgifter
 SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Insatser
 SearchIntoContracts=Kontrakt
 SearchIntoCustomerShipments=Customer shipments
@@ -941,3 +943,5 @@ Remote=Remote
 LocalAndRemote=Local and Remote
 KeyboardShortcut=Keyboard shortcut
 AssignedTo=Påverkas i
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/sv_SE/margins.lang b/htdocs/langs/sv_SE/margins.lang
index 34017733633..fd92d4954d3 100644
--- a/htdocs/langs/sv_SE/margins.lang
+++ b/htdocs/langs/sv_SE/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=Som tjänst
 UseDiscountOnTotal=På delsumma
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Definierar om en global rabatt behandlas som en produkt, en tjänst, eller bara på delsumman för beräkning marginal.
 MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best supplier price
+MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Kostnadspris
 UnitCharges=Enhetsladdningar
 Charges=Avgifter
diff --git a/htdocs/langs/sv_SE/members.lang b/htdocs/langs/sv_SE/members.lang
index e789151733e..e4588732cf9 100644
--- a/htdocs/langs/sv_SE/members.lang
+++ b/htdocs/langs/sv_SE/members.lang
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
diff --git a/htdocs/langs/sv_SE/opensurvey.lang b/htdocs/langs/sv_SE/opensurvey.lang
index 43b7435b033..0e20749dfab 100644
--- a/htdocs/langs/sv_SE/opensurvey.lang
+++ b/htdocs/langs/sv_SE/opensurvey.lang
@@ -58,3 +58,4 @@ MoreChoices=Ange fler alternativ för väljarna
 SurveyExpiredInfo=The poll has been closed or voting delay has expired.
 EmailSomeoneVoted=% S har fyllt en rad. Du kan hitta din enkät på länken:% s
 ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/sv_SE/orders.lang b/htdocs/langs/sv_SE/orders.lang
index e4a298b6dba..1cb3a05a768 100644
--- a/htdocs/langs/sv_SE/orders.lang
+++ b/htdocs/langs/sv_SE/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Kunder order område
-SuppliersOrdersArea=Leverantörer order område
+SuppliersOrdersArea=Purchase orders area
 OrderCard=Beställ kort
 OrderId=Order Id
 Order=Beställ
@@ -13,18 +13,18 @@ OrderToProcess=Att kunna bearbeta
 NewOrder=Ny ordning
 ToOrder=Gör så
 MakeOrder=Gör så
-SupplierOrder=Leverantör för
-SuppliersOrders=Leverantörens order
-SuppliersOrdersRunning=Nuvarande leverantörens order
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=Kundorder
-CustomersOrders=Customer orders
+CustomersOrders=Kundorder
 CustomersOrdersRunning=Current customer orders
 CustomersOrdersAndOrdersLines=Customer orders and order lines
 OrdersDeliveredToBill=Customer orders delivered to bill
 OrdersToBill=Customer orders delivered
 OrdersInProcess=Customer orders in process
 OrdersToProcess=Customer orders to process
-SuppliersOrdersToProcess=Supplier orders to process
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=Annullerad
 StatusOrderDraftShort=Förslag
 StatusOrderValidatedShort=Validerad
@@ -75,15 +75,15 @@ ShowOrder=Visa att
 OrdersOpened=Orders to process
 NoDraftOrders=Inga förslag till beslut
 NoOrder=No order
-NoSupplierOrder=No supplier order
+NoSupplierOrder=No purchase order
 LastOrders=Latest %s customer orders
 LastCustomerOrders=Latest %s customer orders
-LastSupplierOrders=Latest %s supplier orders
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=Latest %s modified orders
 AllOrders=Alla order
 NbOfOrders=Antal order
 OrdersStatistics=Beställ statistik
-OrdersStatisticsSuppliers=Leverantören för statistik
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Antal beställningar per månad
 AmountOfOrdersByMonthHT=Mängd order per månad (netto efter skatt)
 ListOfOrders=Lista över beställningar
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</
 GenerateBill=Skapa faktura
 ClassifyShipped=Klassificera levereras
 DraftOrders=Förslag till beslut
-DraftSuppliersOrders=Draft suppliers orders
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=I processen order
 RefOrder=Ref. För
 RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for supplier
-RefOrderSupplierShort=Ref. order supplier
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=Skicka beställningen per post
 ActionsOnOrder=Åtgärder för att
 NoArticleOfTypeProduct=Ingen artikel av typen &quot;produkt&quot; så ingen shippable artikel för denna beställning
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
 DispatchSupplierOrder=Ta emot leverantör för %s
 FirstApprovalAlreadyDone=First approval already done
 SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=Supplier order %s received %s
-SupplierOrderSubmitedInDolibarr=Supplier order %s submited
-SupplierOrderClassifiedBilled=Supplier order %s set billed
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Övriga beställningar
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representanten följa upp kundorder
@@ -125,11 +125,11 @@ TypeContact_commande_internal_SHIPPING=Representanten uppföljning sjöfart
 TypeContact_commande_external_BILLING=Kundfaktura kontakt
 TypeContact_commande_external_SHIPPING=Kunden Frakt Kontakta
 TypeContact_commande_external_CUSTOMER=Kundkontakt uppföljning för
-TypeContact_order_supplier_internal_SALESREPFOLL=Representanten uppföljning leverantör för
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Representanten uppföljning sjöfart
-TypeContact_order_supplier_external_BILLING=Leverantörsfaktura kontakt
-TypeContact_order_supplier_external_SHIPPING=Leverantör Frakt Kontakta
-TypeContact_order_supplier_external_CUSTOMER=Leverantör kontakt uppföljning för
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Konstant COMMANDE_SUPPLIER_ADDON inte definierat
 Error_COMMANDE_ADDON_NotDefined=Konstant COMMANDE_ADDON inte definierat
 Error_OrderNotChecked=Inga order att fakturera valda
diff --git a/htdocs/langs/sv_SE/other.lang b/htdocs/langs/sv_SE/other.lang
index 8bc23fa568b..f61f71a7571 100644
--- a/htdocs/langs/sv_SE/other.lang
+++ b/htdocs/langs/sv_SE/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=Filer är för stor
 PleaseBePatient=Ha tålamod ...
 NewPassword=New password
 ResetPassword=Reset password
-RequestToResetPasswordReceived=En begäran om att ändra Dolibarr lösenord har mottagits
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=Det här är din nya nycklar för att logga in
 NewKeyWillBe=Din nya knappen för att logga in på programvaran kommer att vara
 ClickHereToGoTo=Klicka här för att gå till %s
@@ -233,6 +233,8 @@ PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=Export område
 AvailableFormats=Tillgängliga format
diff --git a/htdocs/langs/sv_SE/productbatch.lang b/htdocs/langs/sv_SE/productbatch.lang
index edfea6b0132..471378b7467 100644
--- a/htdocs/langs/sv_SE/productbatch.lang
+++ b/htdocs/langs/sv_SE/productbatch.lang
@@ -1,24 +1,24 @@
 # ProductBATCH language file - en_US - ProductBATCH
-ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot/serial required)
-ProductStatusNotOnBatch=No (lot/serial not used)
+ManageLotSerial=Använd batch/serie-nummer
+ProductStatusOnBatch=Ja (batch/sere-nummer krävs)
+ProductStatusNotOnBatch=Nej (batch/serie-nummer används ej)
 ProductStatusOnBatchShort=Ja
 ProductStatusNotOnBatchShort=Nej
-Batch=Lot/Serial
-atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
-batch_number=Lot/Serial number
-BatchNumberShort=Lot/Serial
-EatByDate=Eat-by date
-SellByDate=Sell-by date
-DetailBatchNumber=Lot/Serial details
-printBatch=Lot/Serial: %s
+Batch=Batch/Serie
+atleast1batchfield=Bäst före-datum eller Batch/Serie-nummer
+batch_number=Batch/Serie-nummer
+BatchNumberShort=Batch/Serie
+EatByDate=Bäst före-datum
+SellByDate=Bäst före-datum
+DetailBatchNumber=Batch/Serie detaljer
+printBatch=Batch/Serie: %s
 printEatby=Äter med:%s
 printSellby=Sälj-med :%s
 printQty=Antal: %d
 AddDispatchBatchLine=Lägg en linje för Hållbarhet avsändning
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic increase/decrease stock mode is forced to shipping validate and manual dispatching for reception and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use lot/serial number
-ProductLotSetup=Setup of module lot/serial
-ShowCurrentStockOfLot=Show current stock for couple product/lot
-ShowLogOfMovementIfLot=Show log of movements for couple product/lot
-StockDetailPerBatch=Stock detail per lot
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
+ProductDoesNotUseBatchSerial=Denna produkt använder ej batch/serie-nummer
+ProductLotSetup=Inställning av batch/serie modul
+ShowCurrentStockOfLot=Visa aktuellt lager för sammansatt produkt/parti
+ShowLogOfMovementIfLot=Visa statestik för sammansatt produkt/parti
+StockDetailPerBatch=Detaljlager för parti
diff --git a/htdocs/langs/sv_SE/products.lang b/htdocs/langs/sv_SE/products.lang
index 99be210f9a4..874d88bb89f 100644
--- a/htdocs/langs/sv_SE/products.lang
+++ b/htdocs/langs/sv_SE/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=Nytt pris
 MinPrice=Min. selling price
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=Försäljningspriset kan inte vara lägre än lägsta tillåtna för denna bok (%s utan skatt)
 ContractStatusClosed=Stängt
 ErrorProductAlreadyExists=En produkt med hänvisning %s finns redan.
@@ -155,7 +156,7 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Supplier prices
 SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
-CustomCode=Customs/Commodity/HS code
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=Ursprungsland
 Nature=Naturen
 ShortLabel=Short label
diff --git a/htdocs/langs/sv_SE/projects.lang b/htdocs/langs/sv_SE/projects.lang
index 1f5e6c53466..a148b37b8ec 100644
--- a/htdocs/langs/sv_SE/projects.lang
+++ b/htdocs/langs/sv_SE/projects.lang
@@ -77,6 +77,7 @@ Time=Tid
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=Förteckning över de kommersiella förslag i samband med projektet
 ListOrdersAssociatedProject=List of customer orders associated with the project
@@ -226,4 +227,4 @@ AllowCommentOnProject=Allow user comments on projects
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/sv_SE/stocks.lang b/htdocs/langs/sv_SE/stocks.lang
index d83b16508fa..fe4312cf0bf 100644
--- a/htdocs/langs/sv_SE/stocks.lang
+++ b/htdocs/langs/sv_SE/stocks.lang
@@ -203,3 +203,4 @@ RegulateStock=Regulate Stock
 ListInventory=Lista
 StockSupportServices=Stock management support services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/sv_SE/stripe.lang b/htdocs/langs/sv_SE/stripe.lang
index 20a54652777..21135fec14b 100644
--- a/htdocs/langs/sv_SE/stripe.lang
+++ b/htdocs/langs/sv_SE/stripe.lang
@@ -58,8 +58,8 @@ NameOnCard=Name on card
 CardNumber=Card Number
 ExpiryDate=Expiry Date
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/sv_SE/supplier_proposal.lang b/htdocs/langs/sv_SE/supplier_proposal.lang
index 23ee7ed4f4a..7eb1a57df52 100644
--- a/htdocs/langs/sv_SE/supplier_proposal.lang
+++ b/htdocs/langs/sv_SE/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Supplier commercial proposals
-supplier_proposalDESC=Manage price requests to suppliers
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
 SupplierProposalNew=New price request
 CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
-SupplierProposalsDraft=Draft supplier proposals
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=Latest %s modified price requests
 RequestsOpened=Open price requests
-SupplierProposalArea=Supplier proposals area
-SupplierProposalShort=Supplier proposal
-SupplierProposals=Supplier proposals
-SupplierProposalsShort=Supplier proposals
+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=Supplier ref
+SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=Leveransdatum
 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>?
@@ -47,9 +47,9 @@ CommercialAsk=Price request
 DefaultModelSupplierProposalCreate=Skapa standardmodell
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposals=List of supplier proposal requests
-ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
-SupplierProposalsToClose=Supplier proposals to close
-SupplierProposalsToProcess=Supplier proposals to process
+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
diff --git a/htdocs/langs/sv_SE/suppliers.lang b/htdocs/langs/sv_SE/suppliers.lang
index af4b4cf2548..e05553c68f4 100644
--- a/htdocs/langs/sv_SE/suppliers.lang
+++ b/htdocs/langs/sv_SE/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Leverantörer
-SuppliersInvoice=Leverantörer faktura
-ShowSupplierInvoice=Show Supplier Invoice
-NewSupplier=Ny leverantör
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=Historia
-ListOfSuppliers=Lista över leverantörer
-ShowSupplier=Visa leverantör
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=Beställ datum
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Vissa under produkter har inget pris definierat
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
-SupplierPrices=Supplier prices
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Denna hänvisning leverantör är redan kopplad till en referens: %s
-NoRecordedSuppliers=Inga leverantörer registreras
-SupplierPayment=Leverantör betalning
-SuppliersArea=Leverantörer område
-RefSupplierShort=Ref. leverantör
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=Tillgänglighet
-ExportDataset_fournisseur_1=Leverantörsfakturor listan och fakturornas linjer
-ExportDataset_fournisseur_2=Leverantörsfakturor och betalningar
-ExportDataset_fournisseur_3=Leverantörs order och orderrader
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=Godkänna denna ordning
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
 ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
 ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
-AddSupplierOrder=Skapa leverantör för
-AddSupplierInvoice=Skapa leverantörsfaktura
-ListOfSupplierProductForSupplier=Förteckning över produkter och priser för leverantör <b>%s</b>
-SentToSuppliers=Skickas till leverantörer
-ListOfSupplierOrders=Lista över leverantörsorder
-MenuOrdersSupplierToBill=Leverantörs order att fakturera
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Leveransförsening, dagar
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-SupplierReputation=Supplier reputation
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
 AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=Supplier prices
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/sv_SE/website.lang b/htdocs/langs/sv_SE/website.lang
index a7bc45fbcdc..328a805b077 100644
--- a/htdocs/langs/sv_SE/website.lang
+++ b/htdocs/langs/sv_SE/website.lang
@@ -73,7 +73,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
diff --git a/htdocs/langs/sv_SE/workflow.lang b/htdocs/langs/sv_SE/workflow.lang
index f71639360d7..58a2eecb5bc 100644
--- a/htdocs/langs/sv_SE/workflow.lang
+++ b/htdocs/langs/sv_SE/workflow.lang
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source custome
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/sw_SW/accountancy.lang b/htdocs/langs/sw_SW/accountancy.lang
index c37db78c215..daa15928096 100644
--- a/htdocs/langs/sw_SW/accountancy.lang
+++ b/htdocs/langs/sw_SW/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Accounting
 ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
 ACCOUNTING_EXPORT_DATE=Date format for export file
 ACCOUNTING_EXPORT_PIECE=Export the number of piece
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Accounts with non zero values
 ListOfAccounts=List of accounts
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers 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
 
-AccountancyArea=Accountancy area
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
 AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
@@ -89,7 +90,7 @@ MenuProductsAccounts=Product accounts
 ProductsBinding=Products accounts
 Ventilation=Binding to accounts
 CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Supplier invoice binding
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
 ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
@@ -185,11 +187,12 @@ ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
-DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Group of account
 Pcgsubtype=Subgroup of account
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
 ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
 DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report 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 fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -293,4 +296,9 @@ Binded=Lines bound
 ToBind=Lines to bind
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/sw_SW/admin.lang b/htdocs/langs/sw_SW/admin.lang
index fed6af9a6fa..28eb076c540 100644
--- a/htdocs/langs/sw_SW/admin.lang
+++ b/htdocs/langs/sw_SW/admin.lang
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems)
 MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=Method to use to send EMails
 MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
 MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
@@ -291,7 +292,7 @@ ModuleSetup=Module setup
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projects/Collaborative work
@@ -373,7 +374,8 @@ NoSmsEngine=No SMS sender manager available. SMS sender manager are not installe
 PDF=PDF
 PDFDesc=You can set each global options related to the PDF generation
 PDFAddressForging=Rules to forge address boxes
-HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=Hide products description on generated PDF
@@ -445,7 +447,8 @@ DisplayCompanyInfo=Display company address
 DisplayCompanyManagers=Display manager names
 DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party 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.
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Set this to 1 if you want to attach main document to emai
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -479,7 +485,7 @@ Module1Desc=Companies and contact management (customers, prospects...)
 Module2Name=Commercial
 Module2Desc=Commercial management
 Module10Name=Accounting
-Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching.
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=Proposals
 Module20Desc=Commercial proposal management
 Module22Name=Mass E-mailings
@@ -546,8 +552,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
-Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Payment of employee wages
 Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
@@ -561,14 +567,14 @@ Module700Name=Donations
 Module700Desc=Donation management
 Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Mantis integration
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
 Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
 Module2200Name=Dynamic Prices
@@ -576,7 +582,7 @@ Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Scheduled jobs
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API/Web services (SOAP server)
@@ -613,7 +619,7 @@ Module50100Desc=Point of sales module (POS).
 Module50200Name=Paypal
 Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Poll, Survey or Vote
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed memb
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=Other menu entries manage optional parameters.
 LogEvents=Security audit events
 Audit=Audit
@@ -1054,8 +1060,9 @@ LogEventDesc=You can enable here the logging for Dolibarr security events. Admin
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1188,11 +1195,11 @@ UserMailRequired=EMail required to create a new user
 HRMSetup=HRM module setup
 ##### Company setup #####
 CompanySetup=Companies module setup
-CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier)
-AccountCodeManager=Module for accounting code generation (customer or supplier)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
 NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
 ModelModules=Documents templates
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
@@ -1203,6 +1210,9 @@ MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
 TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=Free text on commercial proposals
 WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
 ##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=Order management setup
 OrdersNumberingModules=Orders numbering models
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe
 OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
 OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
 ##### Stock #####
-StockSetup=Warehouse module setup
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
 ##### Menu #####
 MenuDeleted=Menu deleted
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
 MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
 SuppliersSetup=Supplier module setup
-SuppliersCommandModel=Complete template of supplier order (logo...)
-SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","
 SalariesSetup=Setup of module salaries
 SortOrder=Sort order
 Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Install of external module from applic
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
-TextTitleColor=Color of page title
+TextTitleColor=Text color of Page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=Background color for Top menu
 TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
 ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-MailToMember=To send email from member page
-MailToUser=To send email from user page
-MailToProject= To send email from project page
+MailToSendProposal=Customer proposals
+MailToSendOrder=Customer orders
+MailToSendInvoice=Customer invoices
+MailToSendShipment=Shipments
+MailToSendIntervention=Interventions
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Contracts
+MailToThirdparty=Third parties
+MailToMember=Members
+MailToUser=Users
+MailToProject=Projects page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1780,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/sw_SW/bills.lang b/htdocs/langs/sw_SW/bills.lang
index 5898daa72b0..2f029928beb 100644
--- a/htdocs/langs/sw_SW/bills.lang
+++ b/htdocs/langs/sw_SW/bills.lang
@@ -109,7 +109,7 @@ CancelBill=Cancel an invoice
 SendRemindByMail=Send reminder by EMail
 DoPayment=Enter payment
 DoPaymentBack=Enter refund
-ConvertToReduc=Convert into future discount
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
@@ -120,7 +120,7 @@ BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
 BillStatusPaid=Paid
-BillStatusPaidBackOrConverted=Credit note refund or converted into discount
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Abandoned
 BillStatusValidated=Validated (needs to be paid)
@@ -296,10 +296,10 @@ DiscountType=Discount type
 NoteReason=Note/Reason
 ReasonDiscount=Reason
 DiscountOfferedBy=Granted by
-DiscountStillRemaining=Discounts available
-DiscountAlreadyCounted=Discounts already consumed
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+SupplierDiscounts=Vendors discounts
 BillAddress=Bill address
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Every %s days
 FrequencyPer_m=Every %s months
 FrequencyPer_y=Every %s years
@@ -505,9 +511,14 @@ SituationAmount=Situation invoice amount(net)
 SituationDeduction=Situation subtraction
 ModifyAllLines=Modify all lines
 CreateNextSituationInvoice=Create next situation
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=S
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
 NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
@@ -532,3 +543,4 @@ AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/sw_SW/categories.lang b/htdocs/langs/sw_SW/categories.lang
index 41e5f4e4c13..c0c8d4c0cef 100644
--- a/htdocs/langs/sw_SW/categories.lang
+++ b/htdocs/langs/sw_SW/categories.lang
@@ -16,7 +16,7 @@ MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
-SubCats=Subcategories
+SubCats=Sub-categories
 CatList=List of tags/categories
 NewCategory=New tag/category
 ModifCat=Modify tag/category
@@ -85,3 +85,4 @@ CategorieRecursivHelp=If activated, product will also linked to parent category
 AddProductServiceIntoCategory=Add the following product/service
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
+ChooseCategory=Choose category
diff --git a/htdocs/langs/sw_SW/commercial.lang b/htdocs/langs/sw_SW/commercial.lang
index f6bfea9c0d3..efadc44d700 100644
--- a/htdocs/langs/sw_SW/commercial.lang
+++ b/htdocs/langs/sw_SW/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=Close
 ActionAC_EMAILING=Send mass email
 ActionAC_COM=Send customer order by mail
 ActionAC_SHIP=Send shipping by mail
-ActionAC_SUP_ORD=Send supplier order by mail
-ActionAC_SUP_INV=Send supplier invoice by mail
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=Other
 ActionAC_OTH_AUTO=Automatically inserted events
 ActionAC_MANUAL=Manually inserted events
diff --git a/htdocs/langs/sw_SW/companies.lang b/htdocs/langs/sw_SW/companies.lang
index 3473667fe55..b3e1e7b6c86 100644
--- a/htdocs/langs/sw_SW/companies.lang
+++ b/htdocs/langs/sw_SW/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Are you sure you want to delete this contact and all inheri
 MenuNewThirdParty=New third party
 MenuNewCustomer=New customer
 MenuNewProspect=New prospect
-MenuNewSupplier=New supplier
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=New private individual
-NewCompany=New company (prospect, customer, supplier)
-NewThirdParty=New third party (prospect, customer, supplier)
-CreateDolibarrThirdPartySupplier=Create a third party (supplier)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=Create third party
 CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Prospection area
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=Prospects
 ThirdPartyCustomers=Customers
 ThirdPartyCustomersStats=Customers
 ThirdPartyCustomersWithIdProf12=Customers with %s or %s
-ThirdPartySuppliers=Suppliers
+ThirdPartySuppliers=Vendors
 ThirdPartyType=Third party type
 Individual=Private individual
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
@@ -77,11 +77,11 @@ Web=Web
 Poste= Position
 DefaultLang=Language by default
 VATIsUsed=Sales tax is used
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
-ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Proposals
 OverAllOrders=Orders
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=RE Type
 TypeLocaltax2ES=IRPF Type
 WrongCustomerCode=Customer code invalid
-WrongSupplierCode=Supplier code invalid
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Customer code model
-SupplierCodeModel=Supplier code model
+SupplierCodeModel=Vendor code model
 Gencod=Bar code
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
@@ -267,7 +267,7 @@ Prospect=Prospect
 CustomerCard=Customer Card
 Customer=Customer
 CustomerRelativeDiscount=Relative customer discount
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=Relative discount
 CustomerAbsoluteDiscountShort=Absolute discount
 CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this suppl
 CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
 CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
 CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=None
 Supplier=Supplier
 AddContact=Create contact
@@ -304,13 +304,13 @@ DeleteACompany=Delete a company
 PersonalInformations=Personal data
 AccountancyCode=Accounting account
 CustomerCode=Customer code
-SupplierCode=Supplier code
+SupplierCode=Vendor code
 CustomerCodeShort=Customer code
-SupplierCodeShort=Supplier code
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=Customer code, unique for all customers
-SupplierCodeDesc=Supplier code, unique for all suppliers
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=Required if third party is a customer or prospect
-RequiredIfSupplier=Required if third party is a supplier
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=Validity controled by module
 ThisIsModuleRules=This is rules for this module
 ProspectToContact=Prospect to contact
@@ -338,7 +338,7 @@ MyContacts=My contacts
 Capital=Capital
 CapitalOf=Capital of %s
 EditCompany=Edit company
-ThisUserIsNot=This user is not a prospect, customer nor supplier
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=Check
 VATIntraCheckDesc=The link <b>%s</b> allows to ask the european VAT checker service. An external internet access from server is required for this service to work.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -396,7 +396,7 @@ ImportDataset_company_4=Third parties/Sales representatives (Assign sales repres
 PriceLevel=Price level
 DeliveryAddress=Delivery address
 AddAddress=Add address
-SupplierCategory=Supplier category
+SupplierCategory=Vendor category
 JuridicalStatus200=Independent
 DeleteFile=Delete file
 ConfirmDeleteFile=Are you sure you want to delete this file?
@@ -406,7 +406,7 @@ FiscalYearInformation=Information on the fiscal year
 FiscalMonthStart=Starting month of the fiscal year
 YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
 YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
-ListSuppliersShort=List of suppliers
+ListSuppliersShort=List of vendors
 ListProspectsShort=List of prospects
 ListCustomersShort=List of customers
 ThirdPartiesArea=Third parties and contact area
@@ -420,7 +420,7 @@ CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/sw_SW/compta.lang b/htdocs/langs/sw_SW/compta.lang
index cda96a546b8..d2cfb714900 100644
--- a/htdocs/langs/sw_SW/compta.lang
+++ b/htdocs/langs/sw_SW/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=Net paid
 VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
-VATSummary=Tax Balance
+VATSummary=Tax monthly
+VATBalance=Tax Balance
 VATPaid=Tax paid
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=Accountancy/Treasury area
 NewPayment=New payment
 Payments=Payments
 PaymentCustomerInvoice=Customer invoice payment
-PaymentSupplierInvoice=Supplier invoice payment
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
-ListOfSupplierPayments=List of supplier payments
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -110,7 +111,7 @@ ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
 CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
 SupplierAccountancyCodeShort=Sup. account. code
 AccountNumber=Account number
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
 Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
-ByProductsAndServices=By products and services
+ByProductsAndServices=By product and service
 RefExt=External ref
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
 LinkedOrder=Link to order
@@ -215,7 +218,8 @@ Mode1=Method 1
 Mode2=Method 2
 CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
 CalculationRuleDescSupplier=According to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
@@ -242,3 +246,10 @@ FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/sw_SW/dict.lang b/htdocs/langs/sw_SW/dict.lang
index ca0c61a9cbc..61a7237f472 100644
--- a/htdocs/langs/sw_SW/dict.lang
+++ b/htdocs/langs/sw_SW/dict.lang
@@ -5,7 +5,8 @@ CountryIT=Italy
 CountryES=Spain
 CountryDE=Germany
 CountryCH=Switzerland
-CountryGB=Great Britain
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=United Kingdom
 CountryUK=United Kingdom
 CountryIE=Ireland
 CountryCN=China
diff --git a/htdocs/langs/sw_SW/ecm.lang b/htdocs/langs/sw_SW/ecm.lang
index 65e9b17bdb2..5200fa30b1d 100644
--- a/htdocs/langs/sw_SW/ecm.lang
+++ b/htdocs/langs/sw_SW/ecm.lang
@@ -39,9 +39,10 @@ ShowECMSection=Show directory
 DeleteSection=Remove directory
 ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
 ECMDirectoryForFiles=Relative directory for files
-CannotRemoveDirectoryContainsFiles=Removed not possible because it contains some files
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=File manager
-ECMSelectASection=Select a directory on left tree...
+ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
diff --git a/htdocs/langs/sw_SW/errors.lang b/htdocs/langs/sw_SW/errors.lang
index ec036b28bc5..0ca7488b8cb 100644
--- a/htdocs/langs/sw_SW/errors.lang
+++ b/htdocs/langs/sw_SW/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Bar code required
 ErrorCustomerCodeAlreadyUsed=Customer code already used
 ErrorBarCodeAlreadyUsed=Bar code already used
 ErrorPrefixRequired=Prefix required
-ErrorBadSupplierCodeSyntax=Bad syntax for supplier code
-ErrorSupplierCodeRequired=Supplier code required
-ErrorSupplierCodeAlreadyUsed=Supplier code already used
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Bad parameters
 ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
 ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
@@ -87,7 +87,7 @@ ErrorsOnXLines=Errors on <b>%s</b> source record(s)
 ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
 ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s"
 ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
-ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Error on mask
 ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
-ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
diff --git a/htdocs/langs/sw_SW/install.lang b/htdocs/langs/sw_SW/install.lang
index e602c54640c..587d4f83da6 100644
--- a/htdocs/langs/sw_SW/install.lang
+++ b/htdocs/langs/sw_SW/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not
 ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
 ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be granted to be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reload all information from configuration file.
 PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
 WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called <b>install.lock</b> into Dolibarr document directory, in order to avoid malicious use of it.
 FunctionNotAvailableInThisPHP=Not available on this PHP
 ChoosedMigrateScript=Choose migration script
-DataMigration=Data migration
-DatabaseMigration=Structure database migration
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script processing
 ChooseYourSetupMode=Choose your setup mode and click "Start"...
 FreshInstall=Fresh install
@@ -146,7 +147,7 @@ NothingToDo=Nothing to do
 # upgrade
 MigrationFixData=Fix for denormalized data
 MigrationOrder=Data migration for customer's orders
-MigrationSupplierOrder=Data migration for supplier's orders
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Data migration for commercial proposals
 MigrationInvoice=Data migration for customer's invoices
 MigrationContract=Data migration for contracts
@@ -196,6 +197,8 @@ MigrationEvents=Migration of events to add event owner into assignement table
 MigrationEventsContact=Migration of events to add event contact into assignement table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 ShowNotAvailableOptions=Show not available options
diff --git a/htdocs/langs/sw_SW/ldap.lang b/htdocs/langs/sw_SW/ldap.lang
index d6360f3e540..abe11602147 100644
--- a/htdocs/langs/sw_SW/ldap.lang
+++ b/htdocs/langs/sw_SW/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Password for domain
 YouMustChangePassNextLogon=Password for user <b>%s</b> on the domain <b>%s</b> must be changed.
 UserMustChangePassNextLogon=User must change password on the domain %s
 LDAPInformationsForThisContact=Information in LDAP database for this contact
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Member type synchronized
 ContactSynchronized=Contact synchronized
 ForceSynchronize=Force synchronizing Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Failed to read LDAP database. Check LDAP module setup and database accessibility.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/sw_SW/loan.lang b/htdocs/langs/sw_SW/loan.lang
index 9aae3869cc3..534dee08867 100644
--- a/htdocs/langs/sw_SW/loan.lang
+++ b/htdocs/langs/sw_SW/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=Capital
 Insurance=Insurance
 Interest=Interest
 Nbterms=Number of terms
+Term=Term
 LoanAccountancyCapitalCode=Accounting account capital
 LoanAccountancyInsuranceCode=Accounting account insurance
 LoanAccountancyInterestCode=Accounting account interest
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=Confirm deleting this loan
 LoanDeleted=Loan Deleted Successfully
 ConfirmPayLoan=Confirm classify paid this loan
 LoanPaid=Loan Paid
-# Calc
-LoanCalc=Bank Loans Calculator
-PurchaseFinanceInfo=Purchase & Financing Information
-SalePriceOfAsset=Sale Price of Asset
-PercentageDown=Percentage Down
-LengthOfMortgage=Duration of loan
-AnnualInterestRate=Annual Interest Rate
-ExplainCalculations=Explain Calculations
-ShowMeCalculationsAndAmortization=Show me the calculations and amortization
-MortgagePaymentInformation=Mortgage Payment Information
-DownPayment=Down Payment
-DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
-InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
-MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
-MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
-MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
-MonthlyPaymentDesc=The montly payment is figured out using the following formula
-AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
-AmountFinanced=Amount Financed
-AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
-Totalsforyear=Totals for year
-MonthlyPayment=Monthly Payment
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
-GoToInterest=%s will go towards INTEREST
-GoToPrincipal=%s will go towards PRINCIPAL
-YouWillSpend=You will spend %s in year %s
 ListLoanAssociatedProject=List of loan associated with the project
 AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Interest
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-FinancialCommitment=Financial commitment
 CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/langs/sw_SW/mails.lang b/htdocs/langs/sw_SW/mails.lang
index cedcd01066b..2313910de93 100644
--- a/htdocs/langs/sw_SW/mails.lang
+++ b/htdocs/langs/sw_SW/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Sender
 MailErrorsTo=Errors to
 MailReply=Reply to
 MailTo=Receiver(s)
+MailToUsers=To user(s)
 MailCC=Copy to
+MailToCCUsers=Copy to users(s)
 MailCCC=Cached copy to
 MailTopic=EMail topic
 MailText=Message
@@ -164,4 +166,4 @@ InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/sw_SW/main.lang b/htdocs/langs/sw_SW/main.lang
index 35d3774700f..afd0a77a87f 100644
--- a/htdocs/langs/sw_SW/main.lang
+++ b/htdocs/langs/sw_SW/main.lang
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is se
 Administrator=Administrator
 Undefined=Undefined
 PasswordForgotten=Password forgotten?
+NoAccount=No account?
 SeeAbove=See above
 HomeArea=Home area
 LastConnexion=Latest connection
@@ -231,7 +232,7 @@ Limit=Limit
 Limits=Limits
 Logout=Logout
 NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Connection
+Connection=Login
 Setup=Setup
 Alert=Alert
 MenuWarnings=Alerts
@@ -402,6 +403,7 @@ DefaultTaxRate=Default tax rate
 Average=Average
 Sum=Sum
 Delta=Delta
+RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
@@ -414,7 +416,7 @@ Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
 ExternalRef=Ref. extern
-RefSupplier=Ref. supplier
+RefSupplier=Ref. vendor
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
 Comment=Comment
@@ -493,7 +495,7 @@ Received=Received
 Paid=Paid
 Topic=Subject
 ByCompanies=By third parties
-ByUsers=By users
+ByUsers=By user
 Links=Links
 Link=Link
 Rejects=Rejects
@@ -619,9 +621,9 @@ BuildDoc=Build Doc
 Entity=Environment
 Entities=Entities
 CustomerPreview=Customer preview
-SupplierPreview=Supplier preview
+SupplierPreview=Vendor preview
 ShowCustomerPreview=Show customer preview
-ShowSupplierPreview=Show supplier preview
+ShowSupplierPreview=Show vendor preview
 RefCustomer=Ref. customer
 Currency=Currency
 InfoAdmin=Information for administrators
@@ -679,7 +681,7 @@ Color=Color
 Documents=Linked files
 Documents2=Documents
 UploadDisabled=Upload disabled
-MenuAccountancy=Accountancy
+MenuAccountancy=Accounting
 MenuECM=Documents
 MenuAWStats=AWStats
 MenuMembers=Members
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=Products or services
 SearchIntoProjects=Projects
 SearchIntoTasks=Tasks
 SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Interventions
 SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
@@ -941,3 +943,5 @@ Remote=Remote
 LocalAndRemote=Local and Remote
 KeyboardShortcut=Keyboard shortcut
 AssignedTo=Assigned to
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/sw_SW/margins.lang b/htdocs/langs/sw_SW/margins.lang
index 9f590ef3718..b9d52dcfdc6 100644
--- a/htdocs/langs/sw_SW/margins.lang
+++ b/htdocs/langs/sw_SW/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=As a service
 UseDiscountOnTotal=On subtotal
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
 MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best supplier price
+MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Cost price
 UnitCharges=Unit charges
 Charges=Charges
diff --git a/htdocs/langs/sw_SW/members.lang b/htdocs/langs/sw_SW/members.lang
index 7326f3b9950..b29477e346d 100644
--- a/htdocs/langs/sw_SW/members.lang
+++ b/htdocs/langs/sw_SW/members.lang
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
diff --git a/htdocs/langs/sw_SW/opensurvey.lang b/htdocs/langs/sw_SW/opensurvey.lang
index 87e6a74913a..76684955e56 100644
--- a/htdocs/langs/sw_SW/opensurvey.lang
+++ b/htdocs/langs/sw_SW/opensurvey.lang
@@ -58,3 +58,4 @@ MoreChoices=Enter more choices for the voters
 SurveyExpiredInfo=The poll has been closed or voting delay has expired.
 EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
 ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/sw_SW/orders.lang b/htdocs/langs/sw_SW/orders.lang
index 8de0279be44..1b36a25df66 100644
--- a/htdocs/langs/sw_SW/orders.lang
+++ b/htdocs/langs/sw_SW/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Customers orders area
-SuppliersOrdersArea=Suppliers orders area
+SuppliersOrdersArea=Purchase orders area
 OrderCard=Order card
 OrderId=Order Id
 Order=Order
@@ -13,18 +13,18 @@ OrderToProcess=Order to process
 NewOrder=New order
 ToOrder=Make order
 MakeOrder=Make order
-SupplierOrder=Supplier order
-SuppliersOrders=Suppliers orders
-SuppliersOrdersRunning=Current suppliers orders
-CustomerOrder=Customer order
-CustomersOrders=Customer orders
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=Customer Order
+CustomersOrders=Customer Orders
 CustomersOrdersRunning=Current customer orders
 CustomersOrdersAndOrdersLines=Customer orders and order lines
 OrdersDeliveredToBill=Customer orders delivered to bill
 OrdersToBill=Customer orders delivered
 OrdersInProcess=Customer orders in process
 OrdersToProcess=Customer orders to process
-SuppliersOrdersToProcess=Supplier orders to process
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=Canceled
 StatusOrderDraftShort=Draft
 StatusOrderValidatedShort=Validated
@@ -75,15 +75,15 @@ ShowOrder=Show order
 OrdersOpened=Orders to process
 NoDraftOrders=No draft orders
 NoOrder=No order
-NoSupplierOrder=No supplier order
+NoSupplierOrder=No purchase order
 LastOrders=Latest %s customer orders
 LastCustomerOrders=Latest %s customer orders
-LastSupplierOrders=Latest %s supplier orders
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=Latest %s modified orders
 AllOrders=All orders
 NbOfOrders=Number of orders
 OrdersStatistics=Order's statistics
-OrdersStatisticsSuppliers=Supplier order's statistics
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Number of orders by month
 AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
 ListOfOrders=List of orders
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</
 GenerateBill=Generate invoice
 ClassifyShipped=Classify delivered
 DraftOrders=Draft orders
-DraftSuppliersOrders=Draft suppliers orders
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=In process orders
 RefOrder=Ref. order
 RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for supplier
-RefOrderSupplierShort=Ref. order supplier
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=Send order by mail
 ActionsOnOrder=Events on order
 NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
 DispatchSupplierOrder=Receiving supplier order %s
 FirstApprovalAlreadyDone=First approval already done
 SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=Supplier order %s received %s
-SupplierOrderSubmitedInDolibarr=Supplier order %s submited
-SupplierOrderClassifiedBilled=Supplier order %s set billed
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Other orders
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
@@ -125,11 +125,11 @@ TypeContact_commande_internal_SHIPPING=Representative following-up shipping
 TypeContact_commande_external_BILLING=Customer invoice contact
 TypeContact_commande_external_SHIPPING=Customer shipping contact
 TypeContact_commande_external_CUSTOMER=Customer contact following-up order
-TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
-TypeContact_order_supplier_external_BILLING=Supplier invoice contact
-TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact
-TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
 Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
 Error_OrderNotChecked=No orders to invoice selected
diff --git a/htdocs/langs/sw_SW/other.lang b/htdocs/langs/sw_SW/other.lang
index 2afabe43b06..13907ca380e 100644
--- a/htdocs/langs/sw_SW/other.lang
+++ b/htdocs/langs/sw_SW/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=Files is too big
 PleaseBePatient=Please be patient...
 NewPassword=New password
 ResetPassword=Reset password
-RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
@@ -233,6 +233,8 @@ PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=Exports area
 AvailableFormats=Available formats
diff --git a/htdocs/langs/sw_SW/productbatch.lang b/htdocs/langs/sw_SW/productbatch.lang
index 1c2d22395ce..54270c4a23b 100644
--- a/htdocs/langs/sw_SW/productbatch.lang
+++ b/htdocs/langs/sw_SW/productbatch.lang
@@ -16,7 +16,7 @@ printEatby=Eat-by: %s
 printSellby=Sell-by: %s
 printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic increase/decrease stock mode is forced to shipping validate and manual dispatching for reception and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
 ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
diff --git a/htdocs/langs/sw_SW/products.lang b/htdocs/langs/sw_SW/products.lang
index b9ebefc91c9..72e717367fc 100644
--- a/htdocs/langs/sw_SW/products.lang
+++ b/htdocs/langs/sw_SW/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
 MinPrice=Min. selling price
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
 ContractStatusClosed=Closed
 ErrorProductAlreadyExists=A product with reference %s already exists.
@@ -155,7 +156,7 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Supplier prices
 SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
-CustomCode=Customs/Commodity/HS code
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
 Nature=Nature
 ShortLabel=Short label
diff --git a/htdocs/langs/sw_SW/projects.lang b/htdocs/langs/sw_SW/projects.lang
index 319a6e7e0e2..e04f28689a1 100644
--- a/htdocs/langs/sw_SW/projects.lang
+++ b/htdocs/langs/sw_SW/projects.lang
@@ -77,6 +77,7 @@ Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer orders associated with the project
@@ -226,4 +227,4 @@ AllowCommentOnProject=Allow user comments on projects
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/sw_SW/stocks.lang b/htdocs/langs/sw_SW/stocks.lang
index 7fbe2f6b82a..aaa7e21fc0d 100644
--- a/htdocs/langs/sw_SW/stocks.lang
+++ b/htdocs/langs/sw_SW/stocks.lang
@@ -203,3 +203,4 @@ RegulateStock=Regulate Stock
 ListInventory=List
 StockSupportServices=Stock management support services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/sw_SW/suppliers.lang b/htdocs/langs/sw_SW/suppliers.lang
index f9e383e09af..d0cf540d3eb 100644
--- a/htdocs/langs/sw_SW/suppliers.lang
+++ b/htdocs/langs/sw_SW/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Suppliers
-SuppliersInvoice=Suppliers invoice
-ShowSupplierInvoice=Show Supplier Invoice
-NewSupplier=New supplier
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=History
-ListOfSuppliers=List of suppliers
-ShowSupplier=Show supplier
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=Order date
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
-SupplierPrices=Supplier prices
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
-NoRecordedSuppliers=No suppliers recorded
-SupplierPayment=Supplier payment
-SuppliersArea=Suppliers area
-RefSupplierShort=Ref. supplier
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=Availability
-ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
-ExportDataset_fournisseur_2=Supplier invoices and payments
-ExportDataset_fournisseur_3=Supplier orders and order lines
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=Approve this order
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
 ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
 ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
-AddSupplierOrder=Create supplier order
-AddSupplierInvoice=Create supplier invoice
-ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
-SentToSuppliers=Sent to suppliers
-ListOfSupplierOrders=List of supplier orders
-MenuOrdersSupplierToBill=Supplier orders to invoice
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-SupplierReputation=Supplier reputation
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
 AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=Supplier prices
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/sw_SW/workflow.lang b/htdocs/langs/sw_SW/workflow.lang
index a50bd91595b..783373ad66d 100644
--- a/htdocs/langs/sw_SW/workflow.lang
+++ b/htdocs/langs/sw_SW/workflow.lang
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source custome
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/th_TH/accountancy.lang b/htdocs/langs/th_TH/accountancy.lang
index d98c15c45c2..0fb637c6cb8 100644
--- a/htdocs/langs/th_TH/accountancy.lang
+++ b/htdocs/langs/th_TH/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=การบัญชี
 ACCOUNTING_EXPORT_SEPARATORCSV=คั่นคอลัมน์สำหรับแฟ้มส่งออก
 ACCOUNTING_EXPORT_DATE=รูปแบบวันที่สำหรับไฟล์การส่งออก
 ACCOUNTING_EXPORT_PIECE=Export the number of piece
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Accounts with non zero values
 ListOfAccounts=List of accounts
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers 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
 
-AccountancyArea=Accountancy area
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
 AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
@@ -89,7 +90,7 @@ MenuProductsAccounts=Product accounts
 ProductsBinding=Products accounts
 Ventilation=Binding to accounts
 CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Supplier invoice binding
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=วารสารการสั่งซื้อ
 ACCOUNTING_MISCELLANEOUS_JOURNAL=วารสารเบ็ดเตล็ด
 ACCOUNTING_EXPENSEREPORT_JOURNAL=รายงานค่าใช้จ่ายวารสาร
 ACCOUNTING_SOCIAL_JOURNAL=วารสารสังคม
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
 ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
@@ -185,11 +187,12 @@ ListeMvts=List of movements
 ErrorDebitCredit=เดบิตและเครดิตไม่สามารถมีค่าในเวลาเดียวกัน
 AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
-DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=รายการบัญชีที่บัญชี
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Group of account
 Pcgsubtype=Subgroup of account
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
 ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=ให้คำปรึกษาที่นี่รายชื่อของเส้นของผู้จัดจำหน่ายใบแจ้งหนี้และบัญชีบัญชีของพวกเขา
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
 DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report 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 fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=ข้อผิดพลาดที่คุณไม่สามารถลบบัญชีบัญชีนี้เพราะมันถูกนำมาใช้
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -293,4 +296,9 @@ Binded=Lines bound
 ToBind=Lines to bind
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang
index 0990b179628..5d00a2bfb2f 100644
--- a/htdocs/langs/th_TH/admin.lang
+++ b/htdocs/langs/th_TH/admin.lang
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=SMTP / SMTPS โฮสต์ (โดยค่าเริ
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP / SMTPS พอร์ต (ไม่กำหนดเข้า PHP บนระบบปฏิบัติการยูนิกซ์เช่นระบบ)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPS โฮสต์ (ไม่กำหนดเข้า PHP บนระบบปฏิบัติการยูนิกซ์เช่นระบบ)
 MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= ส่งระบบคาร์บอนสำเนาซ่อนของอีเมลที่ส่งไปทั้งหมด
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=วิธีการที่จะใช้ในการส่งอีเมล
 MAIN_MAIL_SMTPS_ID=ID SMTP หากตร​​วจสอบที่จำเป็น
 MAIN_MAIL_SMTPS_PW=รหัสผ่าน SMTP หากตร​​วจสอบที่จำเป็น
@@ -291,7 +292,7 @@ ModuleSetup=การติดตั้งโมดูล
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=ระบบ
 ModuleFamilyCrm=การบริหารลูกค้าสัมพันธ์ (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=โครงการ / ทำงานร่วมกัน
@@ -373,7 +374,8 @@ NoSmsEngine=ไม่มีผู้จัดการผู้ส่ง SMS ท
 PDF=รูปแบบไฟล์ PDF
 PDFDesc=คุณสามารถตั้งค่าตัวเลือกในแต่ละระดับโลกที่เกี่ยวข้องกับการสร้างรูปแบบไฟล์ PDF
 PDFAddressForging=กฎการปลอมกล่องที่อยู่
-HideAnyVATInformationOnPDF=ซ่อนข้อมูลทั้งหมดที่เกี่ยวข้องกับภาษีมูลค่าเพิ่มในการสร้างรูปแบบไฟล์ PDF
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=ซ่อนรายละเอียดผลิตภัณฑ์ที่เกี่ยวกับการสร้างรูปแบบไฟล์ PDF
@@ -445,7 +447,8 @@ DisplayCompanyInfo=Display company address
 DisplayCompanyManagers=Display manager names
 DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party 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.
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Set this to 1 if you want to attach main document to emai
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=และกลุ่มผู้ใช้
 Module0Desc=Users / Employees and Groups management
@@ -479,7 +485,7 @@ Module1Desc=บริษัท และการจัดการรายช
 Module2Name=เชิงพาณิชย์
 Module2Desc=การจัดการเชิงพาณิชย์
 Module10Name=การบัญชี
-Module10Desc=รายงานบัญชีง่าย (วารสารหมุนเวียน) ตามไปยังเนื้อหาของฐานข้อมูล ไม่มีการฝึกอบรม
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=ข้อเสนอ
 Module20Desc=การจัดการข้อเสนอในเชิงพาณิชย์
 Module22Name=E-จดหมายจำนวนมาก
@@ -546,8 +552,8 @@ Module400Name=โครงการ / โอกาส / นำ
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=บูรณาการ Webcalendar
-Module500Name=ค่าใช้จ่ายพิเศษ
-Module500Desc=การบริหารจัดการค่าใช้จ่ายพิเศษ (ภาษีภาษีสังคมหรือการเงินการจ่ายเงินปันผล)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Payment of employee wages
 Module510Desc=Record and follow payment of your employee wages
 Module520Name=เงินกู้
@@ -561,14 +567,14 @@ Module700Name=การบริจาค
 Module700Desc=การจัดการการบริจาค
 Module770Name=รายงานค่าใช้จ่าย
 Module770Desc=การบริหารจัดการและการเรียกร้องรายงานค่าใช้จ่าย (การขนส่ง, อาหาร, ... )
-Module1120Name=ข้อเสนอในเชิงพาณิชย์ผู้ผลิต
-Module1120Desc=ขอข้อเสนอในเชิงพาณิชย์ผู้จัดจำหน่ายและราคา
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=ตั๊กแตนตำข้าว
 Module1200Desc=บูรณาการตั๊กแตนตำข้าว
 Module1520Name=การสร้างเอกสาร
 Module1520Desc=สร้างเอกสารอีเมล์จำนวนมาก
 Module1780Name=แท็ก / หมวดหมู่
-Module1780Desc=สร้างแท็ก / หมวดหมู่ (ผลิตภัณฑ์ลูกค้าซัพพลายเออร์รายชื่อหรือสมาชิก)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=แก้ไขแบบ WYSIWYG
 Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
 Module2200Name=ราคาแบบไดนามิก
@@ -576,7 +582,7 @@ Module2200Desc=เปิดใช้งานการใช้งานขอ
 Module2300Name=งานที่กำหนดเวลาไว้
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API/Web services (SOAP server)
@@ -613,7 +619,7 @@ Module50100Desc=Point of sales module (POS).
 Module50200Name=Paypal
 Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 Module50400Name=บัญชี (ขั้นสูง)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=PrintIPP
 Module54000Desc=พิมพ์โดยตรง (โดยไม่ต้องเปิดเอกสาร) โดยใช้อินเตอร์เฟซถ้วยไอพีพี (เครื่องพิมพ์จะต้องมองเห็นจากเซิร์ฟเวอร์และ CUPS จะต้อง installe บนเซิร์ฟเวอร์)
 Module55000Name=Poll, Survey or Vote
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=ความล่าช้าความอดทน
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=ความล่าช้าความอดทน (ในวัน) ก่อนที่จะแจ้งเตือนสำหรับการฝากเงินการตรวจสอบที่จะทำ
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=รายการเมนูอื่น ๆ จัดการพารามิเตอร์ที่ไม่จำเป็น
 LogEvents=ตรวจสอบเหตุการณ์การรักษาความปลอดภัย
 Audit=การตรวจสอบบัญชี
@@ -1054,8 +1060,9 @@ LogEventDesc=คุณสามารถเปิดใช้การเข้
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=ข้อมูลระบบข้อมูลทางด้านเทคนิคอื่น ๆ ที่คุณได้รับในโหมดอ่านอย่างเดียวและมองเห็นสำหรับผู้ดูแลระบบเท่านั้น
 SystemAreaForAdminOnly=บริเวณนี้เป็นที่ใช้ได้สำหรับผู้ใช้ผู้ดูแลระบบเท่านั้น ไม่มีสิทธิ์ Dolibarr สามารถลดขีด จำกัด นี้
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=คุณสามารถเลือกแต่ละพารามิเตอร์ที่เกี่ยวข้องกับ Dolibarr มองและความรู้สึกที่นี่
 AvailableModules=Available app/modules
 ToActivateModule=เพื่อเปิดใช้งานโมดูลไปในพื้นที่การติดตั้ง (หน้าแรก> Setup-> โมดูล)
@@ -1188,11 +1195,11 @@ UserMailRequired=อีเมลที่จำเป็นในการสร
 HRMSetup=HRM module setup
 ##### Company setup #####
 CompanySetup=บริษัท ติดตั้งโมดูล
-CompanyCodeChecker=Module สำหรับการสร้างรหัสบุคคลที่สามและการตรวจสอบ (ลูกค้าหรือผู้จัดจำหน่าย)
-AccountCodeManager=Module for accounting code generation (customer or supplier)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
 NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
 ModelModules=แม่แบบเอกสาร
 DocumentModelOdt=เอกสารที่สร้างจากแม่แบบ OpenDocuments (.odt หรือไฟล์ .ods สำหรับ OpenOffice, KOffice, TextEdit, ... )
@@ -1203,6 +1210,9 @@ MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
 TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=<b>การเชื่อมโยงการส่งออกไปยังรูปแบบ% s</b> สามารถดูได้ที่ลิงค์ต่อไปนี้:% s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=ข้อความฟรีเกี่ยวกั
 WatermarkOnDraftProposal=ลายน้ำในร่างข้อเสนอในเชิงพาณิชย์ (ไม่มีถ้าว่างเปล่า)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=ขอปลายทางบัญชีธนาคารของข้อเสนอ
 ##### SupplierProposal #####
-SupplierProposalSetup=ราคาขอซัพพลายเออร์ที่ติดตั้งโมดูล
-SupplierProposalNumberingModules=ราคาผู้ผลิตร้องขอหมายเลขรุ่น
-SupplierProposalPDFModules=ราคาขอซัพพลายเออร์รูปแบบเอกสาร
-FreeLegalTextOnSupplierProposal=ข้อความฟรีในราคาผู้ผลิตร้องขอ
-WatermarkOnDraftSupplierProposal=ลายน้ำราคาร่างซัพพลายเออร์ขอ (ไม่เลยถ้าว่างเปล่า)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=ขอบัญชีธนาคารปลายทางของการร้องขอราคา
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=การตั้งค่าการจัดการการสั่งซื้อ
 OrdersNumberingModules=สั่งซื้อจำนวนรุ่น
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=เชื่อมต่อกับเซิร์ฟเวอ
 OSCommerceTestKo1=เชื่อมต่อกับเซิร์ฟเวอร์ '% s' ประสบความสำเร็จ แต่ฐานข้อมูล '% s' ไม่สามารถเข้าถึงได้
 OSCommerceTestKo2=เชื่อมต่อกับเซิร์ฟเวอร์ '% s' กับผู้ใช้ '% s' ล้มเหลว
 ##### Stock #####
-StockSetup=โกดังสินค้าติดตั้งโมดูล
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=ถ้าคุณใช้โมดูลจุดขาย (POS ให้โมดูลโดยค่าเริ่มต้นหรือโมดูลภายนอกอื่น) การตั้งค่านี้อาจได้รับการปฏิเสธโดยจุดขายของโมดูล จุดส่วนใหญ่ของโมดูลการขายได้รับการออกแบบเพื่อสร้างทันทีใบแจ้งหนี้และลดหุ้นโดยเริ่มต้นสิ่งที่เป็นตัวเลือกที่นี่ ดังนั้นถ้าคุณต้องการหรือไม่ที่จะมีการลดลงของหุ้นเมื่อลงทะเบียนขายจากจุดขายของคุณให้ตรวจสอบยังโมดูล POS ของคุณตั้งค่า
 ##### Menu #####
 MenuDeleted=เมนูลบ
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
 MultiCompanySetup=หลาย บริษัท ติดตั้งโมดูล
 ##### Suppliers #####
 SuppliersSetup=ผู้ผลิตติดตั้งโมดูล
-SuppliersCommandModel=แม่แบบที่สมบูรณ์ของคำสั่งผู้จัดจำหน่าย (โลโก้ ... )
-SuppliersInvoiceModel=แม่แบบที่สมบูรณ์ของใบแจ้งหนี้จัดจำหน่าย (โลโก้ ... )
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=ผู้ผลิตใบแจ้งหนี้เลขรุ่น
 IfSetToYesDontForgetPermission=หากการตั้งค่าใช่ไม่ลืมที่จะให้สิทธิ์กับกลุ่มหรือผู้ใช้ที่ได้รับอนุญาตให้ได้รับการอนุมัติที่สอง
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=อย่าใช้ตัวอักษรที่
 SalariesSetup=การติดตั้งโมดูลของเงินเดือน
 SortOrder=การเรียงลำดับการสั่งซื้อ
 Format=รูป
-TypePaymentDesc=0: ประเภทการชำระเงินของลูกค้าที่ 1: ประเภทการชำระเงินผู้ผลิต, 2: ทั้งลูกค้าและซัพพลายเออประเภทการชำระเงิน
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=รวมถึงเส้นทาง (ตามที่กำหนดลงในตัวแปร s%)
 ExpenseReportsSetup=การติดตั้งโมดูลรายงานค่าใช้จ่าย
 TemplatePDFExpenseReports=เอกสารแม่แบบในการสร้างเอกสารรายงานค่าใช้จ่าย
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=ติดตั้งโมดูล
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=เน้นเส้นตารางเมื่อเลื่อนเมาส์ผ่านไป
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
-TextTitleColor=Color of page title
+TextTitleColor=Text color of Page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=สีพื้นหลังสำหรับเมน
 TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=สีพื้นหลังสำหรับเมนูด้านซ้าย
 BackgroundTableTitleColor=Background color for Table title line
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=สีพื้นหลังสำหรับสายตารางแปลก
 BackgroundTableLineEvenColor=สีพื้นหลังสำหรับแม้แต่เส้นตาราง
 MinimumNoticePeriod=ระยะเวลาการแจ้งให้ทราบล่วงหน้าขั้นต่ำ (ตามคำขอลาของคุณจะต้องทำก่อนการหน่วงเวลานี้)
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
 ForcedConstants=Required constant values
-MailToSendProposal=ที่จะส่งข้อเสนอของลูกค้า
-MailToSendOrder=ในการส่งคำสั่งของลูกค้า
-MailToSendInvoice=ในการส่งใบแจ้งหนี้ลูกค้า
-MailToSendShipment=ในการส่งการจัดส่ง
-MailToSendIntervention=ในการส่งการแทรกแซง
-MailToSendSupplierRequestForQuotation=ในการส่งคำขอใบเสนอราคาในการจัดจำหน่าย
-MailToSendSupplierOrder=ในการส่งคำสั่งผู้จัดจำหน่าย
-MailToSendSupplierInvoice=ในการส่งใบแจ้งหนี้จัดจำหน่าย
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-MailToMember=To send email from member page
-MailToUser=To send email from user page
-MailToProject= To send email from project page
+MailToSendProposal=Customer proposals
+MailToSendOrder=สั่งซื้อของลูกค้า
+MailToSendInvoice=Customer invoices
+MailToSendShipment=การจัดส่ง
+MailToSendIntervention=การแทรกแซง
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=สัญญา
+MailToThirdparty=บุคคลที่สาม
+MailToMember=สมาชิก
+MailToUser=ผู้ใช้
+MailToProject=Projects page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1780,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/th_TH/bills.lang b/htdocs/langs/th_TH/bills.lang
index aa76ce73987..c7775429b01 100644
--- a/htdocs/langs/th_TH/bills.lang
+++ b/htdocs/langs/th_TH/bills.lang
@@ -109,7 +109,7 @@ CancelBill=ยกเลิกใบแจ้งหนี้
 SendRemindByMail=ส่งการแจ้งเตือนทางอีเมล
 DoPayment=Enter payment
 DoPaymentBack=Enter refund
-ConvertToReduc=แปลงเป็นส่วนลดในอนาคต
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=ป้อนการชำระเงินที่ได้รับจากลูกค้า
@@ -120,7 +120,7 @@ BillStatus=สถานะใบแจ้งหนี้
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=ร่าง (จะต้องมีการตรวจสอบ)
 BillStatusPaid=ต้องจ่าย
-BillStatusPaidBackOrConverted=Credit note refund or converted into discount
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=ถูกปล่อยปละละเลย
 BillStatusValidated=การตรวจสอบ (จะต้องมีการจ่าย)
@@ -296,10 +296,10 @@ DiscountType=Discount type
 NoteReason=หมายเหตุ / เหตุผล
 ReasonDiscount=เหตุผล
 DiscountOfferedBy=ที่ได้รับจาก
-DiscountStillRemaining=Discounts available
-DiscountAlreadyCounted=Discounts already consumed
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+SupplierDiscounts=Vendors discounts
 BillAddress=ที่อยู่บิล
 HelpEscompte=ส่วนลดนี้จะได้รับส่วนลดพิเศษให้กับลูกค้าเนื่องจากการชำระเงินที่ถูกสร้างขึ้นมาก่อนวาระ
 HelpAbandonBadCustomer=เงินจำนวนนี้ถูกทิ้งร้าง (ลูกค้าบอกว่าจะเป็นลูกค้าที่ไม่ดี) และถือเป็นหลวมพิเศษ
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Every %s days
 FrequencyPer_m=Every %s months
 FrequencyPer_y=Every %s years
@@ -505,9 +511,14 @@ SituationAmount=จำนวนใบแจ้งหนี้สถานกา
 SituationDeduction=ลบสถานการณ์
 ModifyAllLines=การปรับเปลี่ยนสายทั้งหมด
 CreateNextSituationInvoice=สร้างสถานการณ์ต่อไป
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=สถานการณ์ต่อไปอยู่แล้ว
 DisabledBecauseFinal=สถานการณ์เช่นนี้ถือเป็นที่สิ้นสุด
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=S
 CantBeLessThanMinPercent=ความคืบหน้าไม่สามารถที่จะมีขนาดเล็กกว่าค่าของมันอยู่ในสถานการณ์ที่ผ่านมา
 NoSituations=ไม่มีสถานการณ์ที่เปิด
 InvoiceSituationLast=รอบชิงชนะเลิศและใบแจ้งหนี้ทั่วไป
@@ -532,3 +543,4 @@ AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/th_TH/categories.lang b/htdocs/langs/th_TH/categories.lang
index d14468635c5..fcae3c154fc 100644
--- a/htdocs/langs/th_TH/categories.lang
+++ b/htdocs/langs/th_TH/categories.lang
@@ -16,7 +16,7 @@ MembersCategoriesArea=แท็กสมาชิก / พื้นที่ป
 ContactsCategoriesArea=แท็กติดต่อ / พื้นที่ประเภท
 AccountsCategoriesArea=Accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
-SubCats=หมวดหมู่ย่อย
+SubCats=Sub-categories
 CatList=รายการของแท็ก / ประเภท
 NewCategory=แท็กใหม่ / หมวดหมู่
 ModifCat=ปรับเปลี่ยนแท็ก / หมวดหมู่
@@ -85,3 +85,4 @@ CategorieRecursivHelp=หากเปิดใช้งานผลิตภั
 AddProductServiceIntoCategory=เพิ่มสินค้า / บริการดังต่อไปนี้
 ShowCategory=แสดงแท็ก / หมวดหมู่
 ByDefaultInList=โดยค่าเริ่มต้นในรายการ
+ChooseCategory=Choose category
diff --git a/htdocs/langs/th_TH/commercial.lang b/htdocs/langs/th_TH/commercial.lang
index 64a8629909a..9ac93e3d89f 100644
--- a/htdocs/langs/th_TH/commercial.lang
+++ b/htdocs/langs/th_TH/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=ใกล้
 ActionAC_EMAILING=ส่งอีเมลมวล
 ActionAC_COM=ส่งคำสั่งซื้อของลูกค้าโดยทางไปรษณีย์
 ActionAC_SHIP=ส่งจัดส่งทางไปรษณีย์
-ActionAC_SUP_ORD=ส่งคำสั่งผู้จัดจำหน่ายทางไปรษณีย์
-ActionAC_SUP_INV=ส่งใบแจ้งหนี้จัดจำหน่ายทางไปรษณีย์
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=อื่น ๆ
 ActionAC_OTH_AUTO=เหตุการณ์แทรกโดยอัตโนมัติ
 ActionAC_MANUAL=เหตุการณ์แทรกด้วยตนเอง
diff --git a/htdocs/langs/th_TH/companies.lang b/htdocs/langs/th_TH/companies.lang
index 543cb36f917..df60e37a159 100644
--- a/htdocs/langs/th_TH/companies.lang
+++ b/htdocs/langs/th_TH/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Are you sure you want to delete this contact and all inheri
 MenuNewThirdParty=บุคคลที่สามใหม่
 MenuNewCustomer=ลูกค้าใหม่
 MenuNewProspect=โอกาสใหม่
-MenuNewSupplier=ผู้จัดจำหน่ายใหม่
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=ใหม่เอกชน
-NewCompany=บริษัท ใหม่ (โอกาสลูกค้าซัพพลายเออร์)
-NewThirdParty=บุคคลที่สามใหม่ (โอกาสลูกค้าซัพพลายเออร์)
-CreateDolibarrThirdPartySupplier=สร้างบุคคลที่สาม (ซัพพลายเออร์)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=สร้างของบุคคลที่สาม
 CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=พื้นที่ prospection
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=ลูกค้าเป้าหมาย
 ThirdPartyCustomers=ลูกค้า
 ThirdPartyCustomersStats=ลูกค้า
 ThirdPartyCustomersWithIdProf12=ลูกค้าที่มี% s% s หรือ
-ThirdPartySuppliers=ซัพพลายเออร์
+ThirdPartySuppliers=Vendors
 ThirdPartyType=ประเภทของบุคคลที่สาม
 Individual=เอกชน
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
@@ -77,11 +77,11 @@ Web=เว็บ
 Poste= ตำแหน่ง
 DefaultLang=ภาษาโดยปริยาย
 VATIsUsed=Sales tax is used
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
-ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=ข้อเสนอ
 OverAllOrders=คำสั่งซื้อ
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=RE ประเภท
 TypeLocaltax2ES=IRPF ประเภท
 WrongCustomerCode=รหัสลูกค้าที่ไม่ถูกต้อง
-WrongSupplierCode=รหัสผู้จำหน่ายที่ไม่ถูกต้อง
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=รหัสรูปแบบของลูกค้า
-SupplierCodeModel=รูปแบบรหัสผู้จำหน่าย
+SupplierCodeModel=Vendor code model
 Gencod=บาร์โค้ด
 ##### Professional ID #####
 ProfId1Short=ศ. รหัส 1
@@ -267,7 +267,7 @@ Prospect=โอกาส
 CustomerCard=บัตรของลูกค้า
 Customer=ลูกค้า
 CustomerRelativeDiscount=ส่วนลดลูกค้าญาติ
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=ส่วนลดญาติ
 CustomerAbsoluteDiscountShort=ส่วนลดแอบโซลูท
 CompanyHasRelativeDiscount=<b>ลูกค้ารายนี้มีส่วนลดเริ่มต้นของ% s %%</b>
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this suppl
 CompanyHasNoAbsoluteDiscount=ลูกค้ารายนี้มีเครดิตส่วนลดไม่มี
 CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
 CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=ไม่
 Supplier=ผู้ผลิต
 AddContact=สร้างรายชื่อผู้ติดต่อ
@@ -304,13 +304,13 @@ DeleteACompany=ลบ บริษัท
 PersonalInformations=ข้อมูลส่วนบุคคล
 AccountancyCode=บัญชีการบัญชี
 CustomerCode=รหัสลูกค้า
-SupplierCode=รหัสผู้จำหน่าย
+SupplierCode=Vendor code
 CustomerCodeShort=รหัสลูกค้า
-SupplierCodeShort=รหัสผู้จำหน่าย
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=รหัสลูกค้าไม่ซ้ำกันสำหรับลูกค้าทุกท่าน
-SupplierCodeDesc=รหัสผู้จำหน่ายที่ไม่ซ้ำกันสำหรับซัพพลายเออร์ทั้งหมด
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=จำเป็นต้องใช้ถ้าบุคคลที่สามเป็นลูกค้าหรือโอกาส
-RequiredIfSupplier=จำเป็นต้องใช้ถ้าบุคคลที่สามเป็นผู้จัดจำหน่าย
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=ตั้งแต่วันที่ควบคุมโดยโมดูล
 ThisIsModuleRules=นี่คือกฎระเบียบสำหรับโมดูลนี้
 ProspectToContact=Prospect ที่จะติดต่อ
@@ -338,7 +338,7 @@ MyContacts=รายชื่อของฉัน
 Capital=เมืองหลวง
 CapitalOf=เมืองหลวงของ% s
 EditCompany=แก้ไข บริษัท
-ThisUserIsNot=ผู้ใช้นี้ไม่ได้เป็นความคาดหวังของลูกค้าหรือผู้จัดจำหน่าย
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=ตรวจสอบ
 VATIntraCheckDesc=<b>การเชื่อมโยง% s</b> ช่วยให้การขอให้ตรวจสอบการให้บริการภาษีมูลค่าเพิ่มยุโรป อินเทอร์เน็ตจากเซิร์ฟเวอร์ภายนอกเป็นสิ่งจำเป็นสำหรับบริการนี​​้ในการทำงาน
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -396,7 +396,7 @@ ImportDataset_company_4=Third parties/Sales representatives (Assign sales repres
 PriceLevel=ระดับราคา
 DeliveryAddress=ที่อยู่จัดส่ง
 AddAddress=Add address
-SupplierCategory=ประเภทผู้ผลิต
+SupplierCategory=Vendor category
 JuridicalStatus200=Independent
 DeleteFile=ลบไฟล์
 ConfirmDeleteFile=คุณแน่ใจว่าคุณต้องการที่จะลบไฟล์นี้หรือไม่?
@@ -406,7 +406,7 @@ FiscalYearInformation=ข้อมูลเกี่ยวกับปีงบ
 FiscalMonthStart=เริ่มต้นเดือนของปีงบประมาณ
 YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
 YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
-ListSuppliersShort=รายชื่อของซัพพลายเออร์
+ListSuppliersShort=List of vendors
 ListProspectsShort=รายชื่อลูกค้าเป้าหมาย
 ListCustomersShort=รายชื่อของลูกค้า
 ThirdPartiesArea=บุคคลที่สามและพื้นที่ติดต่อ
@@ -420,7 +420,7 @@ CurrentOutstandingBill=การเรียกเก็บเงินในป
 OutstandingBill=แม็กซ์ สำหรับการเรียกเก็บเงินที่โดดเด่น
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=กลับ Numero ที่มีรูปแบบ% syymm-nnnn รหัสลูกค้าและ% syymm-nnnn รหัสผู้จัดจำหน่ายที่ yy เป็นปีเป็นเดือนมิลลิเมตรและ nnnn เป็นลำดับที่มีการหยุดพักและกลับไปที่ 0 ไม่มี
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=รหัสที่เป็นอิสระ รหัสนี้สามารถแก้ไขได้ในเวลาใดก็ได้
 ManagingDirectors=ผู้จัดการ (s) ชื่อ (ซีอีโอผู้อำนวยการประธาน ... )
 MergeOriginThirdparty=ซ้ำของบุคคลที่สาม (บุคคลที่สามต้องการลบ)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/th_TH/compta.lang b/htdocs/langs/th_TH/compta.lang
index f491347da62..83373b65e90 100644
--- a/htdocs/langs/th_TH/compta.lang
+++ b/htdocs/langs/th_TH/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=จ่ายสุทธิ
 VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
-VATSummary=Tax Balance
+VATSummary=Tax monthly
+VATBalance=Tax Balance
 VATPaid=Tax paid
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=การบัญชี / ธนารักษ์พ
 NewPayment=การชำระเงินใหม่
 Payments=วิธีการชำระเงิน
 PaymentCustomerInvoice=การชำระเงินตามใบแจ้งหนี้ของลูกค้า
-PaymentSupplierInvoice=ใบแจ้งหนี้การชำระเงินผู้ผลิต
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=สังคม / ชำระภาษีการคลัง
 PaymentVat=การชำระเงินภาษีมูลค่าเพิ่ม
 ListPayment=รายชื่อของการชำระเงิน
 ListOfCustomerPayments=รายการชำระเงินของลูกค้า
-ListOfSupplierPayments=รายชื่อผู้จัดจำหน่ายของการชำระเงิน
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=ระยะเวลาที่เริ่มต้นวันที่
 DateEndPeriod=วันสิ้นงวดวันที่
 newLT1Payment=New tax 2 payment
@@ -110,7 +111,7 @@ ShowVatPayment=แสดงการชำระเงินภาษีมู
 TotalToPay=ทั้งหมดที่จะต้องจ่าย
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
 CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
 SupplierAccountancyCodeShort=Sup. account. code
 AccountNumber=เลขที่บัญชี
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=รายงานโดยเรื่องของบ
 LT2ReportByCustomersES=รายงานโดยบุคคลที่สาม IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=รายงานโดยลูกค้าภาษีมูลค่าเพิ่มที่จัดเก็บและเรียกชำระแล้ว
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Chart of accounts models
 Pcg_type=ประเภท PCG
 Pcg_subtype=ชนิดย่อย PCG
 InvoiceLinesToDispatch=เส้นที่จะส่งใบแจ้งหนี้
-ByProductsAndServices=โดยสินค้าและบริการ
+ByProductsAndServices=By product and service
 RefExt=อ้างอิงภายนอก
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
 LinkedOrder=เชื่อมโยงการสั่งซื้อ
@@ -215,7 +218,8 @@ Mode1=วิธีที่ 1
 Mode2=วิธีที่ 2
 CalculationRuleDesc=ในการคำนวณภาษีมูลค่าเพิ่มรวมมีสองวิธี: <br> วิธีที่ 1 มีการปัดเศษถังในแต่ละบรรทัดแล้วข้อสรุปพวกเขา <br> วิธีที่ 2 คือข้อสรุปถังทั้งหมดในแต่ละบรรทัดแล้วผลการปัดเศษ <br> ผลสุดท้ายอาจจะแตกต่างจากไม่กี่เซ็นต์ <b>โหมดเริ่มต้นคือโหมด%</b> s
 CalculationRuleDescSupplier=According to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=<b>รายงานผลประกอบการต่อผลิตภัณฑ์เมื่อใช้โหมดการบัญชีเงินสดไม่เกี่ยวข้อง รายงานนี้จะใช้ได้เฉพาะเมื่อใช้โหมดการบัญชีการสู้รบ</b> (ดูการตั้งค่าของโมดูลการบัญชี)
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=โหมดการคำนวณ
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=โคลนสังคม / ภาษีการคลัง
 ConfirmCloneTax=ยืนยันโคลนของสังคม / ชำระภาษีการคลัง
@@ -242,3 +246,10 @@ FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/th_TH/dict.lang b/htdocs/langs/th_TH/dict.lang
index 8a5b9d080a0..34a2fe908ee 100644
--- a/htdocs/langs/th_TH/dict.lang
+++ b/htdocs/langs/th_TH/dict.lang
@@ -5,7 +5,8 @@ CountryIT=อิตาลี
 CountryES=สเปน
 CountryDE=ประเทศเยอรมัน
 CountryCH=ประเทศสวิสเซอร์แลนด์
-CountryGB=บริเตนใหญ่
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=สหราชอาณาจักร
 CountryUK=สหราชอาณาจักร
 CountryIE=ไอร์แลนด์
 CountryCN=ประเทศจีน
diff --git a/htdocs/langs/th_TH/ecm.lang b/htdocs/langs/th_TH/ecm.lang
index 669ab65c00f..42b0f14ca89 100644
--- a/htdocs/langs/th_TH/ecm.lang
+++ b/htdocs/langs/th_TH/ecm.lang
@@ -39,9 +39,10 @@ ShowECMSection=ไดเรกทอรีแสดง
 DeleteSection=ลบไดเรกทอรี
 ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
 ECMDirectoryForFiles=ไดเรกทอรีญาติไฟล์
-CannotRemoveDirectoryContainsFiles=เอาออกไปไม่ได้เพราะมันมีบางไฟล์
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=จัดการไฟล์
-ECMSelectASection=เลือกไดเรกทอรีบนต้นไม้ซ้าย ...
+ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
diff --git a/htdocs/langs/th_TH/errors.lang b/htdocs/langs/th_TH/errors.lang
index 12843075c46..3a60f60475c 100644
--- a/htdocs/langs/th_TH/errors.lang
+++ b/htdocs/langs/th_TH/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=บาร์โค้ดที่จำเป็น
 ErrorCustomerCodeAlreadyUsed=รหัสลูกค้าใช้อยู่แล้ว
 ErrorBarCodeAlreadyUsed=บาร์โค้ดที่ใช้แล้ว
 ErrorPrefixRequired=คำนำหน้าต้อง
-ErrorBadSupplierCodeSyntax=ไวยากรณ์ Bad รหัสผู้จัดจำหน่าย
-ErrorSupplierCodeRequired=รหัสผู้จำหน่ายต้อง
-ErrorSupplierCodeAlreadyUsed=รหัสผู้จำหน่ายใช้แล้ว
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=พารามิเตอร์ที่ไม่ดี
 ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
 ErrorBadImageFormat=ไฟล์ภาพไม่ได้เป็นรูปแบบที่ได้รับการสนับสนุน (PHP ของคุณไม่สนับสนุนฟังก์ชั่นการแปลงภาพของรูปแบบนี้)
@@ -87,7 +87,7 @@ ErrorsOnXLines=<b>ข้อผิดพลาดในการบันทึ
 ErrorFileIsInfectedWithAVirus=โปรแกรมป้องกันไวรัสที่ไม่สามารถที่จะตรวจสอบไฟล์ (ไฟล์อาจจะมีการติดเชื้อไวรัส)
 ErrorSpecialCharNotAllowedForField=อักขระพิเศษไม่ได้รับอนุญาตสำหรับเขตข้อมูล "% s"
 ErrorNumRefModel=การอ้างอิงที่มีอยู่ในฐานข้อมูล (% s) และไม่ได้เข้ากันได้กับกฎหมายเลขนี้ ลบบันทึกการอ้างอิงหรือเปลี่ยนชื่อเพื่อเปิดใช้งานโมดูลนี้
-ErrorQtyTooLowForThisSupplier=ปริมาณต่ำเกินไปสำหรับผู้จัดหาสินค้านี้ไม่มีหรือราคาที่กำหนดไว้เกี่ยวกับผลิตภัณฑ์นี้สำหรับผู้จัดหาสินค้านี้
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=ข้อผิดพลาดในหน้ากาก
 ErrorBadMaskFailedToLocatePosOfSequence=ข้อผิดพลาดหน้ากากไม่มีหมายเลขลำดับ
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
-ErrorSupplierCountryIsNotDefined=ประเทศผู้ผลิตนี้ไม่ได้ถูกกำหนด แก้ไขปัญหานี้เป็นครั้งแรก
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
diff --git a/htdocs/langs/th_TH/install.lang b/htdocs/langs/th_TH/install.lang
index 4f2373db06d..5a49e7253dd 100644
--- a/htdocs/langs/th_TH/install.lang
+++ b/htdocs/langs/th_TH/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=<b>การกำหนดค่า
 ConfFileCouldBeCreated=<b>การกำหนดค่าไฟล์% s</b> จะถูกสร้างขึ้น
 ConfFileIsNotWritable=<b>การกำหนดค่าไฟล์% s</b> ไม่สามารถเขียนได้ สิทธิ์ในการตรวจสอบ สำหรับการติดตั้งครั้งแรกเว็บเซิร์ฟเวอร์ของคุณต้องได้รับเพื่อให้สามารถเขียนลงในไฟล์นี้ในระหว่างขั้นตอนการตั้งค่า ("chmod 666" ตัวอย่างเช่นในระบบปฏิบัติการยูนิกซ์เช่น OS)
 ConfFileIsWritable=<b>การกำหนดค่าไฟล์% s</b> เขียนได้
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=โหลดข้อมูลจากแฟ้มการกำหนดค่า
 PHPSupportSessions=PHP นี้สนับสนุนการประชุม
 PHPSupportPOSTGETOk=PHP นี้สนับสนุนตัวแปร POST และ GET
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
 WarningRemoveInstallDir=คำเตือนเพื่อความปลอดภัยเมื่อติดตั้งหรืออัพเกรดเสร็จสมบูรณ์หลีกเลี่ยงการใช้ติดตั้งเครื่องมืออีกครั้งคุณควรเพิ่มไฟล์ที่เรียกว่า <b>install.lock</b> ลงในไดเรกทอรีเอกสาร Dolibarr เพื่อที่จะหลีกเลี่ยงการใช้ที่เป็นอันตรายของมัน
 FunctionNotAvailableInThisPHP=ไม่สามารถใช้ได้ใน PHP นี้
 ChoosedMigrateScript=เลือกสคริปต์การย้ายถิ่น
-DataMigration=การโยกย้ายข้อมูล
-DatabaseMigration=การย้ายฐานข้อมูลโครงสร้าง
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=การประมวลผลสคริปต์
 ChooseYourSetupMode=เลือกโหมดการตั้งค่าของคุณและคลิกที่ "เริ่มต้น" ...
 FreshInstall=ติดตั้งใหม่
@@ -146,7 +147,7 @@ NothingToDo=Nothing to do
 # upgrade
 MigrationFixData=แก้ไขข้อมูล denormalized
 MigrationOrder=การโยกย้ายข้อมูลสำหรับการสั่งซื้อของลูกค้า
-MigrationSupplierOrder=การโยกย้ายข้อมูลสำหรับการสั่งซื้อของซัพพลายเออร์
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=การโยกย้ายข้อมูลสำหรับข้อเสนอในเชิงพาณิชย์
 MigrationInvoice=การโยกย้ายข้อมูลสำหรับใบแจ้งหนี้ของลูกค้า
 MigrationContract=การโยกย้ายข้อมูลในการทำสัญญา
@@ -196,6 +197,8 @@ MigrationEvents=การย้ายถิ่นของเหตุการ
 MigrationEventsContact=Migration of events to add event contact into assignement table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 ShowNotAvailableOptions=แสดงตัวเลือกที่มีอยู่ไม่ได้
diff --git a/htdocs/langs/th_TH/ldap.lang b/htdocs/langs/th_TH/ldap.lang
index 7b793616950..d262844ef47 100644
--- a/htdocs/langs/th_TH/ldap.lang
+++ b/htdocs/langs/th_TH/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=รหัสผ่านสำหรับโดเมน
 YouMustChangePassNextLogon=<b>รหัสผ่านสำหรับผู้ใช้% s% s</b> ในโดเมนต้องมีการเปลี่ยนแปลง
 UserMustChangePassNextLogon=ผู้ใช้ต้องเปลี่ยนรหัสผ่านในโดเมน% s
 LDAPInformationsForThisContact=ข้อมูลในฐานข้อมูล LDAP สำหรับการติดต่อนี้
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Member type synchronized
 ContactSynchronized=ติดต่อตรง
 ForceSynchronize=กองทัพตรงกัน Dolibarr -> LDAP
 ErrorFailedToReadLDAP=ไม่สามารถอ่านฐานข้อมูล LDAP ตรวจสอบการติดตั้งโมดูล LDAP และการเข้าถึงฐานข้อมูล
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/th_TH/loan.lang b/htdocs/langs/th_TH/loan.lang
index 02b5af3d549..7e0f1ce9fe9 100644
--- a/htdocs/langs/th_TH/loan.lang
+++ b/htdocs/langs/th_TH/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=เมืองหลวง
 Insurance=ประกันภัย
 Interest=ความสนใจ
 Nbterms=จำนวนของข้อตกลง
+Term=Term
 LoanAccountancyCapitalCode=Accounting account capital
 LoanAccountancyInsuranceCode=Accounting account insurance
 LoanAccountancyInterestCode=Accounting account interest
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=ยืนยันการลบเงินให้กู
 LoanDeleted=สินเชื่อที่ถูกลบประสบความสำเร็จ
 ConfirmPayLoan=ยืนยันการจำแนกจ่ายเงินให้กู้ยืมนี้
 LoanPaid=สินเชื่อการชำระเงิน
-# Calc
-LoanCalc=เครื่องคิดเลขสินเชื่อธนาคาร
-PurchaseFinanceInfo=ข้อมูลการสั่งซื้อและการเงิน
-SalePriceOfAsset=ราคาขายของสินทรัพย์
-PercentageDown=ลงร้อยละ
-LengthOfMortgage=Duration of loan
-AnnualInterestRate=อัตราดอกเบี้ยประจำปี
-ExplainCalculations=อธิบายการคำนวณ
-ShowMeCalculationsAndAmortization=แสดงการคำนวณและค่าตัดจำหน่าย
-MortgagePaymentInformation=สินเชื่อที่อยู่อาศัยข้อมูลการชำระเงิน
-DownPayment=การชำระเงินลง
-DownPaymentDesc=<b>การชำระเงินลง</b> = ราคาของบ้านคูณด้วยอัตราร้อยละแบ่งลดลง 100 (ต่อ 5% ลดลงกลายเป็น 5/100 หรือ 0.05)
-InterestRateDesc=<b>อัตราดอกเบี้ย</b> = ร้อยละที่น่าสนใจประจำปีหารด้วย 100
-MonthlyFactorDesc=<b>ปัจจัยรายเดือน</b> = ผลมาจากสูตรต่อไปนี้
-MonthlyInterestRateDesc=<b>อัตราดอกเบี้ยรายเดือน</b> = อัตราดอกเบี้ยประจำปีหารด้วย 12 (12 เดือนต่อปี)
-MonthTermDesc=<b>ระยะเดือนของเงินกู้ในเดือน</b> = จำนวนปีที่คุณได้ถ่ายออกเงินกู้ครั้งที่ 12
-MonthlyPaymentDesc=การชำระเงินรายเดือนจะคิดออกโดยใช้สูตรต่อไปนี้
-AmortizationPaymentDesc=<a href="#amortization">ค่าตัดจำหน่าย</a> แบ่งลงเท่าใดของการชำระเงินรายเดือนของคุณไปสู่ความสนใจของธนาคารและวิธีการมากที่จะเข้าสู่การจ่ายเงินออกหลักของเงินกู้ของคุณ
-AmountFinanced=จํานวนเงินทุน
-AmortizationMonthlyPaymentOverYears=<b>ค่าตัดจำหน่ายสำหรับการชำระเงินรายเดือน:% s%</b> s มากกว่าปีที่ผ่านมา
-Totalsforyear=ผลรวมสำหรับปี
-MonthlyPayment=การชำระเงินรายเดือน
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
-GoToInterest=% s จะไปสู่​​ความสนใจ
-GoToPrincipal=% s จะไปต่อที่สำคัญ
-YouWillSpend=You will spend %s in year %s
 ListLoanAssociatedProject=List of loan associated with the project
 AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=ความสนใจ
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=การกำหนดค่าของเงินให้กู้ยืมโมดูล
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-FinancialCommitment=Financial commitment
 CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/langs/th_TH/mails.lang b/htdocs/langs/th_TH/mails.lang
index 572546deb5c..684cab79b2b 100644
--- a/htdocs/langs/th_TH/mails.lang
+++ b/htdocs/langs/th_TH/mails.lang
@@ -11,7 +11,9 @@ MailFrom=ผู้ส่ง
 MailErrorsTo=ข้อผิดพลาดที่จะ
 MailReply=ตอบกลับ
 MailTo=รับสัญญาณ (s)
+MailToUsers=To user(s)
 MailCC=คัดลอกไป
+MailToCCUsers=Copy to users(s)
 MailCCC=คัดลอกเก็บไว้เพื่อ
 MailTopic=หัวข้ออีเมล
 MailText=ข่าวสาร
@@ -164,4 +166,4 @@ InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=ข้อมูล
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/th_TH/main.lang b/htdocs/langs/th_TH/main.lang
index fbae64fc0d7..f8d78e50aad 100644
--- a/htdocs/langs/th_TH/main.lang
+++ b/htdocs/langs/th_TH/main.lang
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is se
 Administrator=ผู้บริหาร
 Undefined=ตะคุ่ม
 PasswordForgotten=ลืมรหัสผ่าน?
+NoAccount=No account?
 SeeAbove=ดูข้างต้น
 HomeArea=พื้นที่หน้าแรก
 LastConnexion=การเชื่อมต่อล่าสุด
@@ -231,7 +232,7 @@ Limit=จำกัด
 Limits=ขีด จำกัด
 Logout=ออกจากระบบ
 NoLogoutProcessWithAuthMode=ไม่มีคุณลักษณะปลดปรับใช้กับโหมดการตรวจสอบ <b>%s</b>
-Connection=สัมพันธ์
+Connection=เข้าสู่ระบบ
 Setup=การติดตั้ง
 Alert=เตือนภัย
 MenuWarnings=การแจ้งเตือน
@@ -402,6 +403,7 @@ DefaultTaxRate=Default tax rate
 Average=เฉลี่ย
 Sum=รวม
 Delta=รูปสามเหลี่ยม
+RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=ตัวเลือก
@@ -414,7 +416,7 @@ Favorite=ที่ชื่นชอบ
 ShortInfo=ข้อมูล
 Ref=อ้าง
 ExternalRef=อ้าง extern
-RefSupplier=อ้าง ผู้จัดจำหน่าย
+RefSupplier=Ref. vendor
 RefPayment=อ้าง การชำระเงิน
 CommercialProposalsShort=ข้อเสนอเชิงพาณิชย์
 Comment=ความเห็น
@@ -493,7 +495,7 @@ Received=ที่ได้รับ
 Paid=ต้องจ่าย
 Topic=Subject
 ByCompanies=โดยบุคคลที่สาม
-ByUsers=โดยผู้ใช้
+ByUsers=By user
 Links=ลิงค์
 Link=ลิงค์
 Rejects=เสีย
@@ -619,9 +621,9 @@ BuildDoc=สร้างหมอ
 Entity=สิ่งแวดล้อม
 Entities=หน่วยงานที่
 CustomerPreview=ตัวอย่างลูกค้า
-SupplierPreview=ตัวอย่างผู้ผลิต
+SupplierPreview=Vendor preview
 ShowCustomerPreview=แสดงตัวอย่างของลูกค้า
-ShowSupplierPreview=แสดงตัวอย่างผู้จัดจำหน่าย
+ShowSupplierPreview=Show vendor preview
 RefCustomer=อ้าง ลูกค้า
 Currency=เงินตรา
 InfoAdmin=ข้อมูลสำหรับผู้ดูแล
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=Products or services
 SearchIntoProjects=โครงการ
 SearchIntoTasks=งาน
 SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=สั่งซื้อของลูกค้า
-SearchIntoSupplierOrders=Supplier orders
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=การแทรกแซง
 SearchIntoContracts=สัญญา
 SearchIntoCustomerShipments=Customer shipments
@@ -941,3 +943,5 @@ Remote=Remote
 LocalAndRemote=Local and Remote
 KeyboardShortcut=Keyboard shortcut
 AssignedTo=ได้รับมอบหมายให้
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/th_TH/margins.lang b/htdocs/langs/th_TH/margins.lang
index f1939d829d6..daba5831b4b 100644
--- a/htdocs/langs/th_TH/margins.lang
+++ b/htdocs/langs/th_TH/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=เป็นบริการ
 UseDiscountOnTotal=เกี่ยวกับผลรวมย่อย
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=กำหนดถ้าลดราคาทั่วโลกจะถือว่าเป็นสินค้าบริการหรือเพียง แต่ในผลรวมย่อยสำหรับการคำนวณอัตรากำไรขั้นต้น
 MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best supplier price
+MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=ราคาทุน
 UnitCharges=ค่าใช้จ่ายต่อหน่วย
 Charges=ค่าใช้จ่าย
diff --git a/htdocs/langs/th_TH/members.lang b/htdocs/langs/th_TH/members.lang
index 07154b23248..ed7fece3dab 100644
--- a/htdocs/langs/th_TH/members.lang
+++ b/htdocs/langs/th_TH/members.lang
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
diff --git a/htdocs/langs/th_TH/opensurvey.lang b/htdocs/langs/th_TH/opensurvey.lang
index 80cfd0e4d25..da431794e7d 100644
--- a/htdocs/langs/th_TH/opensurvey.lang
+++ b/htdocs/langs/th_TH/opensurvey.lang
@@ -58,3 +58,4 @@ MoreChoices=ใส่เลือกมากขึ้นสำหรับผ
 SurveyExpiredInfo=The poll has been closed or voting delay has expired.
 EmailSomeoneVoted=% s ที่เต็มไปด้วยเส้น คุณสามารถค้นหาการสำรวจความคิดเห็นของคุณได้ที่ลิงค์:% s
 ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/th_TH/orders.lang b/htdocs/langs/th_TH/orders.lang
index 9f4c0cfa3e4..40059787515 100644
--- a/htdocs/langs/th_TH/orders.lang
+++ b/htdocs/langs/th_TH/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=ลูกค้าที่สั่งซื้อในพื้นที่
-SuppliersOrdersArea=ซัพพลายเออร์ในพื้นที่การสั่งซื้อ
+SuppliersOrdersArea=Purchase orders area
 OrderCard=สั่งซื้อบัตร
 OrderId=รหัสการสั่งซื้อ
 Order=สั่งซื้อ
@@ -13,18 +13,18 @@ OrderToProcess=เพื่อที่จะดำเนินการ
 NewOrder=คำสั่งซื้อใหม่
 ToOrder=ทำให้การสั่งซื้อ
 MakeOrder=ทำให้การสั่งซื้อ
-SupplierOrder=เพื่อที่ผู้ผลิต
-SuppliersOrders=คำสั่งซัพพลายเออร์
-SuppliersOrdersRunning=ซัพพลายเออร์ที่ปัจจุบันคำสั่งซื้อ
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=สั่งซื้อของลูกค้า
-CustomersOrders=สั่งซื้อของลูกค้า
+CustomersOrders=คำสั่งซื้อของลูกค้า
 CustomersOrdersRunning=สั่งซื้อของลูกค้าในปัจจุบัน
 CustomersOrdersAndOrdersLines=สั่งซื้อของลูกค้าและสายการสั่งซื้อ
 OrdersDeliveredToBill=Customer orders delivered to bill
 OrdersToBill=สั่งซื้อของลูกค้าที่ส่งมอบ
 OrdersInProcess=สั่งซื้อของลูกค้าในกระบวนการ
 OrdersToProcess=สั่งซื้อของลูกค้าในการประมวลผล
-SuppliersOrdersToProcess=คำสั่งผู้ผลิตในการประมวลผล
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=ยกเลิก
 StatusOrderDraftShort=ร่าง
 StatusOrderValidatedShort=ผ่านการตรวจสอบ
@@ -75,15 +75,15 @@ ShowOrder=เพื่อแสดง
 OrdersOpened=คำสั่งในการประมวลผล
 NoDraftOrders=ไม่มีคำสั่งร่าง
 NoOrder=No order
-NoSupplierOrder=No supplier order
+NoSupplierOrder=No purchase order
 LastOrders=Latest %s customer orders
 LastCustomerOrders=Latest %s customer orders
-LastSupplierOrders=Latest %s supplier orders
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=Latest %s modified orders
 AllOrders=คำสั่งซื้อทั้งหมด
 NbOfOrders=จำนวนการสั่งซื้อ
 OrdersStatistics=การสั่งซื้อของสถ​​ิติ
-OrdersStatisticsSuppliers=เพื่อที่ผู้ผลิตสถิติ
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=จำนวนการสั่งซื้อโดย
 AmountOfOrdersByMonthHT=จำนวนเงินของการสั่งซื้อตามเดือน (สุทธิจากภาษี)
 ListOfOrders=รายชื่อของคำสั่ง
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</
 GenerateBill=สร้างใบแจ้งหนี้
 ClassifyShipped=จำแนกส่ง
 DraftOrders=ร่างคำสั่ง
-DraftSuppliersOrders=Draft suppliers orders
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=ขั้นตอนในการสั่งซื้อ
 RefOrder=อ้าง สั่งซื้อ
 RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for supplier
-RefOrderSupplierShort=Ref. order supplier
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=ส่งคำสั่งซื้อทางไปรษณีย์
 ActionsOnOrder=เหตุการณ์ที่เกิดขึ้นในการสั่งซื้อ
 NoArticleOfTypeProduct=บทความไม่มีชนิด 'สินค้า' จึงไม่มีบทความ shippable สำหรับการสั่งซื้อนี้
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
 DispatchSupplierOrder=ผู้จัดจำหน่ายที่ได้รับการสั่งซื้อ% s
 FirstApprovalAlreadyDone=ได้รับการอนุมัติครั้งแรกที่ทำมาแล้ว
 SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=Supplier order %s received %s
-SupplierOrderSubmitedInDolibarr=Supplier order %s submited
-SupplierOrderClassifiedBilled=Supplier order %s set billed
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=คำสั่งอื่น ๆ
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=ต่อไปนี้แทนขึ้นสั่งซื้อของลูกค้า
@@ -125,11 +125,11 @@ 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_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=แทนการจัดส่งสินค้าต่อไปนี้ขึ้น
-TypeContact_order_supplier_external_BILLING=ติดต่อผู้ผลิตใบแจ้งหนี้
-TypeContact_order_supplier_external_SHIPPING=ติดต่อผู้ผลิตจัดส่งสินค้า
-TypeContact_order_supplier_external_CUSTOMER=ติดต่อผู้ผลิตลำดับต่อไปนี้ขึ้น
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=COMMANDE_SUPPLIER_ADDON คงที่ไม่ได้กำหนดไว้
 Error_COMMANDE_ADDON_NotDefined=COMMANDE_ADDON คงที่ไม่ได้กำหนดไว้
 Error_OrderNotChecked=คำสั่งซื้อที่ยังไม่ได้ออกใบแจ้งหนี้ที่เลือก
diff --git a/htdocs/langs/th_TH/other.lang b/htdocs/langs/th_TH/other.lang
index d8b61b8c455..c23aaf9683c 100644
--- a/htdocs/langs/th_TH/other.lang
+++ b/htdocs/langs/th_TH/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=ไฟล์ที่มีขนาดใหญ่เกินไ
 PleaseBePatient=กรุณาเป็นผู้ป่วย ...
 NewPassword=New password
 ResetPassword=Reset password
-RequestToResetPasswordReceived=ขอให้เปลี่ยนรหัสผ่านของคุณ Dolibarr ได้รับการตอบรับ
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=นี่คือกุญแจใหม่ของคุณเข้าสู่ระบบ
 NewKeyWillBe=คีย์ใหม่ของคุณที่จะเข้าสู่ระบบซอฟแวร์จะเป็น
 ClickHereToGoTo=คลิกที่นี่เพื่อไปยัง% s
@@ -233,6 +233,8 @@ PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=พื้นที่การส่งออก
 AvailableFormats=รูปแบบที่ใช้ได้
diff --git a/htdocs/langs/th_TH/productbatch.lang b/htdocs/langs/th_TH/productbatch.lang
index 9c26015eb51..dfedb8b0e17 100644
--- a/htdocs/langs/th_TH/productbatch.lang
+++ b/htdocs/langs/th_TH/productbatch.lang
@@ -16,7 +16,7 @@ printEatby=กินโดย:% s
 printSellby=ขายโดย:% s
 printQty=จำนวน:% d
 AddDispatchBatchLine=เพิ่มบรรทัดสำหรับอายุการเก็บรักษาการฝึกอบรม
-WhenProductBatchModuleOnOptionAreForced=เมื่อโมดูล ล็อท/ลำดับ เปิดใช้งาน โหมดการเพิ่มขึ้น/ลดลงของสต็อคถูกบังคับให้ต้องเลือกยืนยันความถูกต้องในการขนส่ง และการจ่ายแบบทำเองไม่สามารถแก้ไขได้ ตัวเลือกอื่น ๆ สามารถกำหนดได้ตามที่คุณต้องการ
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=ผลิตภัณฑ์นี้ไม่ได้ใช้มาก / หมายเลขซีเรีย
 ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
diff --git a/htdocs/langs/th_TH/products.lang b/htdocs/langs/th_TH/products.lang
index c6a5a6cb2e9..a6345476301 100644
--- a/htdocs/langs/th_TH/products.lang
+++ b/htdocs/langs/th_TH/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=ราคาใหม่
 MinPrice=นาที ราคาขาย
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=ราคาขายไม่สามารถจะต่ำกว่าขั้นต่ำที่ได้รับอนุญาตสำหรับสินค้านี้ (% s โดยไม่มีภาษี) ข้อความนี้ยังสามารถปรากฏขึ้นถ้าคุณพิมพ์ส่วนลดสำคัญมากเกินไป
 ContractStatusClosed=ปิด
 ErrorProductAlreadyExists=ผลิตภัณฑ์ที่มีการอ้างอิง% s อยู่แล้ว
@@ -155,7 +156,7 @@ BuyingPrices=Buying prices
 CustomerPrices=ราคาของลูกค้า
 SuppliersPrices=ราคาผู้ผลิต
 SuppliersPricesOfProductsOrServices=ราคาผู้ผลิต (ของสินค้าหรือบริการ)
-CustomCode=Customs/Commodity/HS code
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=ประเทศแหล่งกำเนิดสินค้า
 Nature=ธรรมชาติ
 ShortLabel=ป้ายสั้น
diff --git a/htdocs/langs/th_TH/projects.lang b/htdocs/langs/th_TH/projects.lang
index 54311c11568..d5546ceb21c 100644
--- a/htdocs/langs/th_TH/projects.lang
+++ b/htdocs/langs/th_TH/projects.lang
@@ -77,6 +77,7 @@ Time=เวลา
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=รายชื่อของข้อเสนอในเชิงพาณิชย์ที่เกี่ยวข้องกับโครงการ
 ListOrdersAssociatedProject=List of customer orders associated with the project
@@ -226,4 +227,4 @@ AllowCommentOnProject=Allow user comments on projects
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/th_TH/stocks.lang b/htdocs/langs/th_TH/stocks.lang
index a83afa1606c..0377ea4bd78 100644
--- a/htdocs/langs/th_TH/stocks.lang
+++ b/htdocs/langs/th_TH/stocks.lang
@@ -203,3 +203,4 @@ RegulateStock=Regulate Stock
 ListInventory=รายการ
 StockSupportServices=Stock management support services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/th_TH/stripe.lang b/htdocs/langs/th_TH/stripe.lang
index babeb47abef..800bc913724 100644
--- a/htdocs/langs/th_TH/stripe.lang
+++ b/htdocs/langs/th_TH/stripe.lang
@@ -58,8 +58,8 @@ NameOnCard=Name on card
 CardNumber=Card Number
 ExpiryDate=Expiry Date
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/th_TH/supplier_proposal.lang b/htdocs/langs/th_TH/supplier_proposal.lang
index 035f13bdf82..fc69b29c18d 100644
--- a/htdocs/langs/th_TH/supplier_proposal.lang
+++ b/htdocs/langs/th_TH/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Supplier commercial proposals
-supplier_proposalDESC=Manage price requests to suppliers
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
 SupplierProposalNew=New price request
 CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
-SupplierProposalsDraft=Draft supplier proposals
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=Latest %s modified price requests
 RequestsOpened=Open price requests
-SupplierProposalArea=Supplier proposals area
-SupplierProposalShort=Supplier proposal
-SupplierProposals=Supplier proposals
-SupplierProposalsShort=Supplier proposals
+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=Supplier ref
+SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=วันที่ส่งมอบ
 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>?
@@ -47,9 +47,9 @@ CommercialAsk=Price request
 DefaultModelSupplierProposalCreate=เริ่มต้นการสร้างแบบจำลอง
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposals=List of supplier proposal requests
-ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
-SupplierProposalsToClose=Supplier proposals to close
-SupplierProposalsToProcess=Supplier proposals to process
+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
diff --git a/htdocs/langs/th_TH/suppliers.lang b/htdocs/langs/th_TH/suppliers.lang
index a209b6d67cb..7fbc2dbbc07 100644
--- a/htdocs/langs/th_TH/suppliers.lang
+++ b/htdocs/langs/th_TH/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=ซัพพลายเออร์
-SuppliersInvoice=ซัพพลายเออร์ใบแจ้งหนี้
-ShowSupplierInvoice=Show Supplier Invoice
-NewSupplier=ผู้จัดจำหน่ายใหม่
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=ประวัติศาสตร์
-ListOfSuppliers=รายชื่อของซัพพลายเออร์
-ShowSupplier=แสดงผู้จัดจำหน่าย
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=วันที่สั่งซื้อ
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=บางผลิตภัณฑ์ย่อยได้ไม่มีราคาที่กำหนดไว้
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
-SupplierPrices=ราคาผู้ผลิต
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=ผู้จัดจำหน่ายอ้างอิงนี้จะเชื่อมโยงกับการอ้างอิง:% s
-NoRecordedSuppliers=ซัพพลายเออร์ที่ไม่มีการบันทึกไว้
-SupplierPayment=การชำระเงินผู้ผลิต
-SuppliersArea=พื้นที่ซัพพลายเออร์
-RefSupplierShort=อ้าง ผู้จัดจำหน่าย
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=ห้องว่าง
-ExportDataset_fournisseur_1=ผู้ผลิตรายการใบแจ้งหนี้และเส้นใบแจ้งหนี้
-ExportDataset_fournisseur_2=ผู้ผลิตใบแจ้งหนี้และการชำระเงิน
-ExportDataset_fournisseur_3=คำสั่งผู้ผลิตและสายการสั่งซื้อ
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=อนุมัติคำสั่งนี้
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=ปฏิเสธคำสั่งนี้
 ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
 ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
-AddSupplierOrder=เพื่อสร้างผู้จัดจำหน่าย
-AddSupplierInvoice=สร้างใบแจ้งหนี้จัดจำหน่าย
-ListOfSupplierProductForSupplier=<b>รายการของผลิตภัณฑ์และราคาสำหรับผู้จัดจำหน่าย% s</b>
-SentToSuppliers=ส่งไปยังซัพพลายเออร์
-ListOfSupplierOrders=รายชื่อผู้จัดจำหน่ายของการสั่งซื้อ
-MenuOrdersSupplierToBill=คำสั่งผู้ผลิตใบแจ้งหนี้
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=ความล่าช้าในการจัดส่งสินค้าในวันที่
 DescNbDaysToDelivery=ที่ใหญ่ที่สุดของการส่งมอบล่าช้าของผลิตภัณฑ์ที่ได้จากคำสั่งนี้
-SupplierReputation=Supplier reputation
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
 AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=ราคาผู้ผลิต
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/th_TH/website.lang b/htdocs/langs/th_TH/website.lang
index b4f831cca59..84689754fdd 100644
--- a/htdocs/langs/th_TH/website.lang
+++ b/htdocs/langs/th_TH/website.lang
@@ -73,7 +73,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
diff --git a/htdocs/langs/th_TH/workflow.lang b/htdocs/langs/th_TH/workflow.lang
index 1216ae50f48..8e634f15103 100644
--- a/htdocs/langs/th_TH/workflow.lang
+++ b/htdocs/langs/th_TH/workflow.lang
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source custome
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/tr_TR/accountancy.lang b/htdocs/langs/tr_TR/accountancy.lang
index 5d979fe8d29..2d1b6c25809 100644
--- a/htdocs/langs/tr_TR/accountancy.lang
+++ b/htdocs/langs/tr_TR/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Muhasebe
 ACCOUNTING_EXPORT_SEPARATORCSV=Dışaaktarma dosyası için sütun ayırıcısı
 ACCOUNTING_EXPORT_DATE=Dışaaktarma dosyası için tarih biçimi
 ACCOUNTING_EXPORT_PIECE=Parça sayısını dışaaktar
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Accounts with non zero values
 ListOfAccounts=List of accounts
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers 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
 
-AccountancyArea=Muhasebe alanı
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Muhasebe modülünün kullanımı birkaç adımda tamamlanır:
 AccountancyAreaDescActionOnce=Aşağıdaki eylemler genellikle yalnızca bir kere veya yılda bir kez gerçekleştirilir...
 AccountancyAreaDescActionOnceBis=Günlükleme yaparken (Günlüklere ve Genel deftere kayıt girme) size doğru varsayılan muhasebe hesabı önererek zamandan tasarruf etmenizi sağlamak için sonraki adımlar tamamlanmalıdır.
@@ -89,7 +90,7 @@ MenuProductsAccounts=Ürün hesapları
 ProductsBinding=Ürün hesapları
 Ventilation=Hesaba bağlama
 CustomersVentilation=Müşteri faturası bağlama
-SuppliersVentilation=Tedarikçi faturası bağlama
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Gider raporu bağlama
 CreateMvts=Yeni işlem oluştur
 UpdateMvts=İşlemi değiştir
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=Alış günlüğü
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Çeşitli günlük
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Rapor günlüğü dışaaktarılsın mı?
 ACCOUNTING_SOCIAL_JOURNAL=Sosyal günlük
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Muhasebe hesabının transferi
 ACCOUNTING_ACCOUNT_SUSPENSE=Muhasebe hesabının bekletilmesi
@@ -185,11 +187,12 @@ ListeMvts=Hareketler Listesi
 ErrorDebitCredit=Borç ve Alacak aynı anda bir değere sahip olamaz
 AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=Üçüncü taraf hesabını listele
-DescThirdPartyReport=Burada üçüncü taraf müşterileri ve tedarikçileri ile onların muhasebe hesaplarının listesine bakın
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=Muhasebe hesapları listesi
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Group of account
 Pcgsubtype=Subgroup of account
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Burada müşteri faturaları satırlarına ve onların ü
 DescVentilTodoCustomer=Bir ürün muhasebe hesabı ile bağlı olmayan müşteri faturaları satırlarını bağlayın
 ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=Burada tedarikçi faturaları ve muhasebe hesapları satırları listesine başvurun
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
 DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report 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 fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Hata, kullanıldığı için bu muhasebe hesabını silemezsiniz
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -293,4 +296,9 @@ Binded=Bağlanmış satırlar
 ToBind=Bağlanacak satırlar
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
index d9ed8870052..a9ade3e0004 100644
--- a/htdocs/langs/tr_TR/admin.lang
+++ b/htdocs/langs/tr_TR/admin.lang
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=Php.ini SMTP / SMTPS Host <b>(Varsayılan:% s)</b>
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Unix gibi sistemlerde PHP ye tanıtılmamıştır)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Sunucu (Unix gibi sistemlerde PHP ye tanıtılmamıştır)
 MAIN_MAIL_EMAIL_FROM=Otomatik e-mailler için gönderen E-posta adresi (php.ini dosyasında varsayılan: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= Gönderilen bütün epostaların bir gizli karbon-kopyasını sistemli olarak gönder
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
 MAIN_MAIL_FORCE_SENDTO=Tüm e-mailleri şu adreslere gönder (gerçek alıcıların yerine, test amaçlı)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=E-posta göndermek için kullanılan yöntem
 MAIN_MAIL_SMTPS_ID=Doğrulama gerektirdiğinde SMTP Kimliği
 MAIN_MAIL_SMTPS_PW=Doğrulama gerektirdiğinde SMTP Parolası
@@ -291,7 +292,7 @@ ModuleSetup=Modül kurulumu
 ModulesSetup=Modül/Uygulama kurulumu
 ModuleFamilyBase=Sistem
 ModuleFamilyCrm=Müşteri İlişkileri Yönetimi (CRM)
-ModuleFamilySrm=Tefadrikçi İlişkileri Yönetimi (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Ürün Yönetimi (ÜY)
 ModuleFamilyHr=İnsan Kaynakları Yönetimi (İK)
 ModuleFamilyProjects=Projeler/Ortak çalışma
@@ -373,7 +374,8 @@ NoSmsEngine=SMS gönderen yöneticisi yoktur. SMS gönderen yöneticisi varsayı
 PDF=PDF
 PDFDesc=PDF oluşturma ile ilgili her genel seçeneği ayarlayabilirsiniz.
 PDFAddressForging=Adres kutusu şekillendirme kuralları
-HideAnyVATInformationOnPDF=Oluşturulan PDF de KDV ile ilgili tüm bilgileri gizleyin
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=%siçin kurallar 
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=Oluşturulan PDF de ürün açıklamasını gizle
@@ -445,7 +447,8 @@ DisplayCompanyInfo=Firma adresini göster
 DisplayCompanyManagers=Yönetici isimlerini göster
 DisplayCompanyInfoAndManagers=Firma adresini ve yönetici isimlerini göster
 EnableAndSetupModuleCron=Eğer bu yinelenen faturanın otomatik olarak oluşturulmasını istiyorsanız, *%s* modülü etkinleştirilmeli ve doğru olarak ayarlanmış olmalı. Aksi durumda, faturaların oluşturulması *Oluştur* düğmesi ile bu şablondan elle yapılmalıdır. Otomatik oluşturmayı etkinleştirmiş olsanız bile yine elle oluşturmayı güvenli bir şekilde yapabilirsiniz. Aynı sırada kopya oluşturma mümkün olmaz.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
 Use3StepsApproval=Varsayılan olarak, Satın Alma Siparişlerinin 2 farklı kullanıcı tarafından oluşturulması ve onaylanması gerekir (bir adım/kullanıcı oluşturacak ve bir adım/kullanıcı onaylayacak. Kullanıcının hem oluşturma hem de onaylama izni varsa, bir adım/kullanıcı yeterli olacaktır). Miktar belirli bir değerin üzerindeyse bu seçenekle üçüncü bir adım/kullanıcı onayı vermeyi isteyebilirsiniz (böylece 3 adım zorunlu olacaktır: 1=doğrulama, 2=ilk onay ve 3=miktar yeterli ise ikinci onay).<br>Tek onay (2 adım) yeterli ise bunu boş olarak ayarlayın, ikinci bir onay (3 adım) her zaman gerekiyorsa çok düşük bir değere ayarlayın (0.1).
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Set this to 1 if you want to attach main document to emai
 FilesAttachedToEmail=Dosya ekle
 SendEmailsReminders=Send agenda reminders by emails
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=Kullanıcılar & gruplar
 Module0Desc=Kullanıcı / Çalışan ve Grup Yönetimi
@@ -479,7 +485,7 @@ Module1Desc=Firma ve kişi yönetimi (müşteriler, adaylar…)
 Module2Name=Ticaret
 Module2Desc=Ticaret yönetimi
 Module10Name=Muhasebe
-Module10Desc=Veritabanı içeriğine bağlı basit muhasebe raporları (günlükler, ciro). Gönderilmez.
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=Teklifler
 Module20Desc=Teklif yönetimi
 Module22Name=Toplu E-postalar
@@ -546,8 +552,8 @@ Module400Name=Projeler/Fırsatlar/Adaylar
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Web Takvimi
 Module410Desc=WebT akvimi entegrasyonu
-Module500Name=Özel giderler
-Module500Desc=Özel giderlerin yönetimi (vergiler, sosyal ya da mali vergiler, kar payları)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Çalışan ücretlerinin ödenmesi
 Module510Desc=Çalışan ücretlerinizi kaydedin ve takip edin
 Module520Name=Borç
@@ -561,14 +567,14 @@ Module700Name=Bağışlar
 Module700Desc=Bağış yönetimi
 Module770Name=Gider raporları
 Module770Desc=Yönetim ve şikayet gider raporları )nakliye, yemek, ...)
-Module1120Name=Tedarikçi teklifi
-Module1120Desc=Tedarikçi teklifi ve fiyatlarını iste
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Mantis entegrasyonu
 Module1520Name=Belge Oluşturma
 Module1520Desc=Toplu posta belgesi oluşturma
 Module1780Name=Etiketler/Kategoriler
-Module1780Desc=Etiket/kategori oluştur (ürünler, müşteriler, tedarikçiler, kişiler ya da üyeler)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=FCKdüzenleyici (FCKeditor)
 Module2000Desc=Bazı metin alanlarının gelişmiş düzenleyici kullanarak düzenlenmesini sağlar (CKEditor Temelli)
 Module2200Name=Dinamik Fiyatlar
@@ -576,7 +582,7 @@ Module2200Desc=Fiyatlar için matematik ifadelerin kullanımını etkinleştir
 Module2300Name=Planlı işler
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Etkinlik / Ajanda
-Module2400Desc=Geçmiş ve Gelecek Etkinlikleri izle. Uygulama kayıtlarının otomatik etkinlik takibi ya da el ile etkinlikleri takip et
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API/Web hizmetleri (SOAP sunucusu)
@@ -613,7 +619,7 @@ Module50100Desc=Satış noktası  modülü (POS)
 Module50200Name=Paypal
 Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 Module50400Name=Muhasebe (gelişmiş)
-Module50400Desc=Muhasebe yönetimi (çift girişler, genel destek ve yardımcı defterler)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=IPP Yazdır
 Module54000Desc=Cups IPP aryüzü kullanılarak doğrudan yazdırma (belgeler açılmadan)  (Yazıcı sunucudan görülmeli ve sunucuda CUPS kurulu olmalı)
 Module55000Name=Anket, Araştırma ya da Oylama
@@ -983,7 +989,7 @@ Host=Sunucu
 DriverType=Sürücü türü
 SummarySystem=Sistem bilgileri özeti
 SummaryConst=Tüm Dolibarr kurulum parametreleri listesi
-MenuCompanySetup=Company/Organization
+MenuCompanySetup=Şirket/Kuruluş
 DefaultMenuManager= Standart menü yöneticisi
 DefaultMenuSmartphoneManager=Akıllı telefon (Smartphone) menü yöneticisi
 Skin=Dış görünüm teması
@@ -999,8 +1005,8 @@ PermanentLeftSearchForm=Sol menüdeki sabit arama formu
 DefaultLanguage=Kullanılan varsayılan dil (dil kodu)
 EnableMultilangInterface=Çoklu dil arayüzünü etkinleştir
 EnableShowLogo=Logoyu sol menüde göster
-CompanyInfo=Company/organization information
-CompanyIds=Company/organization identities
+CompanyInfo=Şirket/Kuruluş bilgileri
+CompanyIds=Şirket/Kuruluş kimlikleri
 CompanyName=Adı
 CompanyAddress=Adresi
 CompanyZip=Posta Kodu
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=Gecikmiş üyelik ücreti uyarısı öncesi süre tole
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Çek ödemesi uyarısı öncesi süre tolerans (gün olarak)
 Delays_MAIN_DELAY_EXPENSEREPORTS=Gider raporlarının onaylanmasından önceki uyarı için bekleme süresi (gün)
 SetupDescription1=Ayarlar alanı, Dolibarr'ı kullanmaya başlamadan önceki ilk parametre ayarları içindir.
-SetupDescription2=Zorunlu olan iki kurulum adımı sol taraftaki kurulum menüsündeki ilk 2 adımdır: %s ayarlar sayfası ve %s ayarlar sayfası:
-SetupDescription3=<a href="%s">%s ->%s</a> menüsündeki parametreler gereklidir, çünkü tanımlanmış veriler Dolibarr ekranlarında ve yazılımın varsayılan davranışını özelleştirmek için kullanılır (örneğin ülke ile ilgili özellikler için).
-SetupDescription4=<a href="%s">%s ->%s</a>menüsündeki parametreler gereklidir, çünkü Dolibarr ERP/CRM birkaç modül/uygulamalar topluluğudur, hepsi az ya da çok bağımsızdır. Yeni özellikler etkinleştireceğiniz her modül için menülere eklenecektir.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=Diğer menü girişleri ile isteğe bağlı parametreleri yönetebilirsiniz.
 LogEvents=Güvenlik denetimi etkinlikleri
 Audit=Denetim
@@ -1054,8 +1060,9 @@ LogEventDesc=Burada Dolibarr güvenlik etkinlikleri için günlük etkinleştire
 AreaForAdminOnly=Kurulum parametreleri sadece <b>yönetici olan kullanıcılar</b> tarafından ayarlanabilir.
 SystemInfoDesc=Sistem bilgileri sadece okuma modunda ve yöneticiler için görüntülenen çeşitli teknik bilgilerdir.
 SystemAreaForAdminOnly=Bu alan yalnız yönetici kullanıcılar için kullanılabilir. Hiçbir Dolibarr izini bu sınırı azaltamaz.
-CompanyFundationDesc=Bu sayfada yönetmek istediğiniz şirket veya dernekle ilgili bilinen bütün bilgileri düzenleyebilirsiniz. (Bunun için sayfanın en altındaki “Değiştir” ya da "Kaydet" düğmesine basın).
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=Dolibarr ile ilgili her bir parametreyi seçebilirsiniz
 AvailableModules=Mevcut uygulama/modüller
 ToActivateModule=Modülleri etkinleştirmek için, ayarlar alanına gidin (Giriş->Ayarlar>Modüller).
@@ -1188,11 +1195,11 @@ UserMailRequired=Yeni bir kullanıcı oluşturmak için gerekli EPosta
 HRMSetup=İK modülü ayarları
 ##### Company setup #####
 CompanySetup=Firmalar modülü kurulumu
-CompanyCodeChecker=Üçüncü partiler için kod üretimi ve denetimi modülü (müşteri veya tedarikçi)
-AccountCodeManager=Module for accounting code generation (customer or supplier)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=Eposta özelliği, bazı Dolibarr etkinlikleri için sessiz ve otomatik olarak posta göndermenizi sağlar. Bildirim hedefleri şu şekilde tanımlanabilir:
 NotificationsDescUser=* kullanıcı başına, her seferinde bir kullanıcı.
-NotificationsDescContact=* üçüncü taraf kişileri başına, her seferinde bir kişi.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* veya modül ayarları sayfasında genel hedef epostaları ayarlanarak.
 ModelModules=Belge şablonları
 DocumentModelOdt=OpenDocuments şablonlarından belgeler oluşturun (OpenOffice, KOffice, TextEdit .ODT veya .ODS dosyaları)
@@ -1203,6 +1210,9 @@ MustBeUnique=Eşsiz olmalıdır?
 MustBeMandatory=Üçüncü tarafları oluşturmak zorunludur?
 MustBeInvoiceMandatory=Faturaları doğrulamak zorunludur ?
 TechnicalServicesProvided=Sağlanan teknik hizmetler
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=<b>%s</b> biçimine göndermek için gerekli bağlantıyı aşağıdaki bağlantıdan bulabilirsiniz:%s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=Teklifler üzerinde serbest metin
 WatermarkOnDraftProposal=Taslak tekliflerde filigran (boşsa yoktur)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Teklif için banka hesabı iste
 ##### SupplierProposal #####
-SupplierProposalSetup=Tedarikçiden fiyat istekleri modülü ayarları
-SupplierProposalNumberingModules=Tedarikçiden fiyat istekleri numaralandırma modeli
-SupplierProposalPDFModules=Tedarikçiden fiyat istekleri belge modeli
-FreeLegalTextOnSupplierProposal=Tedarikçiden fiyat isteği üzerinde serbest metin
-WatermarkOnDraftSupplierProposal=Taslak tedarikçiden fiyat istekleri üzerinde fligran (boş ise yok)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Fiyat isteği için hedef banka hesabı iste
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Sipariş için Kaynak Depo iste
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=Sipariş yönetimi kurulumu
 OrdersNumberingModules=Sipariş numaralandırma modülü
@@ -1448,8 +1458,8 @@ SyslogFilename=Dosya adı ve yolu
 YouCanUseDOL_DATA_ROOT=Dolibarr’daki “belgeler” dizinindeki bir log (günlük) dosyası için DOL_DATA_ROOT/dolibarr.log u kullanabilirsiniz. Bu dosyayı saklamak için farklı bir yol (path) kullanabilirsiniz.
 ErrorUnknownSyslogConstant=%s Değişmezi bilinen bir Syslog değişmezi değildir
 OnlyWindowsLOG_USER=Windows yalnızca LOG_USER'ı destekler
-CompressSyslogs=Syslog files compression and backup
-SyslogFileNumberOfSaves=Log backups
+CompressSyslogs=Syslog dosyaları sıkıştırma ve yedekleme
+SyslogFileNumberOfSaves=Günlük yedekleri
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Bağış modülü kurulumu
@@ -1515,7 +1525,7 @@ OSCommerceTestOk='%s' Sunucusuna '%s' veritabanında kullanıcı '% s' ile bağl
 OSCommerceTestKo1='%s' Sunucusuna bağlantı başarılı ancak veritabanı '% s' e ulaşılamadı.
 OSCommerceTestKo2=’%s’ Sunucusuna ‘%s’ kullanıcısı ile bağlantı başarısız oldu.
 ##### Stock #####
-StockSetup=Depo modülü ayarları
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=Eğer bir Satış Noktası modülü kullanıyorsanız (varsayılan olarak sağlanan ya da başka bir dış POS modülü), bu ayarlar Satış Noktası modülünüz tarafından gözardı edilebilir. Buradaki seçenekler ne olursa olsun çoğu satış notası modülü ön tanımlı olarak anında fatura oluşturacak ve stok eksiltecek şeklide tasarlanmıştır. Yani, Satış Noktanızdan bir satış kaydederken stok eksiltme gereksiniminiz varsa da yoksa da, aynı zamanda POS modülünüzün ayarlarını da denetleyin.
 ##### Menu #####
 MenuDeleted=Menü silindi
@@ -1562,7 +1572,7 @@ SupposedToBeInvoiceDate=Kullanılan fatura tarihi
 Buy=Satınal
 Sell=Sat
 InvoiceDateUsed=Kullanılan fatura tarihi
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
+YourCompanyDoesNotUseVAT=Şirketiniz KDV kullanmayacak şekilde tanımlanmış (Giriş- Ayarlar - Şirket/Kuruluş), bu nedenle ayarlanacak KDV seçenekleri yok.
 AccountancyCode=Muhasebe Kodu
 AccountancyCodeSell=Satış hesap. kodu
 AccountancyCodeBuy=Alış hesap. kodu
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Çek Makbuzu Numaralandırma modülü
 MultiCompanySetup=Çoklu şirket modülü kurulumu
 ##### Suppliers #####
 SuppliersSetup=Tedarikçi modülü kurulumu
-SuppliersCommandModel=Eksiksiz tedarikçi sipariş şablonu (logo. ..)
-SuppliersInvoiceModel=Eksiksiz tedarikçi fatura şablonu (logo. ..)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Tedarikçi faturaları numaralandırma modelleri
 IfSetToYesDontForgetPermission=Evet olarak ayarlıysa, ikinci onayı sağlayacak grup ve kullanıcılara izin sağlamayı unutmayın
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=Otomatik oluşturma için belirsiz karakter ("1","l","
 SalariesSetup=Ücretler Modülü Ayarları
 SortOrder=Sıralama düzeni
 Format=Biçim
-TypePaymentDesc=0:Müşteri ödeme türü, 1:Tedarikçi ödeme türü, 2:Hem müşteri hem de tedarikçi ödeme türü
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Yolu içerir (%s değişlende tanımlanır)
 ExpenseReportsSetup=Gider Raporları modülü Ayarları
 TemplatePDFExpenseReports=Gider raporu belgesi oluşturmak için belge şablonları
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Dış modülün uygulama içerisinden
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Tablo satırlarını fare üzerine geldiğinde vurgula
 HighlightLinesColor=Fare üzerinden geçerken satır rengini vurgula (vurgulanmaması için boş bırakın)
-TextTitleColor=Sayfa başlık rengi
+TextTitleColor=Text color of Page title
 LinkColor=Bağlantıların rengi
 PressF5AfterChangingThis=Bu değeri değiştirdikten sonra geçerli olabilmesi için klavyede CTRL+F5 tuşlarına basın veya tarayıcınızın önbelleğini temizleyin
 NotSupportedByAllThemes=Yalnızca çekirdek temaları ile çalışır ancak dış temalar tarafından desteklenmez
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=Üst menü için arka plan rengi
 TopMenuDisableImages=Üst menüdeki görüntüleri gizle
 LeftMenuBackgroundColor=Sol menü için arka plan rengi
 BackgroundTableTitleColor=Tablo satırı başlığı için arka plan rengi
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Tabloda tek satırlar için arka plan rengi
 BackgroundTableLineEvenColor=Tabloda çift satırlar için arka plan rengi
 MinimumNoticePeriod=Enaz bildirim süresi (İzin isteğiniz bu süreden önce yapılmalı)
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=Örnek: +2 (yalnızca sorun yaşanmışsa doldurun)
 ExpectedChecksum=Beklenen Sağlama
 CurrentChecksum=Geçerli Sağlama
 ForcedConstants=Gerekli sabit değerler
-MailToSendProposal=Müşteri teklifi göndermek için
-MailToSendOrder=Müşteri siparişi göndermek için
-MailToSendInvoice=Müşteri faturası göndermek için
-MailToSendShipment=Sevkiyat göndermek için
-MailToSendIntervention=Müdahale göndermek için
-MailToSendSupplierRequestForQuotation=Tedarikçiye teklif isteği göndermek için
-MailToSendSupplierOrder=Tedarikçi siparişi göndermek için
-MailToSendSupplierInvoice=Tedarikçi faturası göndermek için
-MailToSendContract=Bir sözleşme göndermek için
-MailToThirdparty=Üçüncü taraf sayfasından eposta göndermek için
-MailToMember=To send email from member page
-MailToUser=To send email from user page
-MailToProject= To send email from project page
+MailToSendProposal=Müşteri teklifleri
+MailToSendOrder=Müşteri siparişleri
+MailToSendInvoice=Müşteri faturaları
+MailToSendShipment=Sevkiyatlar
+MailToSendIntervention=Müdahaleler
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Sözleşmeler
+MailToThirdparty=Üçüncü partiler
+MailToMember=Üyeler
+MailToUser=Kullanıcılar
+MailToProject=Projects page
 ByDefaultInList=Liste görünümünde varsayılana göre göster
 YouUseLastStableVersion=En son kararlı sürümü kullanıyorsunuz
 TitleExampleForMajorRelease=Bu ana sürümü duyurmak için kullanabileceğiniz mesaj örneği (web sitenizde rahatça kullanabilirsiniz)
@@ -1780,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=PDF'deki alt kenar boşluğu
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/tr_TR/agenda.lang b/htdocs/langs/tr_TR/agenda.lang
index 272ea750778..bd59b25eac7 100644
--- a/htdocs/langs/tr_TR/agenda.lang
+++ b/htdocs/langs/tr_TR/agenda.lang
@@ -54,8 +54,8 @@ MemberModifiedInDolibarr=Üye %sdeğiştirildi
 MemberResiliatedInDolibarr=%s üyeliği bitirilmiştir
 MemberDeletedInDolibarr=Silinen üyelik %s
 MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
-MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
-MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
+MemberSubscriptionModifiedInDolibarr=%sÜye için %s abonelik değiştirildi
+MemberSubscriptionDeletedInDolibarr=%sÜye için %s abonelik silindi
 ShipmentValidatedInDolibarr=Sevkiyat %s doğrulandı
 ShipmentClassifyClosedInDolibarr=%s sevkiyatı faturalandı olarak sınıflandırıldı
 ShipmentUnClassifyCloseddInDolibarr=%s sevkiyatı yeniden açıldı olarak sınıflandırıldı
diff --git a/htdocs/langs/tr_TR/banks.lang b/htdocs/langs/tr_TR/banks.lang
index 3d51aa4f2cd..efaf67269ac 100644
--- a/htdocs/langs/tr_TR/banks.lang
+++ b/htdocs/langs/tr_TR/banks.lang
@@ -7,6 +7,7 @@ BankName=Banka adı
 FinancialAccount=Hesap
 BankAccount=Banka hesabı
 BankAccounts=Banka hesapları
+BankAccountsAndGateways=Banka hesapları | Ağ geçitleri
 ShowAccount=Hesabı Göster
 AccountRef=Ticari hesap ref
 AccountLabel=Ticari hesap adı
diff --git a/htdocs/langs/tr_TR/bills.lang b/htdocs/langs/tr_TR/bills.lang
index baa5a2a0751..ddc288342d9 100644
--- a/htdocs/langs/tr_TR/bills.lang
+++ b/htdocs/langs/tr_TR/bills.lang
@@ -109,7 +109,7 @@ CancelBill=Fatura iptal et
 SendRemindByMail=EPosta ile anımsatma gönder
 DoPayment=Enter payment
 DoPaymentBack=Enter refund
-ConvertToReduc=Gelecekteki indirime dönüştür
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Müşteriden alınan ödeme girin
@@ -120,7 +120,7 @@ BillStatus=Fatura durumu
 StatusOfGeneratedInvoices=Oluşturulan faturaların durumu
 BillStatusDraft=Taslak (doğrulanma gerektirir)
 BillStatusPaid=Ödenmiş
-BillStatusPaidBackOrConverted=Credit note refund or converted into discount
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Terkedilmiş
 BillStatusValidated=Doğrulanmış (ödenmesi gerekir)
@@ -222,7 +222,7 @@ RemainderToPayBack=Remaining amount to refund
 Rest=Bekleyen
 AmountExpected=İstenen tutar
 ExcessReceived=Fazla alınan
-ExcessPaid=Excess paid
+ExcessPaid=Fazla ödenen
 EscompteOffered=Teklif edilen indirim (vadeden önce ödemede)
 EscompteOfferedShort=İndirim
 SendBillRef=%s faturasının gönderilmesi
@@ -292,14 +292,14 @@ AbsoluteDiscountUse=Bu tür alacak fatura onaylanmadan önce faturada kullanıla
 CreditNoteDepositUse=Bu türde alacakları kullanmadan önce fatura doğrulanmış olmalıdır
 NewGlobalDiscount=Yeni mutlak indirim
 NewRelativeDiscount=Yeni göreceli indirim
-DiscountType=Discount type
+DiscountType=İndirim türü
 NoteReason=Not/Nedeni
 ReasonDiscount=Neden
 DiscountOfferedBy=Veren
-DiscountStillRemaining=Mevcut İndirimler
-DiscountAlreadyCounted=Harcanan indirimler
-CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
+CustomerDiscounts=Müşteri indirimleri
+SupplierDiscounts=Vendors discounts
 BillAddress=Fatura adresi
 HelpEscompte=Bu indirim, vadesinden önce ödeme yapıldığından dolayı müşteriye verilir.
 HelpAbandonBadCustomer=Bu tutardan vazgeçilmiştir (müşteri kötü bir müşteri olarak kabul edildiğinden dolayı) ve istisnai bir kayıp olarak kabul edilir.
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Ana firmaya ait farklı üçüncü taraf faturalar
 PaymentNote=Ödeme notu
 ListOfPreviousSituationInvoices=Önceki hakediş faturaları listesi
 ListOfNextSituationInvoices=Sonraki hakediş faturaları listesi
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Her %s günde
 FrequencyPer_m=Her %s ayda
 FrequencyPer_y=Her %s yılda
@@ -505,9 +511,14 @@ SituationAmount=Hakediş faturası tutarı (net)
 SituationDeduction=Hakediş düşülmesi
 ModifyAllLines=Bütün satırları değiştir
 CreateNextSituationInvoice=Sonraki hakedişi oluştur
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=Bu fatura serinin son faturası değildir ve değiştirilmemelidir.
 DisabledBecauseNotLastInCycle=Sonraki hakediş zaten var.
 DisabledBecauseFinal=Bu hakediş sondur.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=Pa
 CantBeLessThanMinPercent=Hakediş önceki hakedişin değerinden daha az olamaz.
 NoSituations=Açık pozisyon yok
 InvoiceSituationLast=Son ve genel fatura
@@ -529,6 +540,7 @@ StatusOfGeneratedDocuments=Status of document generation
 DoNotGenerateDoc=Belge dosyası üretme
 AutogenerateDoc=Auto generate document file
 AutoFillDateFrom=Set start date for service line with invoice date
-AutoFillDateFromShort=Set start date
+AutoFillDateFromShort=Başlangıç tarihini ayarla
 AutoFillDateTo=Set end date for service line with next invoice date
-AutoFillDateToShort=Set end date
+AutoFillDateToShort=Bitiş tarihini ayarla
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/tr_TR/categories.lang b/htdocs/langs/tr_TR/categories.lang
index 7fad46bce52..d7679be92e6 100644
--- a/htdocs/langs/tr_TR/categories.lang
+++ b/htdocs/langs/tr_TR/categories.lang
@@ -16,7 +16,7 @@ MembersCategoriesArea=Üyeler etiketleri/kategorileri alanı
 ContactsCategoriesArea=Kişi etiketleri/kategorileri alanı
 AccountsCategoriesArea=Hesap etiketleri/kategorileri alanı
 ProjectsCategoriesArea=Proje etiket/kategori alanı
-SubCats=Alt kategoriler
+SubCats=Sub-categories
 CatList= Etiketler/kategoriler listesi
 NewCategory=Yeni etiket/kategori
 ModifCat=Etiket/kategori değiştir
@@ -85,3 +85,4 @@ CategorieRecursivHelp=Etkinse, ürün bir alt kategoriye eklenirken aynı zamand
 AddProductServiceIntoCategory=Aşağıdaki ürünü/hizmeti ekle
 ShowCategory=Etiketi/kategoriyi göster
 ByDefaultInList=B listede varsayılana göre
+ChooseCategory=Choose category
diff --git a/htdocs/langs/tr_TR/commercial.lang b/htdocs/langs/tr_TR/commercial.lang
index bd822d7e563..31e0034a764 100644
--- a/htdocs/langs/tr_TR/commercial.lang
+++ b/htdocs/langs/tr_TR/commercial.lang
@@ -60,20 +60,20 @@ ActionAC_CLO=Kapat
 ActionAC_EMAILING=Toplu eposta gönder
 ActionAC_COM=Müşteri siparişini postayla gönder
 ActionAC_SHIP=Sevkiyatı postayla gönder
-ActionAC_SUP_ORD=Tedarikçi siparişini postayla gönder
-ActionAC_SUP_INV=Tedarikçi faturasını postayla gönder
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=Diğer
 ActionAC_OTH_AUTO=Otomatikman eklenen etkinlikler
 ActionAC_MANUAL=Elle eklenen etkinlikler
 ActionAC_AUTO=Otomatikman eklenen etkinlikler
-ActionAC_OTH_AUTOShort=Auto
+ActionAC_OTH_AUTOShort=Oto
 Stats=Satış istatistikleri
 StatusProsp=Aday durumu
 DraftPropals=Taslak teklifler
 NoLimit=Sınır yok
-ToOfferALinkForOnlineSignature=Link for online signature
+ToOfferALinkForOnlineSignature=Online imza için link
 WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
-ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisScreenAllowsYouToSignDocFrom=Bu ekran, bir teklifi kabul etmenize ve imzalamanıza veya reddetmenize olanak sağlar.
 ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
 SignatureProposalRef=Signature of quote/commerical proposal %s
 FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/tr_TR/companies.lang b/htdocs/langs/tr_TR/companies.lang
index 76b5b5684af..bddbac42fa0 100644
--- a/htdocs/langs/tr_TR/companies.lang
+++ b/htdocs/langs/tr_TR/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Bu kişiyi ve devralınan tüm bilgilerini silmek istediği
 MenuNewThirdParty=Yeni üçüncü parti
 MenuNewCustomer=Yeni müşteri
 MenuNewProspect=Yeni aday
-MenuNewSupplier=Yeni tedarikçi
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=Yeni özel şahıs
-NewCompany=Yeni firma (aday, müşteri, tedarikçi)
-NewThirdParty=Yeni üçüncü parti (aday, müşteri, tedarikçi)
-CreateDolibarrThirdPartySupplier=Bir üçüncü parti oluştur (tedarikçi)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=Üçüncü parti oluştur
 CreateThirdPartyAndContact=Bir üçüncü parti + bağlantılı kişi oluşturun
 ProspectionArea=Aday alanı
@@ -37,13 +37,13 @@ ThirdPartyProspectsStats=Adaylar
 ThirdPartyCustomers=Müşteriler
 ThirdPartyCustomersStats=Müşteriler
 ThirdPartyCustomersWithIdProf12=Müşteriler %s veya %s ile
-ThirdPartySuppliers=Tedarikçiler
+ThirdPartySuppliers=Vendors
 ThirdPartyType=Üçüncü parti türü
 Individual=Özel şahıs
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Ana firma
 Subsidiaries=Bağlı firmalar
-ReportByMonth=Report by month
+ReportByMonth=Aya göre rapor
 ReportByCustomers=Report by customer
 ReportByQuarter=Orana göre rapor
 CivilityCode=Hitap kodu
@@ -77,11 +77,11 @@ Web=Web
 Poste= Durumu
 DefaultLang=Varsayılan dili
 VATIsUsed=Sales tax is used
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Adresi üçüncü parti adresiyle doldurun
-ThirdpartyNotCustomerNotSupplierSoNoRef=Üçüncü taraf ne müşteri ne de tedarikçidir, bağlanacak uygun bir öğe yok.
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Ödeme banka hesabı
 OverAllProposals=Teklifler
 OverAllOrders=Siparişler
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=RE Türü
 TypeLocaltax2ES=IRPF Türü
 WrongCustomerCode=Müşteri kodu geçersiz
-WrongSupplierCode=Tedarikçi kodu geçersiz
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Müşteri kodu modeli
-SupplierCodeModel=Tedarikçi kodu modeli
+SupplierCodeModel=Vendor code model
 Gencod=Barkod
 ##### Professional ID #####
 ProfId1Short=Prof id1
@@ -261,31 +261,31 @@ ProfId4DZ=NIS
 VATIntra=Sales tax ID
 VATIntraShort=Tax ID
 VATIntraSyntaxIsValid=Sözdizimi geçerli
-VATReturn=VAT return
+VATReturn=KDV iadesi
 ProspectCustomer=Aday/Müşteri
 Prospect=Aday
 CustomerCard=Müşteri Kartı
 Customer=Müşteri
 CustomerRelativeDiscount=Göreceli müşteri indirimi
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=Göreceli indirim
 CustomerAbsoluteDiscountShort=Mutlak indirim
 CompanyHasRelativeDiscount=Bu müşterinin varsayılan bir <b>%s%%</b> indirimi var
 CompanyHasNoRelativeDiscount=Bu müşterinin varsayılan hiçbir göreceli indirimi yok
-HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this supplier
-HasNoRelativeDiscountFromSupplier=You have no default relative discount from this supplier
+HasRelativeDiscountFromSupplier=Bu tedarikçiden varsayılan olarak <b>%s%%</b> indiriminiz var
+HasNoRelativeDiscountFromSupplier=Bu tedarikçiden varsayılan göreceli indiriminiz yok 
 CompanyHasAbsoluteDiscount=Bu müşterinin <b>%s</b>%s için mevcut indirimi var (kredi notları veya peşinat)
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
 CompanyHasCreditNote=Bu müşterinin hala <b>%s</b> %s için iade faturaları var
-HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this supplier
+HasNoAbsoluteDiscountFromSupplier=Bu tedarikçiden indirim krediniz yok 
 HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this supplier
 HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this supplier
 HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this supplier
 CompanyHasNoAbsoluteDiscount=Bu müşterinin hiçbir indirim alacağı yoktur
 CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
 CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=Hiçbiri
 Supplier=Tedarikçi
 AddContact=Kişi oluştur
@@ -304,13 +304,13 @@ DeleteACompany=Firma sil
 PersonalInformations=Kişisel bilgiler
 AccountancyCode=Muhasebe hesabı
 CustomerCode=Müşteri kodu
-SupplierCode=Tedarikçi kodu
+SupplierCode=Vendor code
 CustomerCodeShort=Müşteri kodu
-SupplierCodeShort=Tedarikçi kodu
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=Tüm müşteriler için müşteri kodu benzersiz olmalı
-SupplierCodeDesc=Tüm tedarikçiler için tedarikçi kodu benzersiz olmalı
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=Eğer üçüncü parti bir müşteri ya da aday ise gereklidir
-RequiredIfSupplier=Eğer üçüncü bir tedarikçi ise gereklidir
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=Doğrulama modülü tarafından denetlenir
 ThisIsModuleRules=Bu kural bu modül içindir
 ProspectToContact=İletişime geçilecek aday
@@ -338,7 +338,7 @@ MyContacts=Kişilerim
 Capital=Sermaye
 CapitalOf=Sermaye %s
 EditCompany=Firma düzenle
-ThisUserIsNot=Bu kullanıcı bir aday, müşteri veya tedarikçi değildir
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=Denetle
 VATIntraCheckDesc=<b>%s</b> bağlantısı avrupa KDV denetimi hizmetinin istenmesini sağlar. Bu hizmeti çalıştırmak için sunucudan bir dış internet erişimi gerektirir.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -396,7 +396,7 @@ ImportDataset_company_4=Third parties/Sales representatives (Assign sales repres
 PriceLevel=Fiyat düzeyi
 DeliveryAddress=Teslimat adresi
 AddAddress=Adres ekle
-SupplierCategory=Tedarikçi kategorisi
+SupplierCategory=Vendor category
 JuridicalStatus200=Bağımsız
 DeleteFile=Dosya sil
 ConfirmDeleteFile=Bu dosyayı silmek istediğinizden emin misiniz?
@@ -406,7 +406,7 @@ FiscalYearInformation=Mali yıla ait bilgi
 FiscalMonthStart=Mali yılın başlangıç ayı
 YouMustAssignUserMailFirst=Bu kişiye eposta bildirimleri ekleyebilmek için önce bu kişiye e-posta oluşturmalısınız.
 YouMustCreateContactFirst=Eposta bildirimleri ekleyebilmek için önce geçerli epostası olan üçüncü taraf kişisi oluşturmanız gerekir.
-ListSuppliersShort=Tedarikçi listesi
+ListSuppliersShort=List of vendors
 ListProspectsShort=Aday Listesi
 ListCustomersShort=Müşteri listesi
 ThirdPartiesArea=Üçüncü partiler kişi alanı
@@ -420,7 +420,7 @@ CurrentOutstandingBill=Geçerli bekleyen fatura
 OutstandingBill=Ödenmemiş fatura için ençok tutar
 OutstandingBillReached=Ödenmemiş fatura için ulaşılan ençok tutar
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Sayı biçimini müşteri için %syymm-nnn, tedarikçi için %syymm-nnn gösterir, yy yıl, mm ay ve nnnn ise 0 olmayan bir dizidir
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=Müşteri/tedarikçi kodu serbesttir. Bu kod herhangi bir zamanda değiştirilebilir.
 ManagingDirectors=Yönetici(lerin) adı (CEO, müdür, başkan...)
 MergeOriginThirdparty=Çifte üçüncü parti (silmek istediğiniz üçüncü parti)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Satış temsilcisinin kullanıcı adı
 SaleRepresentativeFirstname=Satış temsilcisinin adı
 SaleRepresentativeLastname=Satış temsilcisinin soyadı
 ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=Yinelenen kod üzerinde yeni müşteri veya tedarikçi kodu önerildi
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/tr_TR/compta.lang b/htdocs/langs/tr_TR/compta.lang
index b5507c16f42..fee50d33aac 100644
--- a/htdocs/langs/tr_TR/compta.lang
+++ b/htdocs/langs/tr_TR/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=Net ödenen
 VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
-VATSummary=Tax Balance
+VATSummary=Tax monthly
+VATBalance=Tax Balance
 VATPaid=Tax paid
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=Muhasebe/Maliye alanı
 NewPayment=Yeni ödeme
 Payments=Ödemeler
 PaymentCustomerInvoice=Müşteri fatura ödemesi
-PaymentSupplierInvoice=Tedarikçi fatura ödemesi
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Sosyal/mali vergi ödemesi
 PaymentVat=KDV ödeme
 ListPayment=Ödemeler listesi
 ListOfCustomerPayments=Müşteri ödemeleri listesi
-ListOfSupplierPayments=Tedarikçi ödemeleri listesi
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Başlangıç dönemi tarihi
 DateEndPeriod=Bitiş dönemi tarihi
 newLT1Payment=Yeni vergi 2 ödemesi
@@ -110,7 +111,7 @@ ShowVatPayment=KDV ödemesi göster
 TotalToPay=Ödenecek toplam
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
 CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Müşt. hesap kodu
 SupplierAccountancyCodeShort=Ted. hesap kodu
 AccountNumber=Hesap numarası
@@ -170,7 +171,9 @@ LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=RE Üçüncü partiye göre rapor
 LT2ReportByCustomersES=Üçüncü parti IRPF Raporu
 VATReport=Sale tax report
-VATReportByPeriods=Sale tax report by period
+VATReportByPeriods=Döneme göre satış vergisi raporu
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Müşteriye göre alınan ve ödenen KDV raporu
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Hesap planı modelleri
 Pcg_type=Pcg türü
 Pcg_subtype=Pcg alt türü
 InvoiceLinesToDispatch=Gönderilecek fatura kalemleri
-ByProductsAndServices=Ürün ve hizmete göre
+ByProductsAndServices=By product and service
 RefExt=Dış ref
 ToCreateAPredefinedInvoice=Bir fatura şablonu oluşturmak için, bir standart fatura oluşturun sonra onu doğrulamadan "%s" düğmesine tıklayın.
 LinkedOrder=Siparişe bağlantıla
@@ -215,7 +218,8 @@ Mode1=Yöntem 1
 Mode2=Yöntem 2
 CalculationRuleDesc=Toplam KDV hesabı için 2 yöntem vardır:<br>Yöntem 1, her satırda KDV yuvarlanır sonra satırların toplamı alınır.<br>Yöntem 2, her satırda KDV toplanır sonra sonuç yuvarlanır.<br>Sonuç değeri bir kaç kuruş fark gösterebilir. Varsayılan mod <b>%s</b> modudur.
 CalculationRuleDescSupplier=Aynı hesaplama kuralını uygulamak ve tedarikçiniz tarafından beklenen aynı sonucu elde etmek için tedarikçiye göre uygun yöntem seçin.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Ürüne göre ciro raporu, <b>nakit muhasebesi</b>modu için uygun değildir. Bu rapor yalnızca, <b>tahakkuk muhasebesi</b> modu için uygundur (muhasebe modülü ayarlarına bakın).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Hesaplama modu
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=Sosyal/mali vergi kopyala
 ConfirmCloneTax=Sosyal/mali vergi ödemesi kopyalamasını onayla
@@ -242,3 +246,10 @@ FiscalPeriod=Muhasebe dönemi
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/tr_TR/dict.lang b/htdocs/langs/tr_TR/dict.lang
index 8a02ef719c3..189416aa811 100644
--- a/htdocs/langs/tr_TR/dict.lang
+++ b/htdocs/langs/tr_TR/dict.lang
@@ -5,7 +5,8 @@ CountryIT=İtalya
 CountryES=İspanya
 CountryDE=Almanya
 CountryCH=İsviçre
-CountryGB=İngiltere
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=Birleşik Krallık
 CountryUK=Birleşik Krallık
 CountryIE=İrlanda
 CountryCN=Çin
diff --git a/htdocs/langs/tr_TR/ecm.lang b/htdocs/langs/tr_TR/ecm.lang
index 24190f84bb9..9bf6bd63247 100644
--- a/htdocs/langs/tr_TR/ecm.lang
+++ b/htdocs/langs/tr_TR/ecm.lang
@@ -39,12 +39,13 @@ ShowECMSection=Dizini göster
 DeleteSection=Dizini kaldır
 ConfirmDeleteSection=<b>%s</b> dizinini silmek istediğinizi onaylayabilir misiniz?
 ECMDirectoryForFiles=Dosyalar için göreceli dizin
-CannotRemoveDirectoryContainsFiles=Bazı dosyalar içeridiğinden
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=Dosya yöneticisi
-ECMSelectASection=Sol ağaçtan bir dizin seçin...
+ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
 FileSharedViaALink=File shared via a link
-NoDirectoriesFound=No directories found
+NoDirectoriesFound=Dizin bulunamadı
diff --git a/htdocs/langs/tr_TR/errors.lang b/htdocs/langs/tr_TR/errors.lang
index 23496d5e784..0022570ca0b 100644
--- a/htdocs/langs/tr_TR/errors.lang
+++ b/htdocs/langs/tr_TR/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Bar kod gerekli
 ErrorCustomerCodeAlreadyUsed=Müşteri kodu zaten kullanılmış
 ErrorBarCodeAlreadyUsed=Bar kod zaten kullanıldı
 ErrorPrefixRequired=Önek gerekli
-ErrorBadSupplierCodeSyntax=Tedarikçi kodu için hatalı kod
-ErrorSupplierCodeRequired=Tedarikçi kodu gereklidir
-ErrorSupplierCodeAlreadyUsed=Tedarikçi kodu zaten kullanılmaktadır
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Hatalı parametreler
 ErrorBadValueForParameter=Yanlış değer '%s', parametre '%s' için
 ErrorBadImageFormat=Resim dosyası desteklenen biçimde değil (PHP niz bu biçimdeki resimlerin dönüştürülme işlevini desteklemez)
@@ -87,7 +87,7 @@ ErrorsOnXLines=<b>%</b> kaynak satırlarındaki hatalar
 ErrorFileIsInfectedWithAVirus=Virüs koruma programı dosyayı doğrulayamıyor (dosyaya bir virüs bulaşmış olabilir)
 ErrorSpecialCharNotAllowedForField=%s alanında özel karakterlere izin verilmez
 ErrorNumRefModel=Veritabanına (%s) bir başvuru var ve bu numaralandırma kuralı ile uyumlu değildir. Kaydı kaldırın ya da bu modülü etkinleştirmek için başvurunun adını değiştirin.
-ErrorQtyTooLowForThisSupplier=Bu tedarikçi için miktar çok az ya da bu tedarikçi için bu ürüne tanımlı fiyat yok
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Modül ayarı tamamlanmamış gibi görünüyor. Tamamlamak için Giriş - Ayarlar - Modüller menüsüne git.
 ErrorBadMask=Maskede hata
 ErrorBadMaskFailedToLocatePosOfSequence=Hata, sıra numarasız  maske
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Modül Tanımlayıcıda hatalı
 ErrorSavingChanges=Değişiklikler kaydedilirken bir hata oluştu
 ErrorWarehouseRequiredIntoShipmentLine=Depo gemi hattı üzerinde gerekli
 ErrorFileMustHaveFormat=Dosya %s biçiminde olmalıdır
-ErrorSupplierCountryIsNotDefined=Bu tedarikçi için ülke tanımlanmamış. Önce bunu düzeltin.
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=İki kaydın birleştirilmesinde hata. İstek iptal edildi.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
diff --git a/htdocs/langs/tr_TR/install.lang b/htdocs/langs/tr_TR/install.lang
index b41c5216537..f3cd379fb1b 100644
--- a/htdocs/langs/tr_TR/install.lang
+++ b/htdocs/langs/tr_TR/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=Yapılandırma dosyası <b>%s</b> yokt
 ConfFileCouldBeCreated=Yapılandırma dosyası <b>%s</b> oluşturulabilir.
 ConfFileIsNotWritable=Yapılandırma dosyası <b>%s</b> yazılabilir değil. Yetkileri kontrol edin. İlk yüklemede web sunucusuna yapılandırma işlemi sırasında bu dosyaya yazabilme hakkının verilmiş olması gerekir ( "örneğin, chmod 666, bir Unix işletim sistemindeki gibi).
 ConfFileIsWritable=Yapılandırma dosyası <b>%s</b>  yazılabilir.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Bütün bilgileri yapılandırma dosyasından geri yükle.
 PHPSupportSessions=Bu PHP oturumları destekliyor.
 PHPSupportPOSTGETOk=Bu PHP GÖNDER ve AL değişkenlerini destekliyor.
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Dolibarr yönetici hesabı oluşturulmasında hata.
 WarningRemoveInstallDir=Uyarı, güvenlik nedeniyle, kurulum veya yükseltme tamamlandığında, araçların yeniden kurulumunu önlemek için  <b>install.lock</b> adlı bir dosyayı kötü amaçlı kullanımları önlemek için Dolibarr belge dizinine eklemelisiniz.
 FunctionNotAvailableInThisPHP=Bu PHP de geçerli değil
 ChoosedMigrateScript=Komut dizisi taşıma seç
-DataMigration=Veri taşıma
-DatabaseMigration=Veritabanı yapısı taşıma
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Komut dizisi işleme
 ChooseYourSetupMode=Kurulum biçimini seçin ve "Başlat" ı tıklayın...
 FreshInstall=Yeni yükleme
@@ -141,12 +142,12 @@ KeepDefaultValuesProxmox=Proxmox sanal aygıt  üzerinden Dolibarr kurulum sihir
 UpgradeExternalModule=Harici modüllerin özel yükseltme işlemini çalıştırın
 SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
 NothingToDelete=Nothing to clean/delete
-NothingToDo=Nothing to do
+NothingToDo=Yapacak bir şey yok
 #########
 # upgrade
 MigrationFixData=Standart dışı veri onarımı
 MigrationOrder=Müşteri siparişleri için veri taşıma
-MigrationSupplierOrder=Tedarikçi siparişleri için veri taşıma
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Teklifler için veri taşıma
 MigrationInvoice=Müşteri faturaları için veri taşıma
 MigrationContract=Sözleşmeler için veri taşıma
@@ -196,6 +197,8 @@ MigrationEvents=Atama tablosuna etkinlik sahibi eklemek için gerekli taşıma e
 MigrationEventsContact=Migration of events to add event contact into assignement table
 MigrationRemiseEntity=value of llx_societe_remise varlık alanını güncelle
 MigrationRemiseExceptEntity=llx_societe_remise_except varlık alanını güncelle
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
 MigrationReloadModule=Modülü yeniden yükle %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 ShowNotAvailableOptions=Kullanılamayacak seçenekler görüntülensin
diff --git a/htdocs/langs/tr_TR/ldap.lang b/htdocs/langs/tr_TR/ldap.lang
index 50dd4c1ff72..1494328d504 100644
--- a/htdocs/langs/tr_TR/ldap.lang
+++ b/htdocs/langs/tr_TR/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Etki alanı parolası
 YouMustChangePassNextLogon=<b>%s</b> Etki alanındaki <b>%s</b> kullanıcısının parolası değiştirilmelidir.
 UserMustChangePassNextLogon=Kullanıcı, %s etki alanındaki  parolasını değiştirmelidir
 LDAPInformationsForThisContact=Bu kişi için LDAP veritabanındaki bilgi
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Member type synchronized
 ContactSynchronized=Kişi senkronize edildi
 ForceSynchronize=Dolibarr -> LDAP senkronizyona zorla
 ErrorFailedToReadLDAP=LDAP veritabanı okunamadı. LDAP modülü kurulumunu ve veritabanı erişilebilirliğini denetleyin.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/tr_TR/loan.lang b/htdocs/langs/tr_TR/loan.lang
index d43b8c60ca5..758fa6d7a93 100644
--- a/htdocs/langs/tr_TR/loan.lang
+++ b/htdocs/langs/tr_TR/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=Sermaye
 Insurance=Sigorta
 Interest=Faiz
 Nbterms=Koşul sayısı
+Term=Term
 LoanAccountancyCapitalCode=Muhasebe hesabı sermayesi
 LoanAccountancyInsuranceCode=Muhasebe hesabı sigortası
 LoanAccountancyInterestCode=Muhasebe hesabı faiz oranı
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=Bu kredinin silinmesini onayla
 LoanDeleted=Kredi Başarıyla Silindi
 ConfirmPayLoan=Bu krediyi ödendi olarak sınıflandırmayı onayla
 LoanPaid=Kredi Ödendi
-# Calc
-LoanCalc=Banka Kredisi Hesaplayıcısı
-PurchaseFinanceInfo=Alış & Finansman Bilgisi
-SalePriceOfAsset=Varlığın Satış Fiyatı
-PercentageDown=Peşinat Yüzdesi
-LengthOfMortgage=Kredinin süresi
-AnnualInterestRate=Yıllık Faiz Oranı
-ExplainCalculations=Hesaplama Açıklaması
-ShowMeCalculationsAndAmortization=Hesaplamaları ve amortismanı göster bana
-MortgagePaymentInformation=İpotek Kredisi Ödeme Bilgisi
-DownPayment=Peşinat
-DownPaymentDesc=<b>Peşinat ödemesi</b> = Evin fiyatı, peşinat yüzdesinin 100 e bölünmüş değeri ile çarpılır (%5 için peşinat 5/100 ya da 0.05)
-InterestRateDesc=<b>Faiz oranı</b> = Yıllık faiz yüzdesinin 100 e bölünmesi
-MonthlyFactorDesc=<b>Aylık katsayı</b> = Aşağıdaki formülün sonucu
-MonthlyInterestRateDesc=<bAylık faiz oranı</b> = Yıllık faiz oranı 12 ye bölünür (yılda 12 ay olduğuna göre)
-MonthTermDesc=Kredinin ay olarak <b>ay sayısı</b>  = Krediyi aldığınız yıl sayısı çarpı 12
-MonthlyPaymentDesc=Aylık ödeme aşağıdaki formül kullanılarak bulunur
-AmortizationPaymentDesc=<a href="#amortization">amortisman</a> aylık ödemelerinizin ne kadarının banka faizine gittiğini ve ne kadarının ana para ödemesine gittiğini ayrıştırır.
-AmountFinanced=Finanse edilen tutar
-AmortizationMonthlyPaymentOverYears=Aylık Ödeme Amortismanı:  <b>%s</b>  %s yılın üzerinde
-Totalsforyear=Toplamı alınan yıl
-MonthlyPayment=Aylık Ödeme
-LoanCalcDesc=Bu <b>ipotekli borç hesaplayıcısı</b> alınan krediye, ödeme şartı ve faize dayalı olarak kredinin aylık ödemelerinin hesaplanmasında kullanılır.<br> Bu hesaplayıcısı, %20% az peşin ödemeli krediler için PMI (Özel İpotek Sigortası) da içerir. Aynı zamanda yerel gayrımenkul vergilerini de ve aylık ödemeler yansımasını da dikkate alır.<br>
-GoToInterest=%s FAİZE gidecek
-GoToPrincipal=%s ANA PARAYA gidecek
-YouWillSpend=%s tutarını %s yılda harcayaksınız
 ListLoanAssociatedProject=Proje ile ilişkili kredi listesi
 AddLoan=Kredi oluştur
+FinancialCommitment=Finansal taahhüt
+InterestAmount=Faiz
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=Kredi modülünün yapılandırılması
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Varsayılan muhasebe hesabı sermayesi
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Varsayılan muhasebe hesabı faiz oranı
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Varsayılan muhasebe hesabı sigortası
-FinancialCommitment=Financial commitment
 CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/langs/tr_TR/mails.lang b/htdocs/langs/tr_TR/mails.lang
index 0e4a9db4ce4..5468d2ff391 100644
--- a/htdocs/langs/tr_TR/mails.lang
+++ b/htdocs/langs/tr_TR/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Gönderen
 MailErrorsTo=Hatalar
 MailReply=Yanıtla
 MailTo=Alıcı(lar)
+MailToUsers=To user(s)
 MailCC=Kopyala
+MailToCCUsers=Copy to users(s)
 MailCCC=Önbelleğe kopyala
 MailTopic=EPosta konusu
 MailText=Mesaj
@@ -164,4 +166,4 @@ InGoingEmailSetup=Gelen e-posta kurulumu
 OutGoingEmailSetupForEmailing=Giden e-posta kurulumu (toplu e-posta için)
 DefaultOutgoingEmailSetup=Varsayılan giden e-posta kurulumu
 Information=Bilgi
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang
index 12147d314d2..964315ea6fa 100644
--- a/htdocs/langs/tr_TR/main.lang
+++ b/htdocs/langs/tr_TR/main.lang
@@ -44,7 +44,7 @@ ErrorConstantNotDefined=%s Parametresi tanımlı değil
 ErrorUnknown=Bilinmeyen hata
 ErrorSQL=SQL Hatası
 ErrorLogoFileNotFound='%s' Logo dosyası bulunamadı
-ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
+ErrorGoToGlobalSetup=Bunu düzeltmek için 'Şirket/Kuruluş' ayarlarına gidin
 ErrorGoToModuleSetup=Bunu düzeltmek için Modül Kurulumuna git
 ErrorFailedToSendMail=Posta gönderilemedi (gönderen)
 ErrorFileNotUploaded=Dosya gönderilemedi. Boyutun izin verilen ençok dosya boyutunu aşmadığını denetleyin, bu dizinde yeterli boş alan olmalı ve aynı isimde başka bir dosya olmamalı.
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Yapılandırma dosyası <b>conf.ph
 Administrator=Yönetici
 Undefined=Tanımlanmamış
 PasswordForgotten=Parola mı unutuldu?
+NoAccount=No account?
 SeeAbove=Yukarı bak
 HomeArea=Giriş alanı
 LastConnexion=Son bağlantı
@@ -187,7 +188,7 @@ ToLink=Bağlantı
 Select=Seç
 Choose=Seç
 Resize=Yeniden boyutlandır
-ResizeOrCrop=Resize or Crop
+ResizeOrCrop=Yeniden Boyutlandır veya Kırp
 Recenter=Yeniden ortala
 Author=Yazan
 User=Kullanıcı
@@ -231,7 +232,7 @@ Limit=Sınır
 Limits=Sınırlar
 Logout=Çıkış
 NoLogoutProcessWithAuthMode=Kimlik denetimi modu <b>%s</b> için uygulanabilir bağlantı kesme özelliği yok
-Connection=Bağlan
+Connection=Kullanıcı adı
 Setup=Ayarlar
 Alert=Uyarı
 MenuWarnings=Uyarılar
@@ -328,10 +329,10 @@ Default=Varsayılan
 DefaultValue=Varsayılan değer
 DefaultValues=Varsayılan değerler
 Price=Fiyat
-PriceCurrency=Price (currency)
+PriceCurrency=Fiyat (para birimi)
 UnitPrice=Birim fiyat
 UnitPriceHT=Birim fiyat (net)
-UnitPriceHTCurrency=Unit price (net) (currency)
+UnitPriceHTCurrency=Birim fiyat (net) (para birimi)
 UnitPriceTTC=Birim fiyat
 PriceU=B.F.
 PriceUHT=B.F. (net)
@@ -396,12 +397,13 @@ LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=KDV Oranı
-VATCode=Tax Rate code
+VATCode=Vergi Oranı kodu
 VATNPR=Tax Rate NPR
 DefaultTaxRate=Varsayılan vergi oranı
 Average=Ortalama
 Sum=Toplam
 Delta=Değişim oranı
+RemainToPay=Remain to pay
 Module=Modül/Uygulama
 Modules=Modüller/Uygulamalar
 Option=Seçenek
@@ -414,7 +416,7 @@ Favorite=Sık kullanılan
 ShortInfo=Bilgi.
 Ref=Ref.
 ExternalRef=Ref. stajyer
-RefSupplier=Ref. tedarikçi
+RefSupplier=Ref. vendor
 RefPayment=Ref. ödeme
 CommercialProposalsShort=Teklifler
 Comment=Açıklama
@@ -428,7 +430,7 @@ ActionRunningShort=Devam etmekte
 ActionDoneShort=Bitti
 ActionUncomplete=Tamamlanmamış
 LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Company/Organization
+CompanyFoundation=Şirket/Kuruluş
 Accountant=Accountant
 ContactsForCompany=Bu üçüncü partinin kişileri
 ContactsAddressesForCompany=Bu üçüncü partinin kişleri/adresleri
@@ -493,7 +495,7 @@ Received=Alınan
 Paid=Ödenen
 Topic=Konu
 ByCompanies=Üçüncü partilere göre
-ByUsers=Kullanıcılara göre
+ByUsers=By user
 Links=Bağlantılar
 Link=Bağlantı
 Rejects=Kusurlular
@@ -619,9 +621,9 @@ BuildDoc=Doc oluştur
 Entity=Varlık
 Entities=Varlıklar
 CustomerPreview=Müşteri önizleme
-SupplierPreview=Tedarikçi önizleme
+SupplierPreview=Vendor preview
 ShowCustomerPreview=Müşteri önizlemeyi göster
-ShowSupplierPreview=Tedarikçi önizlemeyi göster
+ShowSupplierPreview=Show vendor preview
 RefCustomer=Müşteri Ref.
 Currency=Para birimi
 InfoAdmin=Yöneticiler için bilgi
@@ -718,7 +720,7 @@ CoreErrorTitle=Sistem hatası
 CoreErrorMessage=Üzgünüz, bir hata oluştu. Günlükleri kontrol etmek için sistem yöneticinize başvurun veya daha fazla bilgi almak için $dolibarr_main_prod=1 devre dışı bırakın.
 CreditCard=Kredi kartı
 ValidatePayment=Ödeme doğrula
-CreditOrDebitCard=Credit or debit card
+CreditOrDebitCard=Kredi veya banka kartı
 FieldsWithAreMandatory=<b>%s</b> olan alanları zorunludur
 FieldsWithIsForPublic=Üyelerin genel listelerinde <b>%s</b> olan alanlar gösterilir. Bunu istemiyorsanız, “genel” kutusundan işareti kaldırın.
 AccordingToGeoIPDatabase=(GeoIP dönüşümüne göre)
@@ -866,7 +868,7 @@ FileNotShared=File not shared to exernal public
 Project=Proje
 Projects=Projeler
 Rights=İzinler
-LineNb=Line no.
+LineNb=Satır no.
 IncotermLabel=Uluslararası Ticaret Terimleri
 # Week day
 Monday=Pazartesi
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=Ürünler ya da hizmetler
 SearchIntoProjects=Projeler
 SearchIntoTasks=Görevler
 SearchIntoCustomerInvoices=Müşteri faturaları
-SearchIntoSupplierInvoices=Tedarikçi faturaları
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Müşteri siparişleri
-SearchIntoSupplierOrders=Tedarikçi siparişleri
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=Müşteri teklifleri
-SearchIntoSupplierProposals=Tedarikçi siparişleri
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Müdahaleler
 SearchIntoContracts=Sözleşmeler
 SearchIntoCustomerShipments=Müşteri sevkiyatları
@@ -933,11 +935,13 @@ CommentDeleted=Yorum silindi
 Everybody=Herkes
 PayedBy=Ödeyen
 PayedTo=Ödenen
-Monthly=Monthly
-Quarterly=Quarterly
-Annual=Annual
+Monthly=Aylık
+Quarterly=Üç aylık
+Annual=Yıllık
 Local=Local
 Remote=Remote
 LocalAndRemote=Local and Remote
-KeyboardShortcut=Keyboard shortcut
+KeyboardShortcut=Klavye kısayolu
 AssignedTo=Görevlendirilen
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/tr_TR/margins.lang b/htdocs/langs/tr_TR/margins.lang
index dc9ddf09e15..4320db328c8 100644
--- a/htdocs/langs/tr_TR/margins.lang
+++ b/htdocs/langs/tr_TR/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=Hizmet olarak
 UseDiscountOnTotal=Ara toplamla
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Genel bir indirimin, kar oranı hesaplaması için bir ürün, hizmet ya da yalnızca ara toplam olarak mı değerlendirildiğini tanımlayın.
 MARGIN_TYPE=Kar oranı hesaplaması için varsayılan olarak önerilen Satınalma/Maliyet fiyatı
-MargeType1=En iyi tedarikçi fiyatı kar oranı
+MargeType1=Margin on Best vendor price
 MargeType2=Ağırlıklı Ortalama Fiyatta Kar Oranı (AOF)
 MargeType3=Maliyet Fiyatı karı
-MarginTypeDesc=* En iyi alış fiyatı karı _ Satış fiyatı - Ürün kartında tanımlı en iyi tedarikçi fiyatı<br>* Ortalama Ağırlıklı Fiyat (OAF) Karı = Satış fiyatı - Ürün Ortalama Ağırlıklı Fiyatı (OAF) veya eğer OAF henüz tanımlanmadıysa en iyi tedarikçi fiyatı<br>* Maliyet fiyatındaki Kar = Satış fiyatı - Ürün kartında tanımlı maliyet fiyatı veya OAF eğer maliyet fiyatı tanımlanmadıysa veya OAF tanımlanmadıysa en iyi tedarikçi fiyatı
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Maliyet fiyatı
 UnitCharges=Birim masrafları
 Charges=Masraflar
diff --git a/htdocs/langs/tr_TR/members.lang b/htdocs/langs/tr_TR/members.lang
index 449a3ff7b0d..8916a7e9ca2 100644
--- a/htdocs/langs/tr_TR/members.lang
+++ b/htdocs/langs/tr_TR/members.lang
@@ -111,14 +111,14 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
-YourMembershipRequestWasReceived=Your membership was received.
-YourMembershipWasValidated=Your membership was validated
+YourMembershipRequestWasReceived=Üyeliğiniz alındı.
+YourMembershipWasValidated=Üyeliğiniz doğrulandı
 YourSubscriptionWasRecorded=Your new subscription was recorded
-SubscriptionReminderEmail=Subscription reminder
-YourMembershipWasCanceled=Your membership was canceled
+SubscriptionReminderEmail=Abonelik hatırlatma
+YourMembershipWasCanceled=Üyeliğiniz iptal edildi
 CardContent=Üye kartınızın içeriği
 # Text of email templates
 ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
@@ -191,7 +191,7 @@ NoVatOnSubscription=Abonelikler için KDV yok
 MEMBER_PAYONLINE_SENDEMAIL=Dolibarr bir abonelik için doğrulanmış bir ödemenin onayını aldığında uyarı epostası olarak kullanılacak eposta (Örneğin: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Faturada abonelik kalemi olarak kullanılan ürün: %s
 NameOrCompany=İsim veya şirket
-SubscriptionRecorded=Subscription recorded
+SubscriptionRecorded=Abonelik kaydedildi
 NoEmailSentToMember=No email sent to member
 EmailSentToMember=Email sent to member at %s
 SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
diff --git a/htdocs/langs/tr_TR/opensurvey.lang b/htdocs/langs/tr_TR/opensurvey.lang
index 6e68be4090e..8a2c5496bfc 100644
--- a/htdocs/langs/tr_TR/opensurvey.lang
+++ b/htdocs/langs/tr_TR/opensurvey.lang
@@ -57,4 +57,5 @@ ErrorInsertingComment=Yorumunuzu eklerken bir hata oluştu
 MoreChoices=Oy kullananlar için daha çok seçenek girin
 SurveyExpiredInfo=Anket kapandı veya oylama süresi doldu.
 EmailSomeoneVoted=%s bir satır doldurdu.\nAnketi bu bağlantıda bulabilirsiniz: \n%s
-ShowSurvey=Show survey
+ShowSurvey=Anketi göster
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/tr_TR/orders.lang b/htdocs/langs/tr_TR/orders.lang
index 3466a8384ee..a81da61f28e 100644
--- a/htdocs/langs/tr_TR/orders.lang
+++ b/htdocs/langs/tr_TR/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Müşteri siparişleri alanı
-SuppliersOrdersArea=Tedarikçi siparişleri alanı
+SuppliersOrdersArea=Purchase orders area
 OrderCard=Sipariş kartı
 OrderId=Sipariş Kimliği
 Order=Sipariş
@@ -13,18 +13,18 @@ OrderToProcess=İşlenecek sipariş
 NewOrder=Yeni sipariş
 ToOrder=Sipariş yap
 MakeOrder=Sipariş yap
-SupplierOrder=Tedarikçi siparişi
-SuppliersOrders=Tedarikçi siparişleri
-SuppliersOrdersRunning=Mevcut tedarikçi siparişleri
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=Müşteri siparişi
-CustomersOrders=Müşteri siparişleri
+CustomersOrders=Müşteri Siparişleri
 CustomersOrdersRunning=Geçerli müşteri siparişleri
 CustomersOrdersAndOrdersLines=Müşteri siparişleri ve sipariş kalemleri
 OrdersDeliveredToBill=Faturaya gönderilen müşteri siparişleri
 OrdersToBill=Teslim edilecek müşteri siparişleri
 OrdersInProcess=İşlemde olan müşteri siparişleri
 OrdersToProcess=İşlenecek müşteri siparişleri
-SuppliersOrdersToProcess=İşlenecek tedarikçi siparişleri
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=İptal edilmiş
 StatusOrderDraftShort=Taslak
 StatusOrderValidatedShort=Doğrulanmış
@@ -75,15 +75,15 @@ ShowOrder=Siparişi göster
 OrdersOpened=İşlenecek siparişler
 NoDraftOrders=Taslak sipariş yok
 NoOrder=Sipariş yok
-NoSupplierOrder=Tedarikçi siparişi yok
+NoSupplierOrder=No purchase order
 LastOrders=Son %s müşteri siparişi
 LastCustomerOrders=Son %s müşteri siparişi
-LastSupplierOrders=Son %s tedarikçi siparişi
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=Değiştirilen son %s sipariş
 AllOrders=Bütün siparişler
 NbOfOrders=Sipariş sayısı
 OrdersStatistics=Sipariş istatistikleri
-OrdersStatisticsSuppliers=Tedarikçi siparişleri istatistikleri
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Aylık sipariş sayısı
 AmountOfOrdersByMonthHT=Aylık sipariş tutarı (vergisiz net)
 ListOfOrders=Sipariş listesi
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</
 GenerateBill=Fatura oluştur
 ClassifyShipped=Teslim edildi sınıflandır
 DraftOrders=Taslak siparişler
-DraftSuppliersOrders=Taslak tedarikçi siparişi
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=İşlemdeki siparişler
 RefOrder=Sipariş ref.
 RefCustomerOrder=Müşterinin sipariş ref.
-RefOrderSupplier=Tedarikçi sipariş ref.
-RefOrderSupplierShort=Ref. order supplier
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=Siparişi postayla gönder
 ActionsOnOrder=Sipariş etkinlikleri
 NoArticleOfTypeProduct='ürün' türünde herhangi bir madde olmadığından bu sipariş için sevkedilebilir madde yok
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Bu siparişi kopyalamak istediğinizden emin misiniz <b>%s</b>
 DispatchSupplierOrder=%s tedarikçi siparişini al
 FirstApprovalAlreadyDone=İlk onay zaten yapılmış
 SecondApprovalAlreadyDone=İkinci onaylama zaten yapılmış
-SupplierOrderReceivedInDolibarr=%s Tedarikçi siparişi alındı %s
-SupplierOrderSubmitedInDolibarr=%s Tedarikçi siparişi sunuldu
-SupplierOrderClassifiedBilled=%s Tedarikçi siparişi faturalandı ayarlı
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Diğer siparişler
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Müşteri siparişi izleme temsilcisi
@@ -125,11 +125,11 @@ TypeContact_commande_internal_SHIPPING=Sevkiyat izleme temsilcisi
 TypeContact_commande_external_BILLING=Müşteri fatura yetkilisi
 TypeContact_commande_external_SHIPPING=Müşteri nakliye yetkilisi
 TypeContact_commande_external_CUSTOMER=Müşteri sipariş izleme yetkilisi
-TypeContact_order_supplier_internal_SALESREPFOLL=Tedarikçi sipariş izleme temsilcisi
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Sevkiyat izleme temsilcisi
-TypeContact_order_supplier_external_BILLING=Tedarikçi fatura yetkilisi
-TypeContact_order_supplier_external_SHIPPING=Tedarikçi sevkiyat yetkilisi
-TypeContact_order_supplier_external_CUSTOMER=Tedarikçi sipariş izleme yetkilisi
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=COMMANDE_SUPPLIER_ADDON değişmezi tanımlanmamış
 Error_COMMANDE_ADDON_NotDefined=Sabit COMMANDE_ADDON tanımlanmamış
 Error_OrderNotChecked=Faturalanacak seçilmiş sipariş yok
diff --git a/htdocs/langs/tr_TR/other.lang b/htdocs/langs/tr_TR/other.lang
index 2cb36fdfde6..5a7a101ed9b 100644
--- a/htdocs/langs/tr_TR/other.lang
+++ b/htdocs/langs/tr_TR/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nBu, __EMAIL__ adresine gönderilen bir test mail
 PredefinedMailTestHtml=__(Hello)__\nBu bir <b>test</b> mailidir (test kelimesi kalın olmalıdır). <br> İki satır bir satırbaşı ile birbirinden ayrılır. <br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nBurada ticari teklifi bulacaksınız __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nBurada fiyat talebini bulacaksınız __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nBurada siparişi bulacaksınız __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nBurada siparişimizi bulacaksınız __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -216,9 +216,9 @@ StartUpload=Yüklemeyi başlat
 CancelUpload=Yüklemeyi iptal et
 FileIsTooBig=Dosyalar çok büyük
 PleaseBePatient=Lütfen sabırlı olun...
-NewPassword=New password
+NewPassword=Yeni şifre
 ResetPassword=Şifreyi sıfırla
-RequestToResetPasswordReceived=Dolibarr parolanızı değiştirmek için bir istek alınmıştır
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=Oturum açmak için yeni anahtarınız
 NewKeyWillBe=Yazılımda oturum açmak için yeni anahtarınız bu olacaktır
 ClickHereToGoTo=%s e gitmek için buraya tıkla
@@ -233,6 +233,8 @@ PermissionsDelete=İzinler kaldırıldı
 YourPasswordMustHaveAtLeastXChars=Şifreniz en az <strong>%s</strong> karakter içermelidir
 YourPasswordHasBeenReset=Şifreniz başarılı bir şekilde sıfırlandı
 ApplicantIpAddress=Başvuru sahibinin IP adresi
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=Dışaaktar alanı
 AvailableFormats=Varolan biçimler
diff --git a/htdocs/langs/tr_TR/productbatch.lang b/htdocs/langs/tr_TR/productbatch.lang
index b929aef493e..bfd89ca0cf2 100644
--- a/htdocs/langs/tr_TR/productbatch.lang
+++ b/htdocs/langs/tr_TR/productbatch.lang
@@ -16,9 +16,9 @@ printEatby=Son Yenme: %s
 printSellby=Son satış: %s
 printQty=Mik: %d
 AddDispatchBatchLine=Dağıtımda bir Raf Ömrü satırı ekle
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic increase/decrease stock mode is forced to shipping validate and manual dispatching for reception and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=Bu ürün parti/seri numarası kullanmıyor
 ProductLotSetup=Parti/seri modülü ayarları
 ShowCurrentStockOfLot=Çift ürün/lot için mevcut stoğu göster
 ShowLogOfMovementIfLot=Çift ürün/lot için hareketler günlüğünü göster
-StockDetailPerBatch=Stock detail per lot
+StockDetailPerBatch=Parti başına stok detayı
diff --git a/htdocs/langs/tr_TR/products.lang b/htdocs/langs/tr_TR/products.lang
index c79cf9037dd..9f5564957d5 100644
--- a/htdocs/langs/tr_TR/products.lang
+++ b/htdocs/langs/tr_TR/products.lang
@@ -27,7 +27,7 @@ ProductAccountancySellExportCode=Muhasebe kodu (satış ihracatı)
 ProductOrService=Ürün veya Hizmet
 ProductsAndServices=Ürünler ve Hizmetler
 ProductsOrServices=Ürünler veya hizmetler
-ProductsPipeServices=Products | Services
+ProductsPipeServices=Ürünler | Hizmetler
 ProductsOnSaleOnly=Sadece satılık ürünler
 ProductsOnPurchaseOnly=Sadece satın alınabilir ürünler
 ProductsNotOnSell=Satılık olmayan ve satın alınabilir olmayan ürünler
@@ -70,6 +70,7 @@ SoldAmount=Satılan tutar
 PurchasedAmount=Satınalınan tutar
 NewPrice=Yeni fiyat
 MinPrice=En düş. satış fiyatı
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=Satış fiyatı bu ürün için izin verilen en düşük fiyattan az olamaz (%s vergi hariç). Bu mesaj, çok fazla indirim yaparsanız da belirir.
 ContractStatusClosed=Kapalı
 ErrorProductAlreadyExists=%s Referanslı bir ürün zaten var var.
@@ -155,7 +156,7 @@ BuyingPrices=Alış fiyatları
 CustomerPrices=Müşteri fiyatları
 SuppliersPrices=Tedarikçi fiyatları
 SuppliersPricesOfProductsOrServices=Tedarikçi fiyatları (ürünlerin ya da hizmetlerin)
-CustomCode=Gümrük/Emtia/HS kodu
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=Menşei ülke
 Nature=Niteliği
 ShortLabel=Kısa etiket
diff --git a/htdocs/langs/tr_TR/projects.lang b/htdocs/langs/tr_TR/projects.lang
index 89a80553718..04ec0ebc21b 100644
--- a/htdocs/langs/tr_TR/projects.lang
+++ b/htdocs/langs/tr_TR/projects.lang
@@ -77,6 +77,7 @@ Time=Süre
 ListOfTasks=Görevler listesi
 GoToListOfTimeConsumed=Tüketilen süre listesine git
 GoToListOfTasks=Görevler listesine git
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=Proje ile ilgili tekliflerin listesi
 ListOrdersAssociatedProject=List of customer orders associated with the project
@@ -226,4 +227,4 @@ AllowCommentOnProject=Allow user comments on projects
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/tr_TR/stocks.lang b/htdocs/langs/tr_TR/stocks.lang
index 1ab928d8fed..3ff6604eb81 100644
--- a/htdocs/langs/tr_TR/stocks.lang
+++ b/htdocs/langs/tr_TR/stocks.lang
@@ -8,9 +8,9 @@ WarehouseEdit=Depo değiştir
 MenuNewWarehouse=Yeni depo
 WarehouseSource=Kaynak depo
 WarehouseSourceNotDefined=Tanımlı depo yok,
-AddWarehouse=Create warehouse
+AddWarehouse=Depo oluştur
 AddOne=Bir tane ekle
-DefaultWarehouse=Default warehouse
+DefaultWarehouse=Varsayılan depo
 WarehouseTarget=Hedef depo
 ValidateSending=Gönderim sil
 CancelSending=Gönderim iptal et
@@ -203,3 +203,4 @@ RegulateStock=Regulate Stock
 ListInventory=Liste
 StockSupportServices=Stock management support services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/tr_TR/stripe.lang b/htdocs/langs/tr_TR/stripe.lang
index d2ba655139d..691687eb9d0 100644
--- a/htdocs/langs/tr_TR/stripe.lang
+++ b/htdocs/langs/tr_TR/stripe.lang
@@ -55,11 +55,11 @@ StripePaymentModes=Stripe payment modes
 LocalID=Local ID
 StripeID=Stripe ID
 NameOnCard=Name on card
-CardNumber=Card Number
+CardNumber=Kart Numarası
 ExpiryDate=Expiry Date
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/tr_TR/supplier_proposal.lang b/htdocs/langs/tr_TR/supplier_proposal.lang
index c575026f2df..4ea0b55d442 100644
--- a/htdocs/langs/tr_TR/supplier_proposal.lang
+++ b/htdocs/langs/tr_TR/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Tedarikçi teklifleri
-supplier_proposalDESC=Tedarikçilere yapılan fiyat isteklerini yönet
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
 SupplierProposalNew=Yeni fiyat isteği
 CommRequest=Fiyat isteği
 CommRequests=Fiyat istekleri
 SearchRequest=İstek ara
 DraftRequests=Taslak istekler
-SupplierProposalsDraft=Taslak tedarikçi teklifleri
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=Değiştirilen son %s fiyat isteği
 RequestsOpened=Fiyat isteği aç
-SupplierProposalArea=Tedarikçi teklifleri alanı
-SupplierProposalShort=Tedarikçi teklifi
-SupplierProposals=Tedarikçi teklifleri
-SupplierProposalsShort=Tedarikçi teklifleri
+SupplierProposalArea=Vendor proposals area
+SupplierProposalShort=Vendor proposal
+SupplierProposals=Vendor proposals
+SupplierProposalsShort=Vendor proposals
 NewAskPrice=Yeni fiyat isteği
 ShowSupplierProposal=Fiyat isteği göster
 AddSupplierProposal=Fiyat isteği oluştur
-SupplierProposalRefFourn=Tedarikçi ref
+SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=Teslim tarihi
 SupplierProposalRefFournNotice="Kabul edildi" olarak kapatmadan önce tedarikçi referansını tutmayı düşün.
 ConfirmValidateAsk=Bu fiyat talebini <b>%s</b> adı altında onaylamak istediğinizden emin misiniz?
@@ -47,9 +47,9 @@ CommercialAsk=Fiyat isteği
 DefaultModelSupplierProposalCreate=Varsayılan model oluşturma
 DefaultModelSupplierProposalToBill=Bir fiyat isteğini kapatma sırasında (kabul edilmiş) varsayılan şablon
 DefaultModelSupplierProposalClosed=Bir fiyat isteğini kapatma sırasında (reddedilmiş) varsayılan şablon 
-ListOfSupplierProposals=Tedarikçi teklif istekleri listesi
-ListSupplierProposalsAssociatedProject=Proje ile ilişkili tedarikçi teliflerinin listesi
-SupplierProposalsToClose=Kapatılacak tedarikçi teklifleri
-SupplierProposalsToProcess=İşlenecek tedarikçi teklifleri
+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=Son %s fiyat talepleri
 AllPriceRequests=Tüm istekler
diff --git a/htdocs/langs/tr_TR/suppliers.lang b/htdocs/langs/tr_TR/suppliers.lang
index 5f1195e9677..9ee2099f4b2 100644
--- a/htdocs/langs/tr_TR/suppliers.lang
+++ b/htdocs/langs/tr_TR/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Tedarikçiler
-SuppliersInvoice=Tedarikçi faturası
-ShowSupplierInvoice=Tedarikçi Faturası Göster
-NewSupplier=Yeni tedarikçi
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=Geçmiş
-ListOfSuppliers=Tedarikçi listesi
-ShowSupplier=Tedarikçi göster
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=Sipariş tarihi
 BuyingPriceMin=En iyi alış fiyatı
 BuyingPriceMinShort=En iyi alış fiyatı
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Yan ürün satış fiyatları toplamı
 SomeSubProductHaveNoPrices=Bazı altürünlerin fiyatı yok
 AddSupplierPrice=Alış fiyatı ekle
 ChangeSupplierPrice=Alış fiyatı değiştir
-SupplierPrices=Tedarikçi fiyatları
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Bu referanslı tedarikçi zaten bu referans ile ilişkili: %s
-NoRecordedSuppliers=Kayıtlı tedarikçi yok
-SupplierPayment=Tedarikçi ödemesi
-SuppliersArea=Tedarikçiler alanı
-RefSupplierShort=Ref. tedarikçi
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=Uygunluğu
-ExportDataset_fournisseur_1=Tedarikçi faturaları listesi ve fatura satırları
-ExportDataset_fournisseur_2=Tedarikçi faturaları ve ödemeleri
-ExportDataset_fournisseur_3=Tedarikçi siparişleri ve sipariş satırları
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=Bu siparişi onayla
 ConfirmApproveThisOrder=Siparişi uygun bulmak istediğinizden emin misiniz <b>%s</b>?
 DenyingThisOrder=Bu siparişi reddet
 ConfirmDenyingThisOrder=Bu siparişi reddetmek istediğinizden emin misiniz <b>%s</b>?
 ConfirmCancelThisOrder=Bu siparişi iptal etmek istediğinizden emin misiniz <b>%s</b>?
-AddSupplierOrder=Tedarikçi siparişi oluştur
-AddSupplierInvoice=Tedarikçi faturası oluştur
-ListOfSupplierProductForSupplier=Tedarikçi <b>%s</b> için ürün ve fiyat listesi
-SentToSuppliers=Tedarikçilere gönderilen
-ListOfSupplierOrders=Tedarikçi siparişleri listesi
-MenuOrdersSupplierToBill=Faturalanacak tedarikçi siparişleri
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Gün olarak teslim süresi
 DescNbDaysToDelivery=Bu siparişteki en büyük teslimat gecikmesi olan ürünler
-SupplierReputation=Tedarikçi itibarı
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Sipariş verme
 NotTheGoodQualitySupplier=Hatalı kalite
 ReputationForThisProduct=İtibar
 BuyerName=Alıcı adı
 AllProductServicePrices=Tüm ürün/hizmet fiyatları
-AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=Tedarikçi fiyatları
+AllProductReferencesOfSupplier=Tüm tedarikçi ürün/hizmet referansları
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/tr_TR/trips.lang b/htdocs/langs/tr_TR/trips.lang
index c116f74d591..13e7b1c6a89 100644
--- a/htdocs/langs/tr_TR/trips.lang
+++ b/htdocs/langs/tr_TR/trips.lang
@@ -12,7 +12,7 @@ ShowTrip=Gider raporu göster
 NewTrip=Yeni gider raporu
 LastExpenseReports=Latest %s expense reports
 AllExpenseReports=All expense reports
-CompanyVisited=Company/organization visited
+CompanyVisited=Ziyaret edilen Şirket/Kuruluş
 FeesKilometersOrAmout=Tutar ya da kilometre
 DeleteTrip=Gider raporu sil
 ConfirmDeleteTrip=Are you sure you want to delete this expense report?
diff --git a/htdocs/langs/tr_TR/users.lang b/htdocs/langs/tr_TR/users.lang
index b511e5b188f..852d46ac921 100644
--- a/htdocs/langs/tr_TR/users.lang
+++ b/htdocs/langs/tr_TR/users.lang
@@ -69,8 +69,8 @@ InternalUser=İç kullanıcı
 ExportDataset_user_1=Dolibarr kullanıcıları ve özellikleri
 DomainUser=Etki alanı kullanıcısı %s
 Reactivate=Yeniden etkinleştir
-CreateInternalUserDesc=This form allows you to create an user internal to your company/organization. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+CreateInternalUserDesc=Bu form, şirketiniz/kuruluşunuz için bir iç kullanıcı oluşturmanıza olanak tanır. Bir dış kullanıcı oluşturmak için (müşteri, tedarikçi, ...), üçüncü parti kişi kartından 'Dolibarr Kullanıcısı Oluştur' butonunu kullanın.
+InternalExternalDesc=Bir <b>İç</b> kullanıcı, şirketinizin/kuruluşunuzun parçası olan bir kullanıcıdır.<br>Bir <b>Dış</b> kullanıcı ise, müşteri, tedarikçi veya buna benzer bir kullanıcıdır.<br><br>Her iki durumda da, verilen izinler Dolibarr üzerindeki hakları tanımlar. Bunun yanı sıra dış kullanıcı, iç kullanıcıdan farklı bir menü yöneticisine sahip olabilir (Giriş - Ayarlar - Ekran bölümüne bakın)
 PermissionInheritedFromAGroup=İzin hak tanındı çünkü bir kullanıcının grubundan intikal etti.
 Inherited=İntikal eden
 UserWillBeInternalUser=Oluşturulacak kullanıcı bir iç kullanıcı olacaktır (çünkü belirli bir üçüncü parti ile bağlantılı değildir)
@@ -100,7 +100,7 @@ HierarchicView=Sıradüzeni görünümü
 UseTypeFieldToChange=Değiştirmek için Alan türünü kullan
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Oturum açmak için OpenID kullan
-WeeklyHours=Hours worked (per week)
+WeeklyHours=Çalışma saati (haftalık toplam)
 ExpectedWorkedHours=Haftalık beklenen çalışma saatleri
 ColorUser=Kullanıcı rengi
 DisabledInMonoUserMode=Bakım modunda devre dışıdır
diff --git a/htdocs/langs/tr_TR/website.lang b/htdocs/langs/tr_TR/website.lang
index 2c47c7ec858..10e4e2720f3 100644
--- a/htdocs/langs/tr_TR/website.lang
+++ b/htdocs/langs/tr_TR/website.lang
@@ -72,13 +72,13 @@ MyContainerTitle=Web sitemin başlığı
 AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
-YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+YouMustDefineTheHomePage=Öncelikle varsayılan Giriş sayfasını tanımlamanız gerekir
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
 WebsiteRootOfImages=Root directory for website images
 SubdirOfPage=Sub-directory dedicated to page
 AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
-CorporateHomePage=Corporate Home page
-EmptyPage=Empty page
+CorporateHomePage=Kurumsal Giriş sayfası
+EmptyPage=Boş sayfa
diff --git a/htdocs/langs/tr_TR/workflow.lang b/htdocs/langs/tr_TR/workflow.lang
index 587c2745055..d573cba2530 100644
--- a/htdocs/langs/tr_TR/workflow.lang
+++ b/htdocs/langs/tr_TR/workflow.lang
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source custome
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=Otomatik oluşturma
 AutomaticClassification=Otomatik sınıflandırma
diff --git a/htdocs/langs/uk_UA/accountancy.lang b/htdocs/langs/uk_UA/accountancy.lang
index c37db78c215..daa15928096 100644
--- a/htdocs/langs/uk_UA/accountancy.lang
+++ b/htdocs/langs/uk_UA/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Accounting
 ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
 ACCOUNTING_EXPORT_DATE=Date format for export file
 ACCOUNTING_EXPORT_PIECE=Export the number of piece
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Accounts with non zero values
 ListOfAccounts=List of accounts
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers 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
 
-AccountancyArea=Accountancy area
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
 AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
@@ -89,7 +90,7 @@ MenuProductsAccounts=Product accounts
 ProductsBinding=Products accounts
 Ventilation=Binding to accounts
 CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Supplier invoice binding
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
 ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
@@ -185,11 +187,12 @@ ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
-DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Group of account
 Pcgsubtype=Subgroup of account
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
 ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
 DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report 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 fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -293,4 +296,9 @@ Binded=Lines bound
 ToBind=Lines to bind
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang
index 679789d5648..96ff36d363e 100644
--- a/htdocs/langs/uk_UA/admin.lang
+++ b/htdocs/langs/uk_UA/admin.lang
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems)
 MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=Method to use to send EMails
 MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
 MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
@@ -291,7 +292,7 @@ ModuleSetup=Module setup
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projects/Collaborative work
@@ -373,7 +374,8 @@ NoSmsEngine=No SMS sender manager available. SMS sender manager are not installe
 PDF=PDF
 PDFDesc=You can set each global options related to the PDF generation
 PDFAddressForging=Rules to forge address boxes
-HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=Hide products description on generated PDF
@@ -445,7 +447,8 @@ DisplayCompanyInfo=Display company address
 DisplayCompanyManagers=Display manager names
 DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party 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.
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Set this to 1 if you want to attach main document to emai
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -479,7 +485,7 @@ Module1Desc=Companies and contact management (customers, prospects...)
 Module2Name=Commercial
 Module2Desc=Commercial management
 Module10Name=Accounting
-Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching.
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=Пропозиції
 Module20Desc=Commercial proposal management
 Module22Name=Mass E-mailings
@@ -546,8 +552,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
-Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Payment of employee wages
 Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
@@ -561,14 +567,14 @@ Module700Name=Donations
 Module700Desc=Donation management
 Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Mantis integration
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
 Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
 Module2200Name=Dynamic Prices
@@ -576,7 +582,7 @@ Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Scheduled jobs
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API/Web services (SOAP server)
@@ -613,7 +619,7 @@ Module50100Desc=Point of sales module (POS).
 Module50200Name=Paypal
 Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Poll, Survey or Vote
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed memb
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=Other menu entries manage optional parameters.
 LogEvents=Security audit events
 Audit=Audit
@@ -1054,8 +1060,9 @@ LogEventDesc=You can enable here the logging for Dolibarr security events. Admin
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1188,11 +1195,11 @@ UserMailRequired=EMail required to create a new user
 HRMSetup=HRM module setup
 ##### Company setup #####
 CompanySetup=Companies module setup
-CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier)
-AccountCodeManager=Module for accounting code generation (customer or supplier)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
 NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
 ModelModules=Documents templates
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
@@ -1203,6 +1210,9 @@ MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
 TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=Free text on commercial proposals
 WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
 ##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=Order management setup
 OrdersNumberingModules=Orders numbering models
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe
 OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
 OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
 ##### Stock #####
-StockSetup=Warehouse module setup
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
 ##### Menu #####
 MenuDeleted=Menu deleted
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
 MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
 SuppliersSetup=Supplier module setup
-SuppliersCommandModel=Complete template of supplier order (logo...)
-SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","
 SalariesSetup=Setup of module salaries
 SortOrder=Sort order
 Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Install of external module from applic
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
-TextTitleColor=Color of page title
+TextTitleColor=Text color of Page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=Background color for Top menu
 TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
 ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-MailToMember=To send email from member page
-MailToUser=To send email from user page
-MailToProject= To send email from project page
+MailToSendProposal=Customer proposals
+MailToSendOrder=Customer orders
+MailToSendInvoice=Customer invoices
+MailToSendShipment=Shipments
+MailToSendIntervention=Interventions
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Contracts
+MailToThirdparty=Third parties
+MailToMember=Members
+MailToUser=Users
+MailToProject=Projects page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1780,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/uk_UA/bills.lang b/htdocs/langs/uk_UA/bills.lang
index 2c265e1eaaa..0767fe6f354 100644
--- a/htdocs/langs/uk_UA/bills.lang
+++ b/htdocs/langs/uk_UA/bills.lang
@@ -109,7 +109,7 @@ CancelBill=Відмінити рахунок-фактуру
 SendRemindByMail=Відправити нагадування по EMail
 DoPayment=Enter payment
 DoPaymentBack=Enter refund
-ConvertToReduc=Перетворити в майбутню знижку
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Ввести платіж, отриманий від покупця
@@ -120,7 +120,7 @@ BillStatus=Статус рахунку-фактури
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Проект (має бути підтверджений)
 BillStatusPaid=Сплачений
-BillStatusPaidBackOrConverted=Credit note refund or converted into discount
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Анулюваний
 BillStatusValidated=Підтверджений (необхідно сплатити)
@@ -296,10 +296,10 @@ DiscountType=Discount type
 NoteReason=Примітка / Підстава
 ReasonDiscount=Підстава
 DiscountOfferedBy=Надана
-DiscountStillRemaining=Discounts available
-DiscountAlreadyCounted=Discounts already consumed
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+SupplierDiscounts=Vendors discounts
 BillAddress=Адреса виставляння
 HelpEscompte=Ця знижка надана Покупцеві за достроковий платіж.
 HelpAbandonBadCustomer=Від цієї суми відмовився Покупець (вважається поганим клієнтом) і вона вважається надзвичайною втратою.
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Every %s days
 FrequencyPer_m=Every %s months
 FrequencyPer_y=Every %s years
@@ -505,9 +511,14 @@ SituationAmount=Situation invoice amount(net)
 SituationDeduction=Situation subtraction
 ModifyAllLines=Змінити усі строки
 CreateNextSituationInvoice=Create next situation
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=S
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
 NoSituations=No open situations
 InvoiceSituationLast=Фінальний і основний рахунок
@@ -532,3 +543,4 @@ AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/uk_UA/categories.lang b/htdocs/langs/uk_UA/categories.lang
index 41e5f4e4c13..c0c8d4c0cef 100644
--- a/htdocs/langs/uk_UA/categories.lang
+++ b/htdocs/langs/uk_UA/categories.lang
@@ -16,7 +16,7 @@ MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
-SubCats=Subcategories
+SubCats=Sub-categories
 CatList=List of tags/categories
 NewCategory=New tag/category
 ModifCat=Modify tag/category
@@ -85,3 +85,4 @@ CategorieRecursivHelp=If activated, product will also linked to parent category
 AddProductServiceIntoCategory=Add the following product/service
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
+ChooseCategory=Choose category
diff --git a/htdocs/langs/uk_UA/commercial.lang b/htdocs/langs/uk_UA/commercial.lang
index edd5c48cc98..1a440031dca 100644
--- a/htdocs/langs/uk_UA/commercial.lang
+++ b/htdocs/langs/uk_UA/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=Close
 ActionAC_EMAILING=Send mass email
 ActionAC_COM=Send customer order by mail
 ActionAC_SHIP=Send shipping by mail
-ActionAC_SUP_ORD=Send supplier order by mail
-ActionAC_SUP_INV=Send supplier invoice by mail
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=Інший
 ActionAC_OTH_AUTO=Automatically inserted events
 ActionAC_MANUAL=Manually inserted events
diff --git a/htdocs/langs/uk_UA/companies.lang b/htdocs/langs/uk_UA/companies.lang
index a7ce42e687f..fc7592571e3 100644
--- a/htdocs/langs/uk_UA/companies.lang
+++ b/htdocs/langs/uk_UA/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Are you sure you want to delete this contact and all inheri
 MenuNewThirdParty=New third party
 MenuNewCustomer=New customer
 MenuNewProspect=New prospect
-MenuNewSupplier=New supplier
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=New private individual
-NewCompany=New company (prospect, customer, supplier)
-NewThirdParty=New third party (prospect, customer, supplier)
-CreateDolibarrThirdPartySupplier=Create a third party (supplier)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=Create third party
 CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Prospection area
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=Prospects
 ThirdPartyCustomers=Customers
 ThirdPartyCustomersStats=Customers
 ThirdPartyCustomersWithIdProf12=Customers with %s or %s
-ThirdPartySuppliers=Suppliers
+ThirdPartySuppliers=Vendors
 ThirdPartyType=Third party type
 Individual=Private individual
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
@@ -77,11 +77,11 @@ Web=Web
 Poste= Position
 DefaultLang=Language by default
 VATIsUsed=Sales tax is used
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
-ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Пропозиції
 OverAllOrders=Orders
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=RE Type
 TypeLocaltax2ES=IRPF Type
 WrongCustomerCode=Customer code invalid
-WrongSupplierCode=Supplier code invalid
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Customer code model
-SupplierCodeModel=Supplier code model
+SupplierCodeModel=Vendor code model
 Gencod=Bar code
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
@@ -267,7 +267,7 @@ Prospect=Prospect
 CustomerCard=Customer Card
 Customer=Customer
 CustomerRelativeDiscount=Relative customer discount
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=Відносна знижка
 CustomerAbsoluteDiscountShort=Absolute discount
 CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this suppl
 CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
 CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
 CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=None
 Supplier=Supplier
 AddContact=Create contact
@@ -304,13 +304,13 @@ DeleteACompany=Delete a company
 PersonalInformations=Personal data
 AccountancyCode=Accounting account
 CustomerCode=Customer code
-SupplierCode=Supplier code
+SupplierCode=Vendor code
 CustomerCodeShort=Customer code
-SupplierCodeShort=Supplier code
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=Customer code, unique for all customers
-SupplierCodeDesc=Supplier code, unique for all suppliers
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=Required if third party is a customer or prospect
-RequiredIfSupplier=Required if third party is a supplier
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=Validity controled by module
 ThisIsModuleRules=This is rules for this module
 ProspectToContact=Prospect to contact
@@ -338,7 +338,7 @@ MyContacts=My contacts
 Capital=Capital
 CapitalOf=Capital of %s
 EditCompany=Edit company
-ThisUserIsNot=This user is not a prospect, customer nor supplier
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=Чек
 VATIntraCheckDesc=The link <b>%s</b> allows to ask the european VAT checker service. An external internet access from server is required for this service to work.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -396,7 +396,7 @@ ImportDataset_company_4=Third parties/Sales representatives (Assign sales repres
 PriceLevel=Price level
 DeliveryAddress=Delivery address
 AddAddress=Add address
-SupplierCategory=Supplier category
+SupplierCategory=Vendor category
 JuridicalStatus200=Independent
 DeleteFile=Delete file
 ConfirmDeleteFile=Are you sure you want to delete this file?
@@ -406,7 +406,7 @@ FiscalYearInformation=Information on the fiscal year
 FiscalMonthStart=Starting month of the fiscal year
 YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
 YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
-ListSuppliersShort=List of suppliers
+ListSuppliersShort=List of vendors
 ListProspectsShort=List of prospects
 ListCustomersShort=List of customers
 ThirdPartiesArea=Third parties and contact area
@@ -420,7 +420,7 @@ CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/uk_UA/compta.lang b/htdocs/langs/uk_UA/compta.lang
index c9013ece43c..1bf4638f0bf 100644
--- a/htdocs/langs/uk_UA/compta.lang
+++ b/htdocs/langs/uk_UA/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=Net paid
 VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
-VATSummary=Tax Balance
+VATSummary=Tax monthly
+VATBalance=Tax Balance
 VATPaid=Tax paid
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=Accountancy/Treasury area
 NewPayment=New payment
 Payments=Платежі
 PaymentCustomerInvoice=Customer invoice payment
-PaymentSupplierInvoice=Supplier invoice payment
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
-ListOfSupplierPayments=List of supplier payments
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -110,7 +111,7 @@ ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
 CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
 SupplierAccountancyCodeShort=Sup. account. code
 AccountNumber=Номер рахунка
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
 Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
-ByProductsAndServices=By products and services
+ByProductsAndServices=By product and service
 RefExt=External ref
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
 LinkedOrder=Link to order
@@ -215,7 +218,8 @@ Mode1=Method 1
 Mode2=Method 2
 CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
 CalculationRuleDescSupplier=According to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
@@ -242,3 +246,10 @@ FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/uk_UA/dict.lang b/htdocs/langs/uk_UA/dict.lang
index ca0c61a9cbc..61a7237f472 100644
--- a/htdocs/langs/uk_UA/dict.lang
+++ b/htdocs/langs/uk_UA/dict.lang
@@ -5,7 +5,8 @@ CountryIT=Italy
 CountryES=Spain
 CountryDE=Germany
 CountryCH=Switzerland
-CountryGB=Great Britain
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=United Kingdom
 CountryUK=United Kingdom
 CountryIE=Ireland
 CountryCN=China
diff --git a/htdocs/langs/uk_UA/ecm.lang b/htdocs/langs/uk_UA/ecm.lang
index 65e9b17bdb2..5200fa30b1d 100644
--- a/htdocs/langs/uk_UA/ecm.lang
+++ b/htdocs/langs/uk_UA/ecm.lang
@@ -39,9 +39,10 @@ ShowECMSection=Show directory
 DeleteSection=Remove directory
 ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
 ECMDirectoryForFiles=Relative directory for files
-CannotRemoveDirectoryContainsFiles=Removed not possible because it contains some files
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=File manager
-ECMSelectASection=Select a directory on left tree...
+ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
diff --git a/htdocs/langs/uk_UA/errors.lang b/htdocs/langs/uk_UA/errors.lang
index ec036b28bc5..0ca7488b8cb 100644
--- a/htdocs/langs/uk_UA/errors.lang
+++ b/htdocs/langs/uk_UA/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Bar code required
 ErrorCustomerCodeAlreadyUsed=Customer code already used
 ErrorBarCodeAlreadyUsed=Bar code already used
 ErrorPrefixRequired=Prefix required
-ErrorBadSupplierCodeSyntax=Bad syntax for supplier code
-ErrorSupplierCodeRequired=Supplier code required
-ErrorSupplierCodeAlreadyUsed=Supplier code already used
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Bad parameters
 ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
 ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
@@ -87,7 +87,7 @@ ErrorsOnXLines=Errors on <b>%s</b> source record(s)
 ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
 ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s"
 ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
-ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Error on mask
 ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
-ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
diff --git a/htdocs/langs/uk_UA/install.lang b/htdocs/langs/uk_UA/install.lang
index e602c54640c..587d4f83da6 100644
--- a/htdocs/langs/uk_UA/install.lang
+++ b/htdocs/langs/uk_UA/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not
 ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
 ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be granted to be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reload all information from configuration file.
 PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
 WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called <b>install.lock</b> into Dolibarr document directory, in order to avoid malicious use of it.
 FunctionNotAvailableInThisPHP=Not available on this PHP
 ChoosedMigrateScript=Choose migration script
-DataMigration=Data migration
-DatabaseMigration=Structure database migration
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script processing
 ChooseYourSetupMode=Choose your setup mode and click "Start"...
 FreshInstall=Fresh install
@@ -146,7 +147,7 @@ NothingToDo=Nothing to do
 # upgrade
 MigrationFixData=Fix for denormalized data
 MigrationOrder=Data migration for customer's orders
-MigrationSupplierOrder=Data migration for supplier's orders
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Data migration for commercial proposals
 MigrationInvoice=Data migration for customer's invoices
 MigrationContract=Data migration for contracts
@@ -196,6 +197,8 @@ MigrationEvents=Migration of events to add event owner into assignement table
 MigrationEventsContact=Migration of events to add event contact into assignement table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 ShowNotAvailableOptions=Show not available options
diff --git a/htdocs/langs/uk_UA/ldap.lang b/htdocs/langs/uk_UA/ldap.lang
index d6360f3e540..abe11602147 100644
--- a/htdocs/langs/uk_UA/ldap.lang
+++ b/htdocs/langs/uk_UA/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Password for domain
 YouMustChangePassNextLogon=Password for user <b>%s</b> on the domain <b>%s</b> must be changed.
 UserMustChangePassNextLogon=User must change password on the domain %s
 LDAPInformationsForThisContact=Information in LDAP database for this contact
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Member type synchronized
 ContactSynchronized=Contact synchronized
 ForceSynchronize=Force synchronizing Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Failed to read LDAP database. Check LDAP module setup and database accessibility.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/uk_UA/loan.lang b/htdocs/langs/uk_UA/loan.lang
index 9aae3869cc3..534dee08867 100644
--- a/htdocs/langs/uk_UA/loan.lang
+++ b/htdocs/langs/uk_UA/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=Capital
 Insurance=Insurance
 Interest=Interest
 Nbterms=Number of terms
+Term=Term
 LoanAccountancyCapitalCode=Accounting account capital
 LoanAccountancyInsuranceCode=Accounting account insurance
 LoanAccountancyInterestCode=Accounting account interest
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=Confirm deleting this loan
 LoanDeleted=Loan Deleted Successfully
 ConfirmPayLoan=Confirm classify paid this loan
 LoanPaid=Loan Paid
-# Calc
-LoanCalc=Bank Loans Calculator
-PurchaseFinanceInfo=Purchase & Financing Information
-SalePriceOfAsset=Sale Price of Asset
-PercentageDown=Percentage Down
-LengthOfMortgage=Duration of loan
-AnnualInterestRate=Annual Interest Rate
-ExplainCalculations=Explain Calculations
-ShowMeCalculationsAndAmortization=Show me the calculations and amortization
-MortgagePaymentInformation=Mortgage Payment Information
-DownPayment=Down Payment
-DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
-InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
-MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
-MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
-MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
-MonthlyPaymentDesc=The montly payment is figured out using the following formula
-AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
-AmountFinanced=Amount Financed
-AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
-Totalsforyear=Totals for year
-MonthlyPayment=Monthly Payment
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
-GoToInterest=%s will go towards INTEREST
-GoToPrincipal=%s will go towards PRINCIPAL
-YouWillSpend=You will spend %s in year %s
 ListLoanAssociatedProject=List of loan associated with the project
 AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Interest
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-FinancialCommitment=Financial commitment
 CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/langs/uk_UA/mails.lang b/htdocs/langs/uk_UA/mails.lang
index 4c3148f9be6..cd6ef1f90e2 100644
--- a/htdocs/langs/uk_UA/mails.lang
+++ b/htdocs/langs/uk_UA/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Відправник
 MailErrorsTo=Errors to
 MailReply=Відповісти
 MailTo=Receiver(s)
+MailToUsers=To user(s)
 MailCC=Copy to
+MailToCCUsers=Copy to users(s)
 MailCCC=Cached copy to
 MailTopic=EMail topic
 MailText=Message
@@ -164,4 +166,4 @@ InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/uk_UA/main.lang b/htdocs/langs/uk_UA/main.lang
index 40fe34fe6f0..a5ed4dd1ba0 100644
--- a/htdocs/langs/uk_UA/main.lang
+++ b/htdocs/langs/uk_UA/main.lang
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is se
 Administrator=Administrator
 Undefined=Undefined
 PasswordForgotten=Password forgotten?
+NoAccount=No account?
 SeeAbove=See above
 HomeArea=Home area
 LastConnexion=Latest connection
@@ -231,7 +232,7 @@ Limit=Limit
 Limits=Limits
 Logout=Logout
 NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Connection
+Connection=Login
 Setup=Setup
 Alert=Alert
 MenuWarnings=Alerts
@@ -402,6 +403,7 @@ DefaultTaxRate=Default tax rate
 Average=Average
 Sum=Sum
 Delta=Delta
+RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
@@ -414,7 +416,7 @@ Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
 ExternalRef=Ref. extern
-RefSupplier=Ref. supplier
+RefSupplier=Ref. vendor
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
 Comment=Comment
@@ -493,7 +495,7 @@ Received=Received
 Paid=Сплачений
 Topic=Subject
 ByCompanies=By third parties
-ByUsers=By users
+ByUsers=By user
 Links=Links
 Link=Link
 Rejects=Rejects
@@ -619,9 +621,9 @@ BuildDoc=Build Doc
 Entity=Environment
 Entities=Entities
 CustomerPreview=Customer preview
-SupplierPreview=Supplier preview
+SupplierPreview=Vendor preview
 ShowCustomerPreview=Show customer preview
-ShowSupplierPreview=Show supplier preview
+ShowSupplierPreview=Show vendor preview
 RefCustomer=Ref. customer
 Currency=Currency
 InfoAdmin=Information for administrators
@@ -679,7 +681,7 @@ Color=Color
 Documents=Linked files
 Documents2=Documents
 UploadDisabled=Upload disabled
-MenuAccountancy=Accountancy
+MenuAccountancy=Accounting
 MenuECM=Documents
 MenuAWStats=AWStats
 MenuMembers=Members
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=Products or services
 SearchIntoProjects=Projects
 SearchIntoTasks=Tasks
 SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Interventions
 SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
@@ -941,3 +943,5 @@ Remote=Remote
 LocalAndRemote=Local and Remote
 KeyboardShortcut=Keyboard shortcut
 AssignedTo=Призначено
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/uk_UA/margins.lang b/htdocs/langs/uk_UA/margins.lang
index 9f590ef3718..b9d52dcfdc6 100644
--- a/htdocs/langs/uk_UA/margins.lang
+++ b/htdocs/langs/uk_UA/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=As a service
 UseDiscountOnTotal=On subtotal
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
 MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best supplier price
+MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Cost price
 UnitCharges=Unit charges
 Charges=Charges
diff --git a/htdocs/langs/uk_UA/members.lang b/htdocs/langs/uk_UA/members.lang
index 94504d0d931..fc217281424 100644
--- a/htdocs/langs/uk_UA/members.lang
+++ b/htdocs/langs/uk_UA/members.lang
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
diff --git a/htdocs/langs/uk_UA/opensurvey.lang b/htdocs/langs/uk_UA/opensurvey.lang
index 87e6a74913a..76684955e56 100644
--- a/htdocs/langs/uk_UA/opensurvey.lang
+++ b/htdocs/langs/uk_UA/opensurvey.lang
@@ -58,3 +58,4 @@ MoreChoices=Enter more choices for the voters
 SurveyExpiredInfo=The poll has been closed or voting delay has expired.
 EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
 ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/uk_UA/orders.lang b/htdocs/langs/uk_UA/orders.lang
index 6db592a603b..761eb2f1b34 100644
--- a/htdocs/langs/uk_UA/orders.lang
+++ b/htdocs/langs/uk_UA/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Customers orders area
-SuppliersOrdersArea=Suppliers orders area
+SuppliersOrdersArea=Purchase orders area
 OrderCard=Order card
 OrderId=Order Id
 Order=Order
@@ -13,18 +13,18 @@ OrderToProcess=Order to process
 NewOrder=New order
 ToOrder=Make order
 MakeOrder=Make order
-SupplierOrder=Supplier order
-SuppliersOrders=Suppliers orders
-SuppliersOrdersRunning=Current suppliers orders
-CustomerOrder=Customer order
-CustomersOrders=Customer orders
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=Customer Order
+CustomersOrders=Customer Orders
 CustomersOrdersRunning=Current customer orders
 CustomersOrdersAndOrdersLines=Customer orders and order lines
 OrdersDeliveredToBill=Customer orders delivered to bill
 OrdersToBill=Customer orders delivered
 OrdersInProcess=Customer orders in process
 OrdersToProcess=Customer orders to process
-SuppliersOrdersToProcess=Supplier orders to process
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=Canceled
 StatusOrderDraftShort=Проект
 StatusOrderValidatedShort=Підтверджений
@@ -75,15 +75,15 @@ ShowOrder=Show order
 OrdersOpened=Orders to process
 NoDraftOrders=No draft orders
 NoOrder=No order
-NoSupplierOrder=No supplier order
+NoSupplierOrder=No purchase order
 LastOrders=Latest %s customer orders
 LastCustomerOrders=Latest %s customer orders
-LastSupplierOrders=Latest %s supplier orders
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=Latest %s modified orders
 AllOrders=All orders
 NbOfOrders=Number of orders
 OrdersStatistics=Order's statistics
-OrdersStatisticsSuppliers=Supplier order's statistics
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Number of orders by month
 AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
 ListOfOrders=List of orders
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</
 GenerateBill=Generate invoice
 ClassifyShipped=Classify delivered
 DraftOrders=Draft orders
-DraftSuppliersOrders=Draft suppliers orders
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=In process orders
 RefOrder=Ref. order
 RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for supplier
-RefOrderSupplierShort=Ref. order supplier
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=Send order by mail
 ActionsOnOrder=Events on order
 NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
 DispatchSupplierOrder=Receiving supplier order %s
 FirstApprovalAlreadyDone=First approval already done
 SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=Supplier order %s received %s
-SupplierOrderSubmitedInDolibarr=Supplier order %s submited
-SupplierOrderClassifiedBilled=Supplier order %s set billed
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Other orders
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
@@ -125,11 +125,11 @@ TypeContact_commande_internal_SHIPPING=Representative following-up shipping
 TypeContact_commande_external_BILLING=Customer invoice contact
 TypeContact_commande_external_SHIPPING=Зверніться в службу доставки
 TypeContact_commande_external_CUSTOMER=Customer contact following-up order
-TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
-TypeContact_order_supplier_external_BILLING=Supplier invoice contact
-TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact
-TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
 Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
 Error_OrderNotChecked=No orders to invoice selected
diff --git a/htdocs/langs/uk_UA/other.lang b/htdocs/langs/uk_UA/other.lang
index 2afabe43b06..13907ca380e 100644
--- a/htdocs/langs/uk_UA/other.lang
+++ b/htdocs/langs/uk_UA/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=Files is too big
 PleaseBePatient=Please be patient...
 NewPassword=New password
 ResetPassword=Reset password
-RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
@@ -233,6 +233,8 @@ PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=Exports area
 AvailableFormats=Available formats
diff --git a/htdocs/langs/uk_UA/productbatch.lang b/htdocs/langs/uk_UA/productbatch.lang
index c0b66b4aaa7..560bc529c16 100644
--- a/htdocs/langs/uk_UA/productbatch.lang
+++ b/htdocs/langs/uk_UA/productbatch.lang
@@ -16,7 +16,7 @@ printEatby=Eat-by: %s
 printSellby=Sell-by: %s
 printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic increase/decrease stock mode is forced to shipping validate and manual dispatching for reception and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
 ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
diff --git a/htdocs/langs/uk_UA/products.lang b/htdocs/langs/uk_UA/products.lang
index e754fb3fe1d..7c679cb6656 100644
--- a/htdocs/langs/uk_UA/products.lang
+++ b/htdocs/langs/uk_UA/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
 MinPrice=Min. selling price
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
 ContractStatusClosed=Зачинено
 ErrorProductAlreadyExists=A product with reference %s already exists.
@@ -155,7 +156,7 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Supplier prices
 SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
-CustomCode=Customs/Commodity/HS code
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
 Nature=Nature
 ShortLabel=Short label
diff --git a/htdocs/langs/uk_UA/projects.lang b/htdocs/langs/uk_UA/projects.lang
index 4546e94baee..feeb06a5af4 100644
--- a/htdocs/langs/uk_UA/projects.lang
+++ b/htdocs/langs/uk_UA/projects.lang
@@ -77,6 +77,7 @@ Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer orders associated with the project
@@ -226,4 +227,4 @@ AllowCommentOnProject=Allow user comments on projects
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/uk_UA/stocks.lang b/htdocs/langs/uk_UA/stocks.lang
index d1e7a5256dc..d7dc3b4ea14 100644
--- a/htdocs/langs/uk_UA/stocks.lang
+++ b/htdocs/langs/uk_UA/stocks.lang
@@ -203,3 +203,4 @@ RegulateStock=Regulate Stock
 ListInventory=List
 StockSupportServices=Stock management support services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/uk_UA/stripe.lang b/htdocs/langs/uk_UA/stripe.lang
index 9fb2fa45113..6fa072b4c9a 100644
--- a/htdocs/langs/uk_UA/stripe.lang
+++ b/htdocs/langs/uk_UA/stripe.lang
@@ -58,8 +58,8 @@ NameOnCard=Name on card
 CardNumber=Card Number
 ExpiryDate=Expiry Date
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/uk_UA/supplier_proposal.lang b/htdocs/langs/uk_UA/supplier_proposal.lang
index 7e33198bc43..ac50d1e1d65 100644
--- a/htdocs/langs/uk_UA/supplier_proposal.lang
+++ b/htdocs/langs/uk_UA/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Supplier commercial proposals
-supplier_proposalDESC=Manage price requests to suppliers
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
 SupplierProposalNew=New price request
 CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
-SupplierProposalsDraft=Draft supplier proposals
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=Latest %s modified price requests
 RequestsOpened=Open price requests
-SupplierProposalArea=Supplier proposals area
-SupplierProposalShort=Supplier proposal
-SupplierProposals=Supplier proposals
-SupplierProposalsShort=Supplier proposals
+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=Supplier ref
+SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=Delivery date
 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>?
@@ -47,9 +47,9 @@ CommercialAsk=Price request
 DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposals=List of supplier proposal requests
-ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
-SupplierProposalsToClose=Supplier proposals to close
-SupplierProposalsToProcess=Supplier proposals to process
+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
diff --git a/htdocs/langs/uk_UA/suppliers.lang b/htdocs/langs/uk_UA/suppliers.lang
index f9e383e09af..d0cf540d3eb 100644
--- a/htdocs/langs/uk_UA/suppliers.lang
+++ b/htdocs/langs/uk_UA/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Suppliers
-SuppliersInvoice=Suppliers invoice
-ShowSupplierInvoice=Show Supplier Invoice
-NewSupplier=New supplier
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=History
-ListOfSuppliers=List of suppliers
-ShowSupplier=Show supplier
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=Order date
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
-SupplierPrices=Supplier prices
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
-NoRecordedSuppliers=No suppliers recorded
-SupplierPayment=Supplier payment
-SuppliersArea=Suppliers area
-RefSupplierShort=Ref. supplier
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=Availability
-ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
-ExportDataset_fournisseur_2=Supplier invoices and payments
-ExportDataset_fournisseur_3=Supplier orders and order lines
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=Approve this order
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
 ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
 ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
-AddSupplierOrder=Create supplier order
-AddSupplierInvoice=Create supplier invoice
-ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
-SentToSuppliers=Sent to suppliers
-ListOfSupplierOrders=List of supplier orders
-MenuOrdersSupplierToBill=Supplier orders to invoice
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-SupplierReputation=Supplier reputation
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
 AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=Supplier prices
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/uk_UA/website.lang b/htdocs/langs/uk_UA/website.lang
index 39c5cb2fee2..9116f5cc204 100644
--- a/htdocs/langs/uk_UA/website.lang
+++ b/htdocs/langs/uk_UA/website.lang
@@ -73,7 +73,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
diff --git a/htdocs/langs/uk_UA/workflow.lang b/htdocs/langs/uk_UA/workflow.lang
index a50bd91595b..783373ad66d 100644
--- a/htdocs/langs/uk_UA/workflow.lang
+++ b/htdocs/langs/uk_UA/workflow.lang
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source custome
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/uz_UZ/accountancy.lang b/htdocs/langs/uz_UZ/accountancy.lang
index c37db78c215..daa15928096 100644
--- a/htdocs/langs/uz_UZ/accountancy.lang
+++ b/htdocs/langs/uz_UZ/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Accounting
 ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
 ACCOUNTING_EXPORT_DATE=Date format for export file
 ACCOUNTING_EXPORT_PIECE=Export the number of piece
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Accounts with non zero values
 ListOfAccounts=List of accounts
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers 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
 
-AccountancyArea=Accountancy area
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
 AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
@@ -89,7 +90,7 @@ MenuProductsAccounts=Product accounts
 ProductsBinding=Products accounts
 Ventilation=Binding to accounts
 CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Supplier invoice binding
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
 ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
@@ -185,11 +187,12 @@ ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
-DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Group of account
 Pcgsubtype=Subgroup of account
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
 ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
 DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report 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 fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -293,4 +296,9 @@ Binded=Lines bound
 ToBind=Lines to bind
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang
index fed6af9a6fa..28eb076c540 100644
--- a/htdocs/langs/uz_UZ/admin.lang
+++ b/htdocs/langs/uz_UZ/admin.lang
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems)
 MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=Method to use to send EMails
 MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
 MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
@@ -291,7 +292,7 @@ ModuleSetup=Module setup
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relation Management (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Projects/Collaborative work
@@ -373,7 +374,8 @@ NoSmsEngine=No SMS sender manager available. SMS sender manager are not installe
 PDF=PDF
 PDFDesc=You can set each global options related to the PDF generation
 PDFAddressForging=Rules to forge address boxes
-HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=Hide products description on generated PDF
@@ -445,7 +447,8 @@ DisplayCompanyInfo=Display company address
 DisplayCompanyManagers=Display manager names
 DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party 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.
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Set this to 1 if you want to attach main document to emai
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -479,7 +485,7 @@ Module1Desc=Companies and contact management (customers, prospects...)
 Module2Name=Commercial
 Module2Desc=Commercial management
 Module10Name=Accounting
-Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching.
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=Proposals
 Module20Desc=Commercial proposal management
 Module22Name=Mass E-mailings
@@ -546,8 +552,8 @@ Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
-Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Payment of employee wages
 Module510Desc=Record and follow payment of your employee wages
 Module520Name=Loan
@@ -561,14 +567,14 @@ Module700Name=Donations
 Module700Desc=Donation management
 Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Mantis integration
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
 Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
 Module2200Name=Dynamic Prices
@@ -576,7 +582,7 @@ Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Scheduled jobs
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API/Web services (SOAP server)
@@ -613,7 +619,7 @@ Module50100Desc=Point of sales module (POS).
 Module50200Name=Paypal
 Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Poll, Survey or Vote
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed memb
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=Other menu entries manage optional parameters.
 LogEvents=Security audit events
 Audit=Audit
@@ -1054,8 +1060,9 @@ LogEventDesc=You can enable here the logging for Dolibarr security events. Admin
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available app/modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1188,11 +1195,11 @@ UserMailRequired=EMail required to create a new user
 HRMSetup=HRM module setup
 ##### Company setup #####
 CompanySetup=Companies module setup
-CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier)
-AccountCodeManager=Module for accounting code generation (customer or supplier)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
 NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
 ModelModules=Documents templates
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
@@ -1203,6 +1210,9 @@ MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
 TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=Free text on commercial proposals
 WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
 ##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=Order management setup
 OrdersNumberingModules=Orders numbering models
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe
 OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
 OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
 ##### Stock #####
-StockSetup=Warehouse module setup
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
 ##### Menu #####
 MenuDeleted=Menu deleted
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
 MultiCompanySetup=Multi-company module setup
 ##### Suppliers #####
 SuppliersSetup=Supplier module setup
-SuppliersCommandModel=Complete template of supplier order (logo...)
-SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","
 SalariesSetup=Setup of module salaries
 SortOrder=Sort order
 Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Install of external module from applic
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
-TextTitleColor=Color of page title
+TextTitleColor=Text color of Page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=Background color for Top menu
 TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
 BackgroundTableLineEvenColor=Background color for even table lines
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
 ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-MailToMember=To send email from member page
-MailToUser=To send email from user page
-MailToProject= To send email from project page
+MailToSendProposal=Customer proposals
+MailToSendOrder=Customer orders
+MailToSendInvoice=Customer invoices
+MailToSendShipment=Shipments
+MailToSendIntervention=Interventions
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Contracts
+MailToThirdparty=Third parties
+MailToMember=Members
+MailToUser=Users
+MailToProject=Projects page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1780,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/uz_UZ/bills.lang b/htdocs/langs/uz_UZ/bills.lang
index 5898daa72b0..2f029928beb 100644
--- a/htdocs/langs/uz_UZ/bills.lang
+++ b/htdocs/langs/uz_UZ/bills.lang
@@ -109,7 +109,7 @@ CancelBill=Cancel an invoice
 SendRemindByMail=Send reminder by EMail
 DoPayment=Enter payment
 DoPaymentBack=Enter refund
-ConvertToReduc=Convert into future discount
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Enter payment received from customer
@@ -120,7 +120,7 @@ BillStatus=Invoice status
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Draft (needs to be validated)
 BillStatusPaid=Paid
-BillStatusPaidBackOrConverted=Credit note refund or converted into discount
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Abandoned
 BillStatusValidated=Validated (needs to be paid)
@@ -296,10 +296,10 @@ DiscountType=Discount type
 NoteReason=Note/Reason
 ReasonDiscount=Reason
 DiscountOfferedBy=Granted by
-DiscountStillRemaining=Discounts available
-DiscountAlreadyCounted=Discounts already consumed
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+SupplierDiscounts=Vendors discounts
 BillAddress=Bill address
 HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Every %s days
 FrequencyPer_m=Every %s months
 FrequencyPer_y=Every %s years
@@ -505,9 +511,14 @@ SituationAmount=Situation invoice amount(net)
 SituationDeduction=Situation subtraction
 ModifyAllLines=Modify all lines
 CreateNextSituationInvoice=Create next situation
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=S
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
 NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
@@ -532,3 +543,4 @@ AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/uz_UZ/categories.lang b/htdocs/langs/uz_UZ/categories.lang
index 41e5f4e4c13..c0c8d4c0cef 100644
--- a/htdocs/langs/uz_UZ/categories.lang
+++ b/htdocs/langs/uz_UZ/categories.lang
@@ -16,7 +16,7 @@ MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
-SubCats=Subcategories
+SubCats=Sub-categories
 CatList=List of tags/categories
 NewCategory=New tag/category
 ModifCat=Modify tag/category
@@ -85,3 +85,4 @@ CategorieRecursivHelp=If activated, product will also linked to parent category
 AddProductServiceIntoCategory=Add the following product/service
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
+ChooseCategory=Choose category
diff --git a/htdocs/langs/uz_UZ/commercial.lang b/htdocs/langs/uz_UZ/commercial.lang
index f6bfea9c0d3..efadc44d700 100644
--- a/htdocs/langs/uz_UZ/commercial.lang
+++ b/htdocs/langs/uz_UZ/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=Close
 ActionAC_EMAILING=Send mass email
 ActionAC_COM=Send customer order by mail
 ActionAC_SHIP=Send shipping by mail
-ActionAC_SUP_ORD=Send supplier order by mail
-ActionAC_SUP_INV=Send supplier invoice by mail
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=Other
 ActionAC_OTH_AUTO=Automatically inserted events
 ActionAC_MANUAL=Manually inserted events
diff --git a/htdocs/langs/uz_UZ/companies.lang b/htdocs/langs/uz_UZ/companies.lang
index 3473667fe55..b3e1e7b6c86 100644
--- a/htdocs/langs/uz_UZ/companies.lang
+++ b/htdocs/langs/uz_UZ/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Are you sure you want to delete this contact and all inheri
 MenuNewThirdParty=New third party
 MenuNewCustomer=New customer
 MenuNewProspect=New prospect
-MenuNewSupplier=New supplier
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=New private individual
-NewCompany=New company (prospect, customer, supplier)
-NewThirdParty=New third party (prospect, customer, supplier)
-CreateDolibarrThirdPartySupplier=Create a third party (supplier)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=Create third party
 CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Prospection area
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=Prospects
 ThirdPartyCustomers=Customers
 ThirdPartyCustomersStats=Customers
 ThirdPartyCustomersWithIdProf12=Customers with %s or %s
-ThirdPartySuppliers=Suppliers
+ThirdPartySuppliers=Vendors
 ThirdPartyType=Third party type
 Individual=Private individual
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
@@ -77,11 +77,11 @@ Web=Web
 Poste= Position
 DefaultLang=Language by default
 VATIsUsed=Sales tax is used
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
-ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Proposals
 OverAllOrders=Orders
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=RE Type
 TypeLocaltax2ES=IRPF Type
 WrongCustomerCode=Customer code invalid
-WrongSupplierCode=Supplier code invalid
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Customer code model
-SupplierCodeModel=Supplier code model
+SupplierCodeModel=Vendor code model
 Gencod=Bar code
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
@@ -267,7 +267,7 @@ Prospect=Prospect
 CustomerCard=Customer Card
 Customer=Customer
 CustomerRelativeDiscount=Relative customer discount
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=Relative discount
 CustomerAbsoluteDiscountShort=Absolute discount
 CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this suppl
 CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
 CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
 CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=None
 Supplier=Supplier
 AddContact=Create contact
@@ -304,13 +304,13 @@ DeleteACompany=Delete a company
 PersonalInformations=Personal data
 AccountancyCode=Accounting account
 CustomerCode=Customer code
-SupplierCode=Supplier code
+SupplierCode=Vendor code
 CustomerCodeShort=Customer code
-SupplierCodeShort=Supplier code
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=Customer code, unique for all customers
-SupplierCodeDesc=Supplier code, unique for all suppliers
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=Required if third party is a customer or prospect
-RequiredIfSupplier=Required if third party is a supplier
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=Validity controled by module
 ThisIsModuleRules=This is rules for this module
 ProspectToContact=Prospect to contact
@@ -338,7 +338,7 @@ MyContacts=My contacts
 Capital=Capital
 CapitalOf=Capital of %s
 EditCompany=Edit company
-ThisUserIsNot=This user is not a prospect, customer nor supplier
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=Check
 VATIntraCheckDesc=The link <b>%s</b> allows to ask the european VAT checker service. An external internet access from server is required for this service to work.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -396,7 +396,7 @@ ImportDataset_company_4=Third parties/Sales representatives (Assign sales repres
 PriceLevel=Price level
 DeliveryAddress=Delivery address
 AddAddress=Add address
-SupplierCategory=Supplier category
+SupplierCategory=Vendor category
 JuridicalStatus200=Independent
 DeleteFile=Delete file
 ConfirmDeleteFile=Are you sure you want to delete this file?
@@ -406,7 +406,7 @@ FiscalYearInformation=Information on the fiscal year
 FiscalMonthStart=Starting month of the fiscal year
 YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
 YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
-ListSuppliersShort=List of suppliers
+ListSuppliersShort=List of vendors
 ListProspectsShort=List of prospects
 ListCustomersShort=List of customers
 ThirdPartiesArea=Third parties and contact area
@@ -420,7 +420,7 @@ CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/uz_UZ/compta.lang b/htdocs/langs/uz_UZ/compta.lang
index cda96a546b8..d2cfb714900 100644
--- a/htdocs/langs/uz_UZ/compta.lang
+++ b/htdocs/langs/uz_UZ/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=Net paid
 VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
-VATSummary=Tax Balance
+VATSummary=Tax monthly
+VATBalance=Tax Balance
 VATPaid=Tax paid
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=Accountancy/Treasury area
 NewPayment=New payment
 Payments=Payments
 PaymentCustomerInvoice=Customer invoice payment
-PaymentSupplierInvoice=Supplier invoice payment
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
-ListOfSupplierPayments=List of supplier payments
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -110,7 +111,7 @@ ShowVatPayment=Show VAT payment
 TotalToPay=Total to pay
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
 CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
 SupplierAccountancyCodeShort=Sup. account. code
 AccountNumber=Account number
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
 Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
-ByProductsAndServices=By products and services
+ByProductsAndServices=By product and service
 RefExt=External ref
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
 LinkedOrder=Link to order
@@ -215,7 +218,8 @@ Mode1=Method 1
 Mode2=Method 2
 CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
 CalculationRuleDescSupplier=According to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
@@ -242,3 +246,10 @@ FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/uz_UZ/dict.lang b/htdocs/langs/uz_UZ/dict.lang
index ca0c61a9cbc..61a7237f472 100644
--- a/htdocs/langs/uz_UZ/dict.lang
+++ b/htdocs/langs/uz_UZ/dict.lang
@@ -5,7 +5,8 @@ CountryIT=Italy
 CountryES=Spain
 CountryDE=Germany
 CountryCH=Switzerland
-CountryGB=Great Britain
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=United Kingdom
 CountryUK=United Kingdom
 CountryIE=Ireland
 CountryCN=China
diff --git a/htdocs/langs/uz_UZ/ecm.lang b/htdocs/langs/uz_UZ/ecm.lang
index 65e9b17bdb2..5200fa30b1d 100644
--- a/htdocs/langs/uz_UZ/ecm.lang
+++ b/htdocs/langs/uz_UZ/ecm.lang
@@ -39,9 +39,10 @@ ShowECMSection=Show directory
 DeleteSection=Remove directory
 ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
 ECMDirectoryForFiles=Relative directory for files
-CannotRemoveDirectoryContainsFiles=Removed not possible because it contains some files
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=File manager
-ECMSelectASection=Select a directory on left tree...
+ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
diff --git a/htdocs/langs/uz_UZ/errors.lang b/htdocs/langs/uz_UZ/errors.lang
index ec036b28bc5..0ca7488b8cb 100644
--- a/htdocs/langs/uz_UZ/errors.lang
+++ b/htdocs/langs/uz_UZ/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Bar code required
 ErrorCustomerCodeAlreadyUsed=Customer code already used
 ErrorBarCodeAlreadyUsed=Bar code already used
 ErrorPrefixRequired=Prefix required
-ErrorBadSupplierCodeSyntax=Bad syntax for supplier code
-ErrorSupplierCodeRequired=Supplier code required
-ErrorSupplierCodeAlreadyUsed=Supplier code already used
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Bad parameters
 ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
 ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
@@ -87,7 +87,7 @@ ErrorsOnXLines=Errors on <b>%s</b> source record(s)
 ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
 ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s"
 ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
-ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Error on mask
 ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
-ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
diff --git a/htdocs/langs/uz_UZ/install.lang b/htdocs/langs/uz_UZ/install.lang
index e602c54640c..587d4f83da6 100644
--- a/htdocs/langs/uz_UZ/install.lang
+++ b/htdocs/langs/uz_UZ/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not
 ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
 ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be granted to be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
 ConfFileIsWritable=Configuration file <b>%s</b> is writable.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reload all information from configuration file.
 PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
 WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called <b>install.lock</b> into Dolibarr document directory, in order to avoid malicious use of it.
 FunctionNotAvailableInThisPHP=Not available on this PHP
 ChoosedMigrateScript=Choose migration script
-DataMigration=Data migration
-DatabaseMigration=Structure database migration
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Script processing
 ChooseYourSetupMode=Choose your setup mode and click "Start"...
 FreshInstall=Fresh install
@@ -146,7 +147,7 @@ NothingToDo=Nothing to do
 # upgrade
 MigrationFixData=Fix for denormalized data
 MigrationOrder=Data migration for customer's orders
-MigrationSupplierOrder=Data migration for supplier's orders
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Data migration for commercial proposals
 MigrationInvoice=Data migration for customer's invoices
 MigrationContract=Data migration for contracts
@@ -196,6 +197,8 @@ MigrationEvents=Migration of events to add event owner into assignement table
 MigrationEventsContact=Migration of events to add event contact into assignement table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 ShowNotAvailableOptions=Show not available options
diff --git a/htdocs/langs/uz_UZ/ldap.lang b/htdocs/langs/uz_UZ/ldap.lang
index d6360f3e540..abe11602147 100644
--- a/htdocs/langs/uz_UZ/ldap.lang
+++ b/htdocs/langs/uz_UZ/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Password for domain
 YouMustChangePassNextLogon=Password for user <b>%s</b> on the domain <b>%s</b> must be changed.
 UserMustChangePassNextLogon=User must change password on the domain %s
 LDAPInformationsForThisContact=Information in LDAP database for this contact
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Member type synchronized
 ContactSynchronized=Contact synchronized
 ForceSynchronize=Force synchronizing Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Failed to read LDAP database. Check LDAP module setup and database accessibility.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/uz_UZ/loan.lang b/htdocs/langs/uz_UZ/loan.lang
index 9aae3869cc3..534dee08867 100644
--- a/htdocs/langs/uz_UZ/loan.lang
+++ b/htdocs/langs/uz_UZ/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=Capital
 Insurance=Insurance
 Interest=Interest
 Nbterms=Number of terms
+Term=Term
 LoanAccountancyCapitalCode=Accounting account capital
 LoanAccountancyInsuranceCode=Accounting account insurance
 LoanAccountancyInterestCode=Accounting account interest
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=Confirm deleting this loan
 LoanDeleted=Loan Deleted Successfully
 ConfirmPayLoan=Confirm classify paid this loan
 LoanPaid=Loan Paid
-# Calc
-LoanCalc=Bank Loans Calculator
-PurchaseFinanceInfo=Purchase & Financing Information
-SalePriceOfAsset=Sale Price of Asset
-PercentageDown=Percentage Down
-LengthOfMortgage=Duration of loan
-AnnualInterestRate=Annual Interest Rate
-ExplainCalculations=Explain Calculations
-ShowMeCalculationsAndAmortization=Show me the calculations and amortization
-MortgagePaymentInformation=Mortgage Payment Information
-DownPayment=Down Payment
-DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
-InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
-MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
-MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
-MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
-MonthlyPaymentDesc=The montly payment is figured out using the following formula
-AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
-AmountFinanced=Amount Financed
-AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
-Totalsforyear=Totals for year
-MonthlyPayment=Monthly Payment
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
-GoToInterest=%s will go towards INTEREST
-GoToPrincipal=%s will go towards PRINCIPAL
-YouWillSpend=You will spend %s in year %s
 ListLoanAssociatedProject=List of loan associated with the project
 AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Interest
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-FinancialCommitment=Financial commitment
 CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/langs/uz_UZ/mails.lang b/htdocs/langs/uz_UZ/mails.lang
index cedcd01066b..2313910de93 100644
--- a/htdocs/langs/uz_UZ/mails.lang
+++ b/htdocs/langs/uz_UZ/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Sender
 MailErrorsTo=Errors to
 MailReply=Reply to
 MailTo=Receiver(s)
+MailToUsers=To user(s)
 MailCC=Copy to
+MailToCCUsers=Copy to users(s)
 MailCCC=Cached copy to
 MailTopic=EMail topic
 MailText=Message
@@ -164,4 +166,4 @@ InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/uz_UZ/main.lang b/htdocs/langs/uz_UZ/main.lang
index f4aeb71d880..b7a0c0ecd56 100644
--- a/htdocs/langs/uz_UZ/main.lang
+++ b/htdocs/langs/uz_UZ/main.lang
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is se
 Administrator=Administrator
 Undefined=Undefined
 PasswordForgotten=Password forgotten?
+NoAccount=No account?
 SeeAbove=See above
 HomeArea=Home area
 LastConnexion=Latest connection
@@ -231,7 +232,7 @@ Limit=Limit
 Limits=Limits
 Logout=Logout
 NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Connection
+Connection=Login
 Setup=Setup
 Alert=Alert
 MenuWarnings=Alerts
@@ -402,6 +403,7 @@ DefaultTaxRate=Default tax rate
 Average=Average
 Sum=Sum
 Delta=Delta
+RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
@@ -414,7 +416,7 @@ Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
 ExternalRef=Ref. extern
-RefSupplier=Ref. supplier
+RefSupplier=Ref. vendor
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
 Comment=Comment
@@ -493,7 +495,7 @@ Received=Received
 Paid=Paid
 Topic=Subject
 ByCompanies=By third parties
-ByUsers=By users
+ByUsers=By user
 Links=Links
 Link=Link
 Rejects=Rejects
@@ -619,9 +621,9 @@ BuildDoc=Build Doc
 Entity=Environment
 Entities=Entities
 CustomerPreview=Customer preview
-SupplierPreview=Supplier preview
+SupplierPreview=Vendor preview
 ShowCustomerPreview=Show customer preview
-ShowSupplierPreview=Show supplier preview
+ShowSupplierPreview=Show vendor preview
 RefCustomer=Ref. customer
 Currency=Currency
 InfoAdmin=Information for administrators
@@ -679,7 +681,7 @@ Color=Color
 Documents=Linked files
 Documents2=Documents
 UploadDisabled=Upload disabled
-MenuAccountancy=Accountancy
+MenuAccountancy=Accounting
 MenuECM=Documents
 MenuAWStats=AWStats
 MenuMembers=Members
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=Products or services
 SearchIntoProjects=Projects
 SearchIntoTasks=Tasks
 SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Interventions
 SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
@@ -941,3 +943,5 @@ Remote=Remote
 LocalAndRemote=Local and Remote
 KeyboardShortcut=Keyboard shortcut
 AssignedTo=Assigned to
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/uz_UZ/margins.lang b/htdocs/langs/uz_UZ/margins.lang
index 9f590ef3718..b9d52dcfdc6 100644
--- a/htdocs/langs/uz_UZ/margins.lang
+++ b/htdocs/langs/uz_UZ/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=As a service
 UseDiscountOnTotal=On subtotal
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
 MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best supplier price
+MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Cost price
 UnitCharges=Unit charges
 Charges=Charges
diff --git a/htdocs/langs/uz_UZ/members.lang b/htdocs/langs/uz_UZ/members.lang
index 7326f3b9950..b29477e346d 100644
--- a/htdocs/langs/uz_UZ/members.lang
+++ b/htdocs/langs/uz_UZ/members.lang
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
diff --git a/htdocs/langs/uz_UZ/opensurvey.lang b/htdocs/langs/uz_UZ/opensurvey.lang
index 87e6a74913a..76684955e56 100644
--- a/htdocs/langs/uz_UZ/opensurvey.lang
+++ b/htdocs/langs/uz_UZ/opensurvey.lang
@@ -58,3 +58,4 @@ MoreChoices=Enter more choices for the voters
 SurveyExpiredInfo=The poll has been closed or voting delay has expired.
 EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
 ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/uz_UZ/orders.lang b/htdocs/langs/uz_UZ/orders.lang
index 8de0279be44..1b36a25df66 100644
--- a/htdocs/langs/uz_UZ/orders.lang
+++ b/htdocs/langs/uz_UZ/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Customers orders area
-SuppliersOrdersArea=Suppliers orders area
+SuppliersOrdersArea=Purchase orders area
 OrderCard=Order card
 OrderId=Order Id
 Order=Order
@@ -13,18 +13,18 @@ OrderToProcess=Order to process
 NewOrder=New order
 ToOrder=Make order
 MakeOrder=Make order
-SupplierOrder=Supplier order
-SuppliersOrders=Suppliers orders
-SuppliersOrdersRunning=Current suppliers orders
-CustomerOrder=Customer order
-CustomersOrders=Customer orders
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=Customer Order
+CustomersOrders=Customer Orders
 CustomersOrdersRunning=Current customer orders
 CustomersOrdersAndOrdersLines=Customer orders and order lines
 OrdersDeliveredToBill=Customer orders delivered to bill
 OrdersToBill=Customer orders delivered
 OrdersInProcess=Customer orders in process
 OrdersToProcess=Customer orders to process
-SuppliersOrdersToProcess=Supplier orders to process
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=Canceled
 StatusOrderDraftShort=Draft
 StatusOrderValidatedShort=Validated
@@ -75,15 +75,15 @@ ShowOrder=Show order
 OrdersOpened=Orders to process
 NoDraftOrders=No draft orders
 NoOrder=No order
-NoSupplierOrder=No supplier order
+NoSupplierOrder=No purchase order
 LastOrders=Latest %s customer orders
 LastCustomerOrders=Latest %s customer orders
-LastSupplierOrders=Latest %s supplier orders
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=Latest %s modified orders
 AllOrders=All orders
 NbOfOrders=Number of orders
 OrdersStatistics=Order's statistics
-OrdersStatisticsSuppliers=Supplier order's statistics
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Number of orders by month
 AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
 ListOfOrders=List of orders
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</
 GenerateBill=Generate invoice
 ClassifyShipped=Classify delivered
 DraftOrders=Draft orders
-DraftSuppliersOrders=Draft suppliers orders
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=In process orders
 RefOrder=Ref. order
 RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for supplier
-RefOrderSupplierShort=Ref. order supplier
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=Send order by mail
 ActionsOnOrder=Events on order
 NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
 DispatchSupplierOrder=Receiving supplier order %s
 FirstApprovalAlreadyDone=First approval already done
 SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=Supplier order %s received %s
-SupplierOrderSubmitedInDolibarr=Supplier order %s submited
-SupplierOrderClassifiedBilled=Supplier order %s set billed
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Other orders
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
@@ -125,11 +125,11 @@ TypeContact_commande_internal_SHIPPING=Representative following-up shipping
 TypeContact_commande_external_BILLING=Customer invoice contact
 TypeContact_commande_external_SHIPPING=Customer shipping contact
 TypeContact_commande_external_CUSTOMER=Customer contact following-up order
-TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
-TypeContact_order_supplier_external_BILLING=Supplier invoice contact
-TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact
-TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
 Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
 Error_OrderNotChecked=No orders to invoice selected
diff --git a/htdocs/langs/uz_UZ/other.lang b/htdocs/langs/uz_UZ/other.lang
index 2afabe43b06..13907ca380e 100644
--- a/htdocs/langs/uz_UZ/other.lang
+++ b/htdocs/langs/uz_UZ/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=Files is too big
 PleaseBePatient=Please be patient...
 NewPassword=New password
 ResetPassword=Reset password
-RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
@@ -233,6 +233,8 @@ PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=Exports area
 AvailableFormats=Available formats
diff --git a/htdocs/langs/uz_UZ/productbatch.lang b/htdocs/langs/uz_UZ/productbatch.lang
index 1c2d22395ce..54270c4a23b 100644
--- a/htdocs/langs/uz_UZ/productbatch.lang
+++ b/htdocs/langs/uz_UZ/productbatch.lang
@@ -16,7 +16,7 @@ printEatby=Eat-by: %s
 printSellby=Sell-by: %s
 printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic increase/decrease stock mode is forced to shipping validate and manual dispatching for reception and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
 ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
diff --git a/htdocs/langs/uz_UZ/products.lang b/htdocs/langs/uz_UZ/products.lang
index b9ebefc91c9..72e717367fc 100644
--- a/htdocs/langs/uz_UZ/products.lang
+++ b/htdocs/langs/uz_UZ/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=New price
 MinPrice=Min. selling price
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
 ContractStatusClosed=Closed
 ErrorProductAlreadyExists=A product with reference %s already exists.
@@ -155,7 +156,7 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Supplier prices
 SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
-CustomCode=Customs/Commodity/HS code
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
 Nature=Nature
 ShortLabel=Short label
diff --git a/htdocs/langs/uz_UZ/projects.lang b/htdocs/langs/uz_UZ/projects.lang
index 319a6e7e0e2..e04f28689a1 100644
--- a/htdocs/langs/uz_UZ/projects.lang
+++ b/htdocs/langs/uz_UZ/projects.lang
@@ -77,6 +77,7 @@ Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer orders associated with the project
@@ -226,4 +227,4 @@ AllowCommentOnProject=Allow user comments on projects
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/uz_UZ/stocks.lang b/htdocs/langs/uz_UZ/stocks.lang
index 7fbe2f6b82a..aaa7e21fc0d 100644
--- a/htdocs/langs/uz_UZ/stocks.lang
+++ b/htdocs/langs/uz_UZ/stocks.lang
@@ -203,3 +203,4 @@ RegulateStock=Regulate Stock
 ListInventory=List
 StockSupportServices=Stock management support services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/uz_UZ/suppliers.lang b/htdocs/langs/uz_UZ/suppliers.lang
index f9e383e09af..d0cf540d3eb 100644
--- a/htdocs/langs/uz_UZ/suppliers.lang
+++ b/htdocs/langs/uz_UZ/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Suppliers
-SuppliersInvoice=Suppliers invoice
-ShowSupplierInvoice=Show Supplier Invoice
-NewSupplier=New supplier
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=History
-ListOfSuppliers=List of suppliers
-ShowSupplier=Show supplier
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=Order date
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
-SupplierPrices=Supplier prices
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
-NoRecordedSuppliers=No suppliers recorded
-SupplierPayment=Supplier payment
-SuppliersArea=Suppliers area
-RefSupplierShort=Ref. supplier
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=Availability
-ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
-ExportDataset_fournisseur_2=Supplier invoices and payments
-ExportDataset_fournisseur_3=Supplier orders and order lines
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=Approve this order
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
 ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
 ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
-AddSupplierOrder=Create supplier order
-AddSupplierInvoice=Create supplier invoice
-ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
-SentToSuppliers=Sent to suppliers
-ListOfSupplierOrders=List of supplier orders
-MenuOrdersSupplierToBill=Supplier orders to invoice
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-SupplierReputation=Supplier reputation
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
 AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=Supplier prices
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/uz_UZ/workflow.lang b/htdocs/langs/uz_UZ/workflow.lang
index a50bd91595b..783373ad66d 100644
--- a/htdocs/langs/uz_UZ/workflow.lang
+++ b/htdocs/langs/uz_UZ/workflow.lang
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source custome
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/vi_VN/accountancy.lang b/htdocs/langs/vi_VN/accountancy.lang
index a9a25fa1ad2..7a677fed4c8 100644
--- a/htdocs/langs/vi_VN/accountancy.lang
+++ b/htdocs/langs/vi_VN/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Kế toán
 ACCOUNTING_EXPORT_SEPARATORCSV=Dấu ngăn cách cột trong file xuất ra
 ACCOUNTING_EXPORT_DATE=Định dạng ngày trong file xuất ra
 ACCOUNTING_EXPORT_PIECE=Export the number of piece
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Accounts with non zero values
 ListOfAccounts=List of accounts
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers 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
 
-AccountancyArea=Accountancy area
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
 AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
@@ -89,7 +90,7 @@ MenuProductsAccounts=Product accounts
 ProductsBinding=Products accounts
 Ventilation=Binding to accounts
 CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Supplier invoice binding
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=Mua tạp chí
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Linh tinh tạp chí
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Tạp chí Xã hội
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
 ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
@@ -185,11 +187,12 @@ ListeMvts=List of movements
 ErrorDebitCredit=Thẻ ghi nợ và tín dụng không thể có một giá trị cùng một lúc
 AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
-DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=Danh sách các tài khoản kế toán
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Group of account
 Pcgsubtype=Subgroup of account
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
 ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=Tham khảo ý kiến ​​ở đây là danh sách các dòng nhà cung cấp hoá đơn, tài khoản kế toán
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
 DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report 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 fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Lỗi, bạn không thể xóa tài khoản kế toán này bởi vì nó được sử dụng
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -293,4 +296,9 @@ Binded=Lines bound
 ToBind=Lines to bind
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
index 63aab5d71f6..ba82cbd157c 100644
--- a/htdocs/langs/vi_VN/admin.lang
+++ b/htdocs/langs/vi_VN/admin.lang
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems)
 MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= Gửi một bản CC một cách tự động cho tất cả các email được gửi
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=Phương pháp sử dụng để gửi email
 MAIN_MAIL_SMTPS_ID=SMTP ID nếu có yêu cầu xác thực
 MAIN_MAIL_SMTPS_PW=Mật khẩu SMTP nếu có yêu cầu xác thực
@@ -291,7 +292,7 @@ ModuleSetup=Cài đặt module
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=Hệ thống
 ModuleFamilyCrm=Quản lý quan hệ khách hàng (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=Products Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
 ModuleFamilyProjects=Các dự án/Việc cộng tác
@@ -373,7 +374,8 @@ NoSmsEngine=No SMS sender manager available. SMS sender manager are not installe
 PDF=PDF
 PDFDesc=Bạn có thể thiết lập cho mỗi tùy chọn toàn cầu liên quan đến việc tạo PDF
 PDFAddressForging=Quy tắc bắt buộc hộp địa chỉ
-HideAnyVATInformationOnPDF=Ẩn tất cả các thông tin liên quan đến thuế VAT đối với PDF được tạo ra
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=Ẩn mô tả sản phẩm vào PDF được tạo ra
@@ -445,7 +447,8 @@ DisplayCompanyInfo=Display company address
 DisplayCompanyManagers=Display manager names
 DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party 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.
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Set this to 1 if you want to attach main document to emai
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=Người dùng & nhóm
 Module0Desc=Users / Employees and Groups management
@@ -479,7 +485,7 @@ Module1Desc=Quản lý liên lạc và công ty (khách hàng, khách hàng ti
 Module2Name=Thương mại
 Module2Desc=Quản lý thương mại
 Module10Name=Kế toán
-Module10Desc=Báo cáo kế toán đơn giản (nhật ký, doanh thu) dựa vào nội dung cơ sở dữ liệu. Không có điều phối.
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=Đơn hàng đề xuất
 Module20Desc=Quản lý đơn hàng đề xuất
 Module22Name=Gửi Email hàng loạt
@@ -546,8 +552,8 @@ Module400Name=Dự án/Cơ hội/Đầu mối
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Lịch trên web
 Module410Desc=Tích hợp lịch trên web
-Module500Name=Chi phí đặc biệt
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Thanh toán của tiền lương nhân công
 Module510Desc=Bản ghi và theo dõi thanh toán của tiền lương nhân công
 Module520Name=Cho vay
@@ -561,14 +567,14 @@ Module700Name=Tài trợ
 Module700Desc=Quản lý tài trợ
 Module770Name=Báo cáo chi tiêu
 Module770Desc=Báo cáo quản lý và claim chi phí (di chuyển, ăn uống, ...)
-Module1120Name=Đơn hàng đề xuất nhà cung cấp
-Module1120Desc=Yêu cầu giá và đơn hàng đề xuất nhà cung cấp
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Tích hợp Mantis
 Module1520Name=Xuất chứng từ
 Module1520Desc=Xuất chứng từ Mass mail
 Module1780Name=Gán thẻ/phân nhóm
-Module1780Desc=Tạo gán thẻ/phân nhóm (sản phẩm, khách hàng, nhà cung cấp, liên hệ hoặc thành viên)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
 Module2200Name=Giá linh hoạt
@@ -576,7 +582,7 @@ Module2200Desc=Cho phép sử dụng các biểu thức toán học cho giá
 Module2300Name=Việc theo lịch trình
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API/Web services (SOAP server)
@@ -613,7 +619,7 @@ Module50100Desc=Point of sales module (POS).
 Module50200Name=Paypal
 Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 Module50400Name=Kế toán (nâng cao)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
 Module55000Name=Poll, Survey or Vote
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=Khoảng trì hoãn (theo ngày) trước khi cảnh b
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Khoảng trì hoãn (theo ngày) trước khi cảnh báo đối với séc ứng trước để làm
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=Thông số tùy chọn quản lý thông tin menu đầu vào khác
 LogEvents=Sự kiện kiểm toán bảo mật
 Audit=Kiểm toán
@@ -1054,8 +1060,9 @@ LogEventDesc=You can enable here the logging for Dolibarr security events. Admin
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=Hệ thống thông tin là thông tin kỹ thuật linh tinh bạn nhận được trong chế độ chỉ đọc và có thể nhìn thấy chỉ cho quản trị viên.
 SystemAreaForAdminOnly=Khu vực này hiện có sẵn cho những người dùng quản trị. Không ai trong số phân quyền Dolibarr có thể làm giảm giới hạn này.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=Bạn có thể chọn từng thông số liên quan đến Dolibarr nhìn và cảm thấy ở đây
 AvailableModules=Available app/modules
 ToActivateModule=Để kích hoạt mô-đun, đi vào Cài đặt Khu vực (Nhà-> Cài đặt-> Modules).
@@ -1188,11 +1195,11 @@ UserMailRequired=Email được yêu cầu để tạo một người dùng mớ
 HRMSetup=HRM module setup
 ##### Company setup #####
 CompanySetup=Cài đặt module Công ty
-CompanyCodeChecker=Module cho bên thứ ba tạo mã và kiểm tra (khách hàng hoặc nhà cung cấp)
-AccountCodeManager=Module for accounting code generation (customer or supplier)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
 NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
 ModelModules=Tài liệu mẫu
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
@@ -1203,6 +1210,9 @@ MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
 TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Một liên kết xuất dữ liệu sang định dạng <b>%s</b> có sẵn tại liên kết sau đây: %s
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=Free text on commercial proposals
 WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Yêu cầu tài khoản ngân hàng của đơn hàng đề xuất
 ##### SupplierProposal #####
-SupplierProposalSetup=Cài đặt module đề nghị giá nhà cung cấp
-SupplierProposalNumberingModules=Kiểu đánh số cho đề nghị giá nhà cung cấp
-SupplierProposalPDFModules=Kiểu chứng từ đề nghị giá nhà cung cấp
-FreeLegalTextOnSupplierProposal=Free text trên đề nghị giá nhà cung cấp
-WatermarkOnDraftSupplierProposal=Watermark trên dự thảo đề nghị giá nhà cung cấp (không nếu rỗng)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Yêu cầu số tài khoản ngân hàng trên đề nghị giá
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=Cài đặt quản lý đơn hàng
 OrdersNumberingModules=Mô hình đánh số đơn hàng
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe
 OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
 OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
 ##### Stock #####
-StockSetup=Cài đặt module Kho hàng
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=Nếu bạn sử dụng module điểm bán hàng(module POS được cung cấp mặc định hoặc mô-đun bên ngoài khác), thiết lập này có thể được bỏ qua bởi Module Điểm bán hàng. Hầu hết module điểm bán hàng được thiết kế để tạo lập tức một hóa đơn và giảm tồn kho theo mặc định bất cứ điều gì là tùy chọn ở đây. Vì vậy, nếu bạn cần hay không giảm tồn kho khi đăng ký bán từ điểm bán hàng của bạn, kiểm tra lại cài đặt module POS của bạn.
 ##### Menu #####
 MenuDeleted=Menu bị xóa
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
 MultiCompanySetup=Thiết lập mô-đun đa công ty
 ##### Suppliers #####
 SuppliersSetup=Thiết lập mô-đun nhà cung cấp
-SuppliersCommandModel=Toàn bộ mẫu đơn hàng nhà cung cấp (logo ...)
-SuppliersInvoiceModel=Toàn bộ mẫu hóa đơn nhà cung cấp (logo ...)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=Mô hình đánh số hóa đơn nhà cung cấp
 IfSetToYesDontForgetPermission=Nếu chỉnh là có, đừng quên cung cấp phân quyền cho nhóm hoặc người dùng được phép cho duyệt lần hai.
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=Không sử dụng các ký tự không rõ ràng ("1"
 SalariesSetup=Cài đặt module lương
 SortOrder=Sắp xếp đơn hàng
 Format=Định dạng
-TypePaymentDesc=0: Loại khách hàng thanh toán 1: Loại nhà cung cấp thanh toán, 2: Loại cả khách hàng và nhà cung cấp thanh toán
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=Bao gồm các đường dẫn (được xác định vào biến %s)
 ExpenseReportsSetup=Cài đặt module báo cáo chi phí
 TemplatePDFExpenseReports=Mẫu chứng từ để xuất chứng từ báo cáo chi phí
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Cài đặt các module bên ngoài t
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
-TextTitleColor=Color of page title
+TextTitleColor=Text color of Page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=Màu nền của menu trên
 TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Màu nền của menu Trái
 BackgroundTableTitleColor=Màu nền cho tiêu đề của Table
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=Màu nền của hàng lẻ
 BackgroundTableLineEvenColor=Màu nền của hàng chẵn
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
 ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-MailToMember=To send email from member page
-MailToUser=To send email from user page
-MailToProject= To send email from project page
+MailToSendProposal=Customer proposals
+MailToSendOrder=Customer orders
+MailToSendInvoice=Customer invoices
+MailToSendShipment=Vận chuyển
+MailToSendIntervention=Interventions
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=Hợp đồng
+MailToThirdparty=Bên thứ ba
+MailToMember=Thành viên
+MailToUser=Người dùng
+MailToProject=Projects page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1780,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/vi_VN/bills.lang b/htdocs/langs/vi_VN/bills.lang
index 7eacd6ac884..3e53bb6be75 100644
--- a/htdocs/langs/vi_VN/bills.lang
+++ b/htdocs/langs/vi_VN/bills.lang
@@ -109,7 +109,7 @@ CancelBill=Hủy hóa đơn
 SendRemindByMail=Gửi nhắc nhở bằng email
 DoPayment=Enter payment
 DoPaymentBack=Enter refund
-ConvertToReduc=Chuyển đổi thành giảm giá trong tương lai
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=Nhập thanh toán đã nhận được từ khách hàng
@@ -120,7 +120,7 @@ BillStatus=Trạng thái hóa đơn
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=Dự thảo (cần được xác nhận)
 BillStatusPaid=Đã trả
-BillStatusPaidBackOrConverted=Credit note refund or converted into discount
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=Đã loại bỏ
 BillStatusValidated=Đã xác nhận (cần được thanh toán)
@@ -296,10 +296,10 @@ DiscountType=Discount type
 NoteReason=Ghi chú/Lý do
 ReasonDiscount=Lý do
 DiscountOfferedBy=Được cấp bởi
-DiscountStillRemaining=Discounts available
-DiscountAlreadyCounted=Discounts already consumed
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+SupplierDiscounts=Vendors discounts
 BillAddress=Địa chỉ ra hóa đơn
 HelpEscompte=Giảm giá này được cấp cho các khách hàng bởi vì thanh toán của nó đã được thực hiện trước thời hạn.
 HelpAbandonBadCustomer=Số tiền này đã bị loại bỏ (khách hàng được cho là một khách hàng xấu) và được coi là một ngoại lệ .
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but
 PaymentNote=Ghi chú thanh toán
 ListOfPreviousSituationInvoices=Danh sách hóa đơn tình huống trước đó
 ListOfNextSituationInvoices=Danh sách hóa đơn tình huống tiếp theo
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Every %s days
 FrequencyPer_m=Every %s months
 FrequencyPer_y=Every %s years
@@ -505,9 +511,14 @@ SituationAmount=Số tiền hóa đơn tình huống (chưa thuế)
 SituationDeduction=Tình huống giảm trừ
 ModifyAllLines=Sửa mọi dòng
 CreateNextSituationInvoice=Tạo tình huống tiếp theo
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=Tình huống tiếp theo đã tồn tại
 DisabledBecauseFinal=Tình huống này là cuối cùng
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=C
 CantBeLessThanMinPercent=Tiến trình này không thể nhỏ hơn giá trị của nó trong tình huống trước.
 NoSituations=Không có vị trí nào mở
 InvoiceSituationLast=Hóa đơn cuối cùng và tổng hợp
@@ -532,3 +543,4 @@ AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/vi_VN/categories.lang b/htdocs/langs/vi_VN/categories.lang
index 0522aa19055..00c29890d62 100644
--- a/htdocs/langs/vi_VN/categories.lang
+++ b/htdocs/langs/vi_VN/categories.lang
@@ -16,7 +16,7 @@ MembersCategoriesArea=Khu vực thẻ/danh mục thành viên
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
 ProjectsCategoriesArea=Khu vực thẻ/danh mục dự án
-SubCats=Danh mục con
+SubCats=Sub-categories
 CatList=Danh sách thẻ/danh mục
 NewCategory=Thẻ/danh mục mới
 ModifCat=Sửa thẻ/ danh mục
@@ -85,3 +85,4 @@ CategorieRecursivHelp=Nếu được kích hoạt, sản phẩm này cũng sẽ
 AddProductServiceIntoCategory=Thêm sản phẩm / dịch vụ sau đây
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
+ChooseCategory=Choose category
diff --git a/htdocs/langs/vi_VN/commercial.lang b/htdocs/langs/vi_VN/commercial.lang
index beb490ae4cc..618167645e7 100644
--- a/htdocs/langs/vi_VN/commercial.lang
+++ b/htdocs/langs/vi_VN/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=Đóng
 ActionAC_EMAILING=Gửi email hàng loạt
 ActionAC_COM=Gửi đơn hàng khách hàng bằng thư
 ActionAC_SHIP=Gửi đơn hàng vận chuyển bằng thư
-ActionAC_SUP_ORD=Gửi đơn hàng nhà cung cấp bằng thư
-ActionAC_SUP_INV=Gửi hóa đơn nhà cung cấp bằng thư
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=Khác
 ActionAC_OTH_AUTO=Sự kiện tự động chèn
 ActionAC_MANUAL=Sự kiện chèn bằng tay
diff --git a/htdocs/langs/vi_VN/companies.lang b/htdocs/langs/vi_VN/companies.lang
index 19f909b9e62..7f5f7c14362 100644
--- a/htdocs/langs/vi_VN/companies.lang
+++ b/htdocs/langs/vi_VN/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Are you sure you want to delete this contact and all inheri
 MenuNewThirdParty=Bên thứ ba mới
 MenuNewCustomer=Khách hàng mới
 MenuNewProspect=KH tiềm năng mới
-MenuNewSupplier=Nhà cung cấp mới
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=Cá nhân mới
-NewCompany=Công ty mới (KH tiềm năng, khách hàng, nhà cung cấp)
-NewThirdParty=Bên thứ ba mới (KH tiềm năng, khách hàng, nhà cung cấp)
-CreateDolibarrThirdPartySupplier=Tạo bên thứ ba (nhà cung cấp)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=Tạo bên thứ ba
 CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Khu vực khảo sát
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=Các KH tiềm năng
 ThirdPartyCustomers=Các khách hàng
 ThirdPartyCustomersStats=Các khách hàng
 ThirdPartyCustomersWithIdProf12=Khách hàng  với %s hoặc %s
-ThirdPartySuppliers=Nhà cung cấp
+ThirdPartySuppliers=Vendors
 ThirdPartyType=Loại bên thứ ba
 Individual=Cá nhân
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
@@ -77,11 +77,11 @@ Web=Web
 Poste= Chức vụ
 DefaultLang=Ngôn ngữ mặc định
 VATIsUsed=Sales tax is used
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
-ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Đơn hàng đề xuất
 OverAllOrders=Đơn hàng
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=RE Type
 TypeLocaltax2ES=IRPF Type
 WrongCustomerCode=Mã khách hàng không hợp lệ
-WrongSupplierCode=Mã nhà cung cấp không hợp lệ
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Kiểu mã khách hàng
-SupplierCodeModel=Kiểu mã nhà cung cấp
+SupplierCodeModel=Vendor code model
 Gencod=Mã vạch
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
@@ -267,7 +267,7 @@ Prospect=KH tiềm năng
 CustomerCard=Thẻ khách hàng
 Customer=Khách hàng
 CustomerRelativeDiscount=Giảm giá theo số tiền
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=Giảm giá theo %
 CustomerAbsoluteDiscountShort=Giảm giá theo số tiền
 CompanyHasRelativeDiscount=Khách hàng này có giảm giá mặc định là <b>%s%%</b>
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this suppl
 CompanyHasNoAbsoluteDiscount=Khách hàng này không có sẵn nợ chiết khấu
 CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
 CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=Không
 Supplier=Nhà cung cấp
 AddContact=Tạo liên lạc
@@ -304,13 +304,13 @@ DeleteACompany=Xóa một công ty
 PersonalInformations=Dữ liệu cá nhân
 AccountancyCode=Tài khoản kế toán
 CustomerCode=Mã khách hàng
-SupplierCode=Mã nhà cung cấp
+SupplierCode=Vendor code
 CustomerCodeShort=Mã khách hàng
-SupplierCodeShort=Mã nhà cung cấp
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=Mã khách hàng, duy nhất cho tất cả khách hàng
-SupplierCodeDesc=Mã nhà cung cấp, duy nhất cho tất cả các nhà cung cấp
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=Yêu cầu nếu bên thứ ba là một khách hàng hoặc KH tiềm năng
-RequiredIfSupplier=Yêu cầu nếu bên thứ ba là nhà cung cấp
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=Xác nhận kiểm soát bởi mô-đun
 ThisIsModuleRules=Đây là quy tắc cho các mô-đun này
 ProspectToContact=KH tiềm năng để liên lạc
@@ -338,7 +338,7 @@ MyContacts=Liên lạc của tôi
 Capital=Vốn
 CapitalOf=Vốn của %s
 EditCompany=Chỉnh sửa công ty
-ThisUserIsNot=Người dùng này không phải là một KH tiềm năng, khách hàng hoặc nhà cung cấp
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=Kiểm tra
 VATIntraCheckDesc=Các liên kết <b>%s</b> cho phép yêu cầu các dịch vụ kiểm tra thuế VAT châu Âu. Một truy cập internet từ máy chủ bên ngoài là cần thiết cho dịch vụ này để làm việc.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -396,7 +396,7 @@ ImportDataset_company_4=Third parties/Sales representatives (Assign sales repres
 PriceLevel=Mức giá
 DeliveryAddress=Địa chỉ giao hàng
 AddAddress=Thêm địa chỉ
-SupplierCategory=Phân nhóm nhà cung cấp
+SupplierCategory=Vendor category
 JuridicalStatus200=Independent
 DeleteFile=Xóa tập tin
 ConfirmDeleteFile=Bạn có chắc muốn xóa tập tin này?
@@ -406,7 +406,7 @@ FiscalYearInformation=Thông tin về năm tài chính
 FiscalMonthStart=Tháng bắt đầu của năm tài chính
 YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
 YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
-ListSuppliersShort=Danh sách nhà cung cấp
+ListSuppliersShort=List of vendors
 ListProspectsShort=Danh sách KH tiềm năng
 ListCustomersShort=Danh sách khách hàng
 ThirdPartiesArea=Bên thứ ba và các khu vực liên lạc
@@ -420,7 +420,7 @@ CurrentOutstandingBill=Công nợ hiện tại
 OutstandingBill=Công nợ tối đa
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=Mã này tự do. Mã này có thể được sửa đổi bất cứ lúc nào.
 ManagingDirectors=Tên quản lý (CEO, giám đốc, chủ tịch...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/vi_VN/compta.lang b/htdocs/langs/vi_VN/compta.lang
index 14bbf5fef75..055e9fd5872 100644
--- a/htdocs/langs/vi_VN/compta.lang
+++ b/htdocs/langs/vi_VN/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=Net trả
 VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
-VATSummary=Tax Balance
+VATSummary=Tax monthly
+VATBalance=Tax Balance
 VATPaid=Tax paid
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=Kế toán / Tài chính khu vực
 NewPayment=Thanh toán mới
 Payments=Thanh toán
 PaymentCustomerInvoice=Thanh toán hóa đơn của khách hàng
-PaymentSupplierInvoice=Thanh toán hóa đơn nhà cung cấp
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=Thanh toán xã hội/ fiscal tax
 PaymentVat=Nộp thuế GTGT
 ListPayment=Danh sách thanh toán
 ListOfCustomerPayments=Danh sách các khoản thanh toán của khách hàng
-ListOfSupplierPayments=Danh sách các khoản thanh toán nhà cung cấp
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Ngày giai đoạn bắt đầu
 DateEndPeriod=Thời gian cuối ngày
 newLT1Payment=New tax 2 payment
@@ -110,7 +111,7 @@ ShowVatPayment=Hiện nộp thuế GTGT
 TotalToPay=Tổng số trả
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
 CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
 SupplierAccountancyCodeShort=Sup. account. code
 AccountNumber=Số tài khoản
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=Báo cáo của bên thứ ba RE
 LT2ReportByCustomersES=Báo cáo của bên thứ ba IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Báo cáo của thuế GTGT của khách hàng thu thập và trả
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Chart of accounts models
 Pcg_type=PCG loại
 Pcg_subtype=PCG chủng
 InvoiceLinesToDispatch=Dòng hoá đơn để gửi
-ByProductsAndServices=Các sản phẩm và dịch vụ
+ByProductsAndServices=By product and service
 RefExt=Ref bên ngoài
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
 LinkedOrder=Liên kết để đặt hàng
@@ -215,7 +218,8 @@ Mode1=Phương pháp 1
 Mode2=Phương pháp 2
 CalculationRuleDesc=Để tính tổng số thuế GTGT, có hai phương pháp: <br> Phương pháp 1 đang đi ngang vat trên mỗi dòng, sau đó tổng hợp chúng. <br> Cách 2 là cách tổng hợp tất cả vat trên mỗi dòng, sau đó làm tròn kết quả. <br> Kết quả cuối cùng có thể khác với vài xu. Chế độ mặc định là chế <b>độ%s.</b>
 CalculationRuleDescSupplier=According to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Báo cáo doanh thu mỗi sản phẩm, khi sử dụng chế độ <b>kế toán tiền mặt</b> là không có liên quan. Báo cáo này chỉ có sẵn khi sử dụng chế độ <b>kế toán tham gia</b> (xem thiết lập của module kế toán).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Chế độ tính toán
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
@@ -242,3 +246,10 @@ FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/vi_VN/dict.lang b/htdocs/langs/vi_VN/dict.lang
index cb44a757b17..9ae85913a6b 100644
--- a/htdocs/langs/vi_VN/dict.lang
+++ b/htdocs/langs/vi_VN/dict.lang
@@ -5,6 +5,7 @@ CountryIT=Ý
 CountryES=Tây Ban Nha
 CountryDE=Đức
 CountryCH=Thụy Sĩ
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
 CountryGB=Vương quốc Anh
 CountryUK=Vương quốc Anh
 CountryIE=Ireland
diff --git a/htdocs/langs/vi_VN/ecm.lang b/htdocs/langs/vi_VN/ecm.lang
index a0be18de92e..e61c4097892 100644
--- a/htdocs/langs/vi_VN/ecm.lang
+++ b/htdocs/langs/vi_VN/ecm.lang
@@ -39,9 +39,10 @@ ShowECMSection=Hiện thư mục
 DeleteSection=Hủy bỏ thư mục
 ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
 ECMDirectoryForFiles=Thư mục cho các tập tin tương đối
-CannotRemoveDirectoryContainsFiles=Loại bỏ không thể vì nó có chứa một số tập tin
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=Quản lý tập tin
-ECMSelectASection=Chọn một thư mục trên cây trái ...
+ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
diff --git a/htdocs/langs/vi_VN/errors.lang b/htdocs/langs/vi_VN/errors.lang
index ce730a6912c..2a2fc25379a 100644
--- a/htdocs/langs/vi_VN/errors.lang
+++ b/htdocs/langs/vi_VN/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Mã vạch yêu cầu
 ErrorCustomerCodeAlreadyUsed=Mã số khách hàng đã sử dụng
 ErrorBarCodeAlreadyUsed=Mã vạch đã được sử dụng
 ErrorPrefixRequired=Tiền tố cần thiết
-ErrorBadSupplierCodeSyntax=Bad cú pháp mã nhà cung cấp
-ErrorSupplierCodeRequired=Mã nhà cung cấp yêu cầu
-ErrorSupplierCodeAlreadyUsed=Mã nhà cung cấp đã được sử dụng
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=Thông số xấu
 ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
 ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
@@ -87,7 +87,7 @@ ErrorsOnXLines=Lỗi được ghi nhận <b>nguồn% s</b> (s)
 ErrorFileIsInfectedWithAVirus=Các chương trình chống virus đã không thể xác nhận các tập tin (tập tin có thể bị nhiễm bởi một loại virus)
 ErrorSpecialCharNotAllowedForField=Ký tự đặc biệt không được phép cho lĩnh vực "% s"
 ErrorNumRefModel=Một tham chiếu tồn tại vào cơ sở dữ liệu (% s) và không tương thích với quy tắc đánh số này. Di chuyển hồ sơ hoặc tài liệu tham khảo đổi tên để kích hoạt module này.
-ErrorQtyTooLowForThisSupplier=Số lượng quá thấp đối với nhà cung cấp hoặc không có giá quy định về sản phẩm này cho nhà cung cấp này
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Lỗi trên mặt nạ
 ErrorBadMaskFailedToLocatePosOfSequence=Lỗi, mặt nạ mà không có số thứ tự
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
-ErrorSupplierCountryIsNotDefined=Quốc gia cho nhà cung cấp này không được xác định. Điều chỉnh lại trước.
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
diff --git a/htdocs/langs/vi_VN/install.lang b/htdocs/langs/vi_VN/install.lang
index cfa71681caf..24babf90ee7 100644
--- a/htdocs/langs/vi_VN/install.lang
+++ b/htdocs/langs/vi_VN/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=Cấu hình tập tin <b>%s</b> không
 ConfFileCouldBeCreated=Cấu hình tập tin <b>%s</b> có thể được tạo ra.
 ConfFileIsNotWritable=Tập tin cấu hình <b>%s</b> là không thể ghi. Kiểm tra quyền truy cập. Đối với lần đầu tiên cài đặt, máy chủ web của bạn phải được cấp để có thể viết vào tập tin này trong quá trình cấu hình ("chmod 666" ví dụ trên Unix như hệ điều hành).
 ConfFileIsWritable=Tập tin cấu hình <b>%s</b> có thể ghi.
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Cập nhật lại thông tin từ tập tin cấu hình.
 PHPSupportSessions=PHP này hỗ trợ phiên.
 PHPSupportPOSTGETOk=PHP này hỗ trợ các biến POST và GET.
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
 WarningRemoveInstallDir=Cảnh báo, vì lý do bảo mật, một khi cài đặt hoặc nâng cấp hoàn thành, để tránh sử dụng các công cụ cài đặt một lần nữa, bạn nên thêm một tập tin gọi là <b>install.lock</b> vào thư mục tài liệu Dolibarr, để tránh việc sử dụng độc hại của nó.
 FunctionNotAvailableInThisPHP=Không có sẵn trên PHP này
 ChoosedMigrateScript=Chọn kịch bản di cư
-DataMigration=Di chuyển dữ liệu
-DatabaseMigration=Di chuyển cơ sở dữ liệu cấu trúc
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=Xử lý kịch bản
 ChooseYourSetupMode=Chọn chế độ cài đặt của bạn và bấm vào nút "Bắt đầu" ...
 FreshInstall=Cài đặt mới
@@ -146,7 +147,7 @@ NothingToDo=Nothing to do
 # upgrade
 MigrationFixData=Sửa chữa cho các dữ liệu denormalized
 MigrationOrder=Di chuyển dữ liệu cho các đơn hàng của khách hàng
-MigrationSupplierOrder=Di chuyển dữ liệu cho các đơn đặt hàng của nhà cung cấp
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=Di chuyển dữ liệu cho đề xuất thương mại
 MigrationInvoice=Di chuyển dữ liệu cho hóa đơn của khách hàng
 MigrationContract=Di chuyển dữ liệu cho các hợp đồng
@@ -196,6 +197,8 @@ MigrationEvents=Migration of events to add event owner into assignement table
 MigrationEventsContact=Migration of events to add event contact into assignement table
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
 MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 ShowNotAvailableOptions=Hiển thị tùy chọn không có sẵn
diff --git a/htdocs/langs/vi_VN/ldap.lang b/htdocs/langs/vi_VN/ldap.lang
index 7951f7fb0f1..233cc1a1aa0 100644
--- a/htdocs/langs/vi_VN/ldap.lang
+++ b/htdocs/langs/vi_VN/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Mật khẩu cho tên miền
 YouMustChangePassNextLogon=Mật khẩu cho người <b>dùng% s</b> trên <b>miền% s</b> phải được thay đổi.
 UserMustChangePassNextLogon=Người dùng phải thay đổi mật khẩu trên các tên miền% s
 LDAPInformationsForThisContact=Thông tin trong cơ sở dữ liệu LDAP cho liên hệ này
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Member type synchronized
 ContactSynchronized=Liên hệ đồng bộ
 ForceSynchronize=Lực lượng đồng bộ hóa Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Không thể đọc cơ sở dữ liệu LDAP. Kiểm tra thiết lập mô-đun LDAP và khả năng tiếp cận cơ sở dữ liệu.
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/vi_VN/loan.lang b/htdocs/langs/vi_VN/loan.lang
index 12c942466c0..07940549297 100644
--- a/htdocs/langs/vi_VN/loan.lang
+++ b/htdocs/langs/vi_VN/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=Vốn
 Insurance=Bảo hiểm
 Interest=Lãi suất
 Nbterms=Số năm vay vốn
+Term=Term
 LoanAccountancyCapitalCode=Accounting account capital
 LoanAccountancyInsuranceCode=Accounting account insurance
 LoanAccountancyInterestCode=Accounting account interest
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=Xác nhận xóa khoản vay này
 LoanDeleted=Khoản vay đã xóa thành công
 ConfirmPayLoan=Confirm classify paid this loan
 LoanPaid=Khoản vay đã trả
-# Calc
-LoanCalc=Bảng tính khoản vay ngân hàng
-PurchaseFinanceInfo=Purchase & Financing Information
-SalePriceOfAsset=Sale Price of Asset
-PercentageDown=Percentage Down
-LengthOfMortgage=Thời hạn vay
-AnnualInterestRate=Lãi suất hàng năm
-ExplainCalculations=Explain Calculations
-ShowMeCalculationsAndAmortization=Show me the calculations and amortization
-MortgagePaymentInformation=Mortgage Payment Information
-DownPayment=Down Payment
-DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
-InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
-MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
-MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
-MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
-MonthlyPaymentDesc=The montly payment is figured out using the following formula
-AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
-AmountFinanced=Tổng số tài chính
-AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
-Totalsforyear=Tổng số theo năm
-MonthlyPayment=Thanh toán hàng tháng
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
-GoToInterest=%s will go towards INTEREST
-GoToPrincipal=%s will go towards PRINCIPAL
-YouWillSpend=You will spend %s in year %s
 ListLoanAssociatedProject=Danh sách vay vốn gắn với dự án này
 AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Lãi suất
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-FinancialCommitment=Financial commitment
 CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/langs/vi_VN/mails.lang b/htdocs/langs/vi_VN/mails.lang
index 15b91627dca..c29053352ef 100644
--- a/htdocs/langs/vi_VN/mails.lang
+++ b/htdocs/langs/vi_VN/mails.lang
@@ -11,7 +11,9 @@ MailFrom=Tên người gửi
 MailErrorsTo=Lỗi để
 MailReply=Trả lời
 MailTo=Thu (s)
+MailToUsers=To user(s)
 MailCC=Sao chép vào
+MailToCCUsers=Copy to users(s)
 MailCCC=Bản cache để
 MailTopic=Thư điện tử chủ đề
 MailText=Tin nhắn
@@ -164,4 +166,4 @@ InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Thông tin
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/vi_VN/main.lang b/htdocs/langs/vi_VN/main.lang
index 861be482a89..a3ef25f53ff 100644
--- a/htdocs/langs/vi_VN/main.lang
+++ b/htdocs/langs/vi_VN/main.lang
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is se
 Administrator=Quản trị
 Undefined=Không xác định
 PasswordForgotten=Password forgotten?
+NoAccount=No account?
 SeeAbove=Xem ở trên
 HomeArea=Khu vực nhà
 LastConnexion=Latest connection
@@ -231,7 +232,7 @@ Limit=Giới hạn
 Limits=Giới hạn
 Logout=Đăng xuất
 NoLogoutProcessWithAuthMode=Không áp dụng tính năng ngắt kết nối với chế độ xác thực <b>%s</b>
-Connection=Kết nối
+Connection=Đăng nhập
 Setup=Thiết lập
 Alert=Cảnh báo
 MenuWarnings=Cảnh báo
@@ -402,6 +403,7 @@ DefaultTaxRate=Default tax rate
 Average=Trung bình
 Sum=Tính tổng
 Delta=Delta
+RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Tùy chọn
@@ -414,7 +416,7 @@ Favorite=Yêu thích
 ShortInfo=Thông tin.
 Ref=Tham chiếu
 ExternalRef=Ref. extern
-RefSupplier=Tham chiếu nhà cung cấp
+RefSupplier=Ref. vendor
 RefPayment=Tham chiếu thanh toán
 CommercialProposalsShort=Đơn hàng đề xuất
 Comment=Chú thích
@@ -493,7 +495,7 @@ Received=Đã nhận
 Paid=Đã trả
 Topic=Subject
 ByCompanies=Bởi bên thứ ba
-ByUsers=Bởi người dùng
+ByUsers=By user
 Links=Liên kết
 Link=Liên kết
 Rejects=Từ chối
@@ -619,9 +621,9 @@ BuildDoc=Làm file Doc
 Entity=Môi trường
 Entities=Thực thể
 CustomerPreview=Xem trước khách hàng
-SupplierPreview=Xem trước nhà cung cấp
+SupplierPreview=Vendor preview
 ShowCustomerPreview=Xem trước khách hàng hiển thị
-ShowSupplierPreview=Xem trước nhà cung cấp hiển thị
+ShowSupplierPreview=Show vendor preview
 RefCustomer=Tham chiếu khách hàng
 Currency=Tiền tệ
 InfoAdmin=Thông tin dành cho người quản trị
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=Products or services
 SearchIntoProjects=Các dự án
 SearchIntoTasks=Tác vụ
 SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Interventions
 SearchIntoContracts=Hợp đồng
 SearchIntoCustomerShipments=Customer shipments
@@ -941,3 +943,5 @@ Remote=Remote
 LocalAndRemote=Local and Remote
 KeyboardShortcut=Keyboard shortcut
 AssignedTo=Giao cho
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/vi_VN/margins.lang b/htdocs/langs/vi_VN/margins.lang
index 10efb77e2ba..5818dd47bb7 100644
--- a/htdocs/langs/vi_VN/margins.lang
+++ b/htdocs/langs/vi_VN/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=Là một dịch vụ
 UseDiscountOnTotal=Trên tổng số phụ
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Xác định nếu giảm giá toàn cầu được coi là một sản phẩm, một dịch vụ, hoặc chỉ trên tổng số phụ để tính tỷ suất biên lợi nhuận.
 MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best supplier price
+MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Giá thành
 UnitCharges=Chi phí đơn vị
 Charges=Phí
diff --git a/htdocs/langs/vi_VN/members.lang b/htdocs/langs/vi_VN/members.lang
index e9d6d14660c..577cc47e660 100644
--- a/htdocs/langs/vi_VN/members.lang
+++ b/htdocs/langs/vi_VN/members.lang
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
diff --git a/htdocs/langs/vi_VN/opensurvey.lang b/htdocs/langs/vi_VN/opensurvey.lang
index ef4432ffa50..44029926fba 100644
--- a/htdocs/langs/vi_VN/opensurvey.lang
+++ b/htdocs/langs/vi_VN/opensurvey.lang
@@ -58,3 +58,4 @@ MoreChoices=Nhập nhiều lựa chọn hơn cho các cử tri
 SurveyExpiredInfo=The poll has been closed or voting delay has expired.
 EmailSomeoneVoted=% S đã lấp đầy một đường thẳng. Bạn có thể tìm thăm dò ý kiến ​​của bạn tại liên kết:% s
 ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/vi_VN/orders.lang b/htdocs/langs/vi_VN/orders.lang
index 9f7f617f2dd..da92c9edde5 100644
--- a/htdocs/langs/vi_VN/orders.lang
+++ b/htdocs/langs/vi_VN/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Khu vực đặt hàng của khách hàng
-SuppliersOrdersArea=Khu vực đặt hàng của nhà cung cấp
+SuppliersOrdersArea=Purchase orders area
 OrderCard=Thẻ đặt hàng
 OrderId=Mã đặt hàng
 Order=Đơn hàng
@@ -13,18 +13,18 @@ OrderToProcess=Đơn hàng xử lý
 NewOrder=Đơn hàng mới
 ToOrder=Tạo đơn hàng
 MakeOrder=Tạo đơn hàng
-SupplierOrder=Đơn hàng nhà cung cấp
-SuppliersOrders=Đơn hàng nhà cung cấp
-SuppliersOrdersRunning=Đơn hàng nhà cung cấp hiện tại
-CustomerOrder=Đơn hàng khách hàng
-CustomersOrders=Customer orders
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
+CustomerOrder=Khách hàng tự
+CustomersOrders=Đơn hàng khách hàng
 CustomersOrdersRunning=Current customer orders
 CustomersOrdersAndOrdersLines=Customer orders and order lines
 OrdersDeliveredToBill=Customer orders delivered to bill
 OrdersToBill=Customer orders delivered
 OrdersInProcess=Customer orders in process
 OrdersToProcess=Customer orders to process
-SuppliersOrdersToProcess=Supplier orders to process
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=Đã hủy bỏ
 StatusOrderDraftShort=Dự thảo
 StatusOrderValidatedShort=Đã xác nhận
@@ -75,15 +75,15 @@ ShowOrder=Hiển thị đơn hàng
 OrdersOpened=Orders to process
 NoDraftOrders=Không có đơn hàng dự thảo
 NoOrder=No order
-NoSupplierOrder=No supplier order
+NoSupplierOrder=No purchase order
 LastOrders=Latest %s customer orders
 LastCustomerOrders=Latest %s customer orders
-LastSupplierOrders=Latest %s supplier orders
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=Latest %s modified orders
 AllOrders=Tất cả đơn hàng
 NbOfOrders=Số lượng đơn hàng
 OrdersStatistics=Thống kê đơn hàng
-OrdersStatisticsSuppliers=Thống kê đơn hàng nhà cung cấp
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=Số lượng đơn hàng theo tháng
 AmountOfOrdersByMonthHT=Số tiền của đơn hàng theo tháng (chưa thuế)
 ListOfOrders=Danh sách đơn hàng
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</
 GenerateBill=Xuất ra hóa đơn
 ClassifyShipped=Phân vào đã giao hàng
 DraftOrders=Dự thảo đơn hàng
-DraftSuppliersOrders=Draft suppliers orders
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=Đang xử lý đơn hàng
 RefOrder=Tham chiếu đơn hàng
 RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for supplier
-RefOrderSupplierShort=Ref. order supplier
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=Gửi đơn hàng qua bưu điện
 ActionsOnOrder=Sự kiện trên đơn hàng
 NoArticleOfTypeProduct=Không có điều khoản của loại 'sản phẩm' vì vậy không có điều khoản vận chuyển cho đơn hàng này
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
 DispatchSupplierOrder=Đang nhận đơn hàng nhà cung cấp %s
 FirstApprovalAlreadyDone=Duyệt mức đầu tiên đã xong
 SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=Supplier order %s received %s
-SupplierOrderSubmitedInDolibarr=Supplier order %s submited
-SupplierOrderClassifiedBilled=Supplier order %s set billed
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=Đơn hàng khác
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Đại diện theo dõi đơn hàng khách hàng
@@ -125,11 +125,11 @@ TypeContact_commande_internal_SHIPPING=Đại diện theo dõi vận chuyển
 TypeContact_commande_external_BILLING=Liên lạc khách hàng về hóa đơn
 TypeContact_commande_external_SHIPPING=Liên lạc khách hàng về việc giao hàng
 TypeContact_commande_external_CUSTOMER=Liên lạc khách hàng để theo dõi đơn hàng
-TypeContact_order_supplier_internal_SALESREPFOLL=Đại diện theo dõi đơn hàng nhà cung cấp
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=Đại diện theo dõi việc vận chuyển
-TypeContact_order_supplier_external_BILLING=Liên lạc nhà cung cấp về hóa đơn
-TypeContact_order_supplier_external_SHIPPING=Liên lạc nhà cung cấp về việc giao hàng
-TypeContact_order_supplier_external_CUSTOMER=Liên lạc nhà cung cấp để theo dõi đơn hàng
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Thông số COMMANDE_SUPPLIER_ADDON chưa xác định
 Error_COMMANDE_ADDON_NotDefined=Thông số COMMANDE_ADDON chưa xác định
 Error_OrderNotChecked=Không có đơn hàng nào chuyển sang hóa đơn được chọn
diff --git a/htdocs/langs/vi_VN/other.lang b/htdocs/langs/vi_VN/other.lang
index 43142e234d5..09c912f0653 100644
--- a/htdocs/langs/vi_VN/other.lang
+++ b/htdocs/langs/vi_VN/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=Tập tin là quá lớn
 PleaseBePatient=Xin hãy kiên nhẫn ...
 NewPassword=New password
 ResetPassword=Reset password
-RequestToResetPasswordReceived=Một yêu cầu thay đổi mật khẩu Dolibarr của bạn đã được nhận
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=Đây là chìa khóa mới để đăng nhập
 NewKeyWillBe=Khóa mới của bạn để đăng nhập vào phần mềm sẽ được
 ClickHereToGoTo=Click vào đây để đi đến% s
@@ -233,6 +233,8 @@ PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=Khu vực xuất khẩu
 AvailableFormats=Định dạng có sẵn
diff --git a/htdocs/langs/vi_VN/productbatch.lang b/htdocs/langs/vi_VN/productbatch.lang
index 4ac8b6ea420..e0e3a42ca08 100644
--- a/htdocs/langs/vi_VN/productbatch.lang
+++ b/htdocs/langs/vi_VN/productbatch.lang
@@ -16,7 +16,7 @@ printEatby=Ăn theo: %s
 printSellby=Bán theo: %s
 printQty=SL: %d
 AddDispatchBatchLine=Thêm 1 line cho Shelf Life dispatching
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic increase/decrease stock mode is forced to shipping validate and manual dispatching for reception and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
 ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
diff --git a/htdocs/langs/vi_VN/products.lang b/htdocs/langs/vi_VN/products.lang
index 8f87aa0020d..eb82b76cfa5 100644
--- a/htdocs/langs/vi_VN/products.lang
+++ b/htdocs/langs/vi_VN/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Tổng bán
 PurchasedAmount=Tổng mua
 NewPrice=Giá mới
 MinPrice=Giá bán tối thiểu
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=Giá bán không thấp hơn mức tối thiểu được cho phép của sản phẩm này (%s chưa thuế). Thông điệp này chỉ xuất hiện khi bạn nhập giảm giá quá lớn.
 ContractStatusClosed=Đã đóng
 ErrorProductAlreadyExists=Một sản phẩm với tham chiếu %s đã tồn tại.
@@ -155,7 +156,7 @@ BuyingPrices=Giá mua
 CustomerPrices=Giá khách hàng
 SuppliersPrices=Giá nhà cung cấp
 SuppliersPricesOfProductsOrServices=Giá nhà cung cấp (của sản phẩm hoặc dịch vụ)
-CustomCode=Customs/Commodity/HS code
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=Nước xuất xứ
 Nature=Tự nhiên
 ShortLabel=Nhãn ngắn
diff --git a/htdocs/langs/vi_VN/projects.lang b/htdocs/langs/vi_VN/projects.lang
index 24f54e275bf..4820ff1a573 100644
--- a/htdocs/langs/vi_VN/projects.lang
+++ b/htdocs/langs/vi_VN/projects.lang
@@ -77,6 +77,7 @@ Time=Thời gian
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=Danh sách các đơn hàng đề xuất được gắn với dự án
 ListOrdersAssociatedProject=List of customer orders associated with the project
@@ -226,4 +227,4 @@ AllowCommentOnProject=Allow user comments on projects
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/vi_VN/stocks.lang b/htdocs/langs/vi_VN/stocks.lang
index be7204a1b9a..3efc5688d24 100644
--- a/htdocs/langs/vi_VN/stocks.lang
+++ b/htdocs/langs/vi_VN/stocks.lang
@@ -203,3 +203,4 @@ RegulateStock=Regulate Stock
 ListInventory=Danh sách
 StockSupportServices=Stock management support services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/vi_VN/stripe.lang b/htdocs/langs/vi_VN/stripe.lang
index 606c311d600..8c2064c6b92 100644
--- a/htdocs/langs/vi_VN/stripe.lang
+++ b/htdocs/langs/vi_VN/stripe.lang
@@ -58,8 +58,8 @@ NameOnCard=Name on card
 CardNumber=Card Number
 ExpiryDate=Expiry Date
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/vi_VN/supplier_proposal.lang b/htdocs/langs/vi_VN/supplier_proposal.lang
index 714f12f588c..02c317bfb91 100644
--- a/htdocs/langs/vi_VN/supplier_proposal.lang
+++ b/htdocs/langs/vi_VN/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Supplier commercial proposals
-supplier_proposalDESC=Manage price requests to suppliers
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
 SupplierProposalNew=New price request
 CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
-SupplierProposalsDraft=Draft supplier proposals
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=Latest %s modified price requests
 RequestsOpened=Open price requests
-SupplierProposalArea=Supplier proposals area
-SupplierProposalShort=Supplier proposal
-SupplierProposals=Supplier proposals
-SupplierProposalsShort=Supplier proposals
+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=Supplier ref
+SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=Ngày giao hàng
 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>?
@@ -47,9 +47,9 @@ CommercialAsk=Price request
 DefaultModelSupplierProposalCreate=Tạo mô hình mặc định
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposals=List of supplier proposal requests
-ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
-SupplierProposalsToClose=Supplier proposals to close
-SupplierProposalsToProcess=Supplier proposals to process
+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
diff --git a/htdocs/langs/vi_VN/suppliers.lang b/htdocs/langs/vi_VN/suppliers.lang
index db60a3671d9..ad6f562b7fa 100644
--- a/htdocs/langs/vi_VN/suppliers.lang
+++ b/htdocs/langs/vi_VN/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Nhà cung cấp
-SuppliersInvoice=Hóa đơn nhà cung cấp
-ShowSupplierInvoice=Show Supplier Invoice
-NewSupplier=Nhà cung cấp mới
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=Lịch sử
-ListOfSuppliers=Danh sách nhà cung cấp
-ShowSupplier=Hiện nhà cung cấp
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=Ngày đặt hàng
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Một vài sản phẩm con không có giá xác định
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
-SupplierPrices=Giá nhà cung cấp
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Cung cấp thông tin này đã được liên kết với một tham chiếu: %s
-NoRecordedSuppliers=Không có nhà cung cấp được ghi nhận
-SupplierPayment=Thanh toán của nhà cung cấp
-SuppliersArea=Khu vực nhà cung cấp
-RefSupplierShort=Số tham chiếu nhà cung cấp
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=Sẵn có
-ExportDataset_fournisseur_1=Danh sách hóa đơn và chi tiết hóa đơn của nhà cung cấp
-ExportDataset_fournisseur_2=Thanh toán và hóa đơn của nhà cung cấp
-ExportDataset_fournisseur_3=Đơn hàng và chi tiết đơn hàng của nhà cung cấp
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=Duyệt đơn hàng này
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Từ chối đơn hàng này
 ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
 ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
-AddSupplierOrder=Tạo đơn hàng nhà cung cấp
-AddSupplierInvoice=Tạo hóa đơn nhà cung cấp
-ListOfSupplierProductForSupplier=Danh sách sản phẩm và giá cho nhà cung <b>%s</b>
-SentToSuppliers=Đã gửi đến nhà cung cấp
-ListOfSupplierOrders=Danh sách các đơn hàng nhà cung cấp
-MenuOrdersSupplierToBill=Chuyển các đơn hàng nhà cung cấp sang hóa đơn
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=Số ngày giao hàng
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-SupplierReputation=Supplier reputation
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
 AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=Giá nhà cung cấp
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/vi_VN/website.lang b/htdocs/langs/vi_VN/website.lang
index 79ae305e708..c5ec67f23bc 100644
--- a/htdocs/langs/vi_VN/website.lang
+++ b/htdocs/langs/vi_VN/website.lang
@@ -73,7 +73,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
diff --git a/htdocs/langs/vi_VN/workflow.lang b/htdocs/langs/vi_VN/workflow.lang
index 3b10720c677..e8f47abee8c 100644
--- a/htdocs/langs/vi_VN/workflow.lang
+++ b/htdocs/langs/vi_VN/workflow.lang
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source custome
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=Tạo tự động
 AutomaticClassification=Phân loại tự động
diff --git a/htdocs/langs/zh_CN/accountancy.lang b/htdocs/langs/zh_CN/accountancy.lang
index b06536c909b..a7a5b199184 100644
--- a/htdocs/langs/zh_CN/accountancy.lang
+++ b/htdocs/langs/zh_CN/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=会计
 ACCOUNTING_EXPORT_SEPARATORCSV=列分隔符的导出文件
 ACCOUNTING_EXPORT_DATE=日期格式导出文件
 ACCOUNTING_EXPORT_PIECE=导出件数
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=Accounts with non zero values
 ListOfAccounts=List of accounts
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for suppliers 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
 
-AccountancyArea=Accountancy area
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
 AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
@@ -89,7 +90,7 @@ MenuProductsAccounts=Product accounts
 ProductsBinding=Products accounts
 Ventilation=Binding to accounts
 CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Supplier invoice binding
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=购买杂志
 ACCOUNTING_MISCELLANEOUS_JOURNAL=其他杂志
 ACCOUNTING_EXPENSEREPORT_JOURNAL=费用报表日记
 ACCOUNTING_SOCIAL_JOURNAL=社交杂志
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transfer
 ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
@@ -185,11 +187,12 @@ ListeMvts=List of movements
 ErrorDebitCredit=借记卡和信用卡在同一时间不能有一个值
 AddCompteFromBK=Add accounting accounts to the group
 ReportThirdParty=List third party account
-DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=会计账目清单
 UnknownAccountForThirdparty=Unknown third party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=Group of account
 Pcgsubtype=Subgroup of account
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
 ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
-DescVentilDoneSupplier=在这里请教发票的供应商的明细和其会计帐户列表
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
 DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report 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 fees dictionary or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
@@ -215,7 +218,7 @@ ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=错误，你不能删除这个会计帐户，因为它是用来
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transactions are written in the Ledger
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
@@ -293,4 +296,9 @@ Binded=Lines bound
 ToBind=Lines to bind
 UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a> to make the binding manually
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang
index d8cb5687b40..67b168d06d7 100644
--- a/htdocs/langs/zh_CN/admin.lang
+++ b/htdocs/langs/zh_CN/admin.lang
@@ -269,10 +269,11 @@ MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS 主机 ( php.ini 文件中的默认值：<b>%s<
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS 端口 ( Unix 类系统下未在 PHP 中定义)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS 主机 ( Unix 类系统下未在 PHP 中定义)
 MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used as 'Errors-To' field in emails sent
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
 MAIN_MAIL_AUTOCOPY_TO= BCC 所有发送邮件至
 MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
 MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=电邮发送方法
 MAIN_MAIL_SMTPS_ID=SMTP ID，如果要求验证
 MAIN_MAIL_SMTPS_PW=SMTP 密码，如果要求验证
@@ -291,7 +292,7 @@ ModuleSetup=模块设置
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=系统
 ModuleFamilyCrm=客户关系管理(CRM)
-ModuleFamilySrm=供应商关系管理 (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=产品管理
 ModuleFamilyHr=人力资源管理 (HR)
 ModuleFamilyProjects=项目/协同工作
@@ -373,7 +374,8 @@ NoSmsEngine=无短信发送管理程序可用。SMS发件人管理器没有安
 PDF=PDF格式
 PDFDesc=你可以设置PDF生成有关的每个全局选项
 PDFAddressForging=PDF 中地址生成规则
-HideAnyVATInformationOnPDF=生成的PDF中隐藏所有有关增值税的信息
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
 HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
 HideDescOnPDF=生成 PDF 中隐藏产品描述信息
@@ -445,7 +447,8 @@ DisplayCompanyInfo=显示公司地址
 DisplayCompanyManagers=显示管理员名称
 DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
 ModuleCompanyCodePanicum=Return an empty accounting code.
 ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party 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.
@@ -471,6 +474,9 @@ AttachMainDocByDefault=Set this to 1 if you want to attach main document to emai
 FilesAttachedToEmail=Attach file
 SendEmailsReminders=Send agenda reminders by emails
 davDescription=Add a component to be a DAV server
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=用户和组
 Module0Desc=Users / Employees and Groups management
@@ -479,7 +485,7 @@ Module1Desc=公司和联络人管理(客户、准客户潜在客户...等等)模
 Module2Name=商业交易
 Module2Desc=交易管理
 Module10Name=会计
-Module10Desc=根据数据库内容生成的简易会计报表 (日常报表, 营业额)。没有外部数据对接.
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=报价
 Module20Desc=报价管理模块
 Module22Name=邮件群发
@@ -546,8 +552,8 @@ Module400Name=项目/机会/线索
 Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar 整合
-Module500Name=特殊开支
-Module500Desc=特殊开支管理(税、财政税等)
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Payment of employee wages
 Module510Desc=Record and follow payment of your employee wages
 Module520Name=贷款
@@ -561,14 +567,14 @@ Module700Name=捐赠
 Module700Desc=捐赠管理模块
 Module770Name=费用报表
 Module770Desc=管理和索取费用报表 (交通费, 餐费,等等 ...)模块
-Module1120Name=供应商商业报价
-Module1120Desc=要求供应商商业报价和价格
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Mantis 整合
 Module1520Name=文档生成
 Module1520Desc=生成文档群发邮件
 Module1780Name=标签/分类
-Module1780Desc=创建标签/分类(商品、客户、供应商、联系人或会员)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=所见即所得编辑器
 Module2000Desc=允许以高级富文本的编辑方式来编辑文本内容(基于 CKEditor)
 Module2200Name=动态定价
@@ -576,7 +582,7 @@ Module2200Desc=允许价格的数学表达式
 Module2300Name=计划任务
 Module2300Desc=Scheduled jobs management (alias cron or chrono table)
 Module2400Name=Events/Agenda
-Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous.
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
 Module2500Name=DMS / ECM
 Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
 Module2600Name=API/Web 服务 (SOAP 服务器)
@@ -613,7 +619,7 @@ Module50100Desc= (POS)POS模块.
 Module50200Name=Paypal
 Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 Module50400Name=会计(高级)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=IPP打印
 Module54000Desc=不打开文档而使用 Cups IPP 界面直接打印 (打印机必须在服务器可见，Cups 必须安装在服务器上)。
 Module55000Name=问卷, 调查或投票
@@ -1033,9 +1039,9 @@ Delays_MAIN_DELAY_MEMBERS=会员费用最大逾期时间 (天)
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=支票兑现最大逾期时间 (天) 
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
 SetupDescription1=在开始使用Dolibarr之前请先进行初始化设置相关参数。
-SetupDescription2=The two mandatory setup steps are the first two in the setup menu on the left: %s setup page and %s setup page :
-SetupDescription3=Parameters in menu <a href="%s">%s -> %s</a> are required because defined data are used on Dolibarr screens and to customize the default behavior of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">%s -> %s</a> are required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features will be added to menus for every module you will activate.
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=其他管理菜单可选参数。
 LogEvents=安全稽核事件
 Audit=安全稽核
@@ -1054,8 +1060,9 @@ LogEventDesc=这里您可以启用 Dolibarr 的安全事件日志记录。管理
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=系统信息指以只读方式显示的其它技术信息，只对系统管理员可见。
 SystemAreaForAdminOnly=此区仅供管理员用户使用。Dolibarr 中没有权限可越过此限制。
-CompanyFundationDesc=在本页面输入详细的公司或机构的初始资料 (然后点击页面底部的 "变更" 或 "保存" 按钮)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
 AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+AccountantFileNumber=File number
 DisplayDesc=这里可以选择 Dolibarr 外观效果相关的所有参数
 AvailableModules=Available app/modules
 ToActivateModule=要启用模块，请到“设定”区 (首页->设定->模块)。
@@ -1188,11 +1195,11 @@ UserMailRequired=新创建用户时需要输入电子邮箱地址
 HRMSetup=人力资源管理模块设置
 ##### Company setup #####
 CompanySetup=客户/供应商模块及其相关参数设置
-CompanyCodeChecker=合伙人编号生成与检验模块 (客户或供应商)
-AccountCodeManager=Module for accounting code generation (customer or supplier)
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
 NotificationsDesc=Email邮件提醒通知功能允许你给一些Dolibarr活动，自动发送提醒通知邮件。提醒通知的目标可定义：
 NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
 ModelModules=文件模板
 DocumentModelOdt=生成开源办公软件专用格式的(如OpenOffice, KOffice, TextEdit,...等的.ODT格式，.ODS格式)的模板文档。
@@ -1203,6 +1210,9 @@ MustBeUnique=Must be unique?
 MustBeMandatory=Mandatory to create third parties?
 MustBeInvoiceMandatory=Mandatory to validate invoices?
 TechnicalServicesProvided=Technical services provided
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=<b>%s</b>格式的导出文件可以通过链接 %s 下载
 ##### Invoices #####
@@ -1229,15 +1239,15 @@ FreeLegalTextOnProposal=报价单中的额外说明文本
 WatermarkOnDraftProposal=为商业计划书草案添加水印(无则留空)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=询问银行账户
 ##### SupplierProposal #####
-SupplierProposalSetup=供应商询价申请模块设置
-SupplierProposalNumberingModules=供应商询价申请编号模型
-SupplierProposalPDFModules=供应商询价申请文档模型
-FreeLegalTextOnSupplierProposal=供应商询价申请额外说明文字
-WatermarkOnDraftSupplierProposal=给供应商询价申请加盖水印 (无则留空)
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=询问目标询价申请的银行账号
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=订单管理设置
 OrdersNumberingModules=订单编号模块
@@ -1515,7 +1525,7 @@ OSCommerceTestOk=成功连接到服务器'%s'的数据库'%s'上，身份用户
 OSCommerceTestKo1=服务器'%s'连接成功，但无法打开数据库'%s'。
 OSCommerceTestKo2=以用户身份'%s'连接至服务器'%s' 失败。
 ##### Stock #####
-StockSetup=仓库模块设置
+StockSetup=Stock module setup
 IfYouUsePointOfSaleCheckModule=如果你使用了POS模块，那么这个设置可能会被POS模块忽略。大多数POS模块都是设计来创建快速发票以及在销售后减掉该商品的库存，无论其他模块的设置如何。所以，如果你不希望在POS模块进行销售时减掉库存，那么请同样检查一下POS模块的设置。
 ##### Menu #####
 MenuDeleted=菜单(项)已删除
@@ -1627,8 +1637,8 @@ ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
 MultiCompanySetup=多公司模块设置
 ##### Suppliers #####
 SuppliersSetup=供应商模块设置
-SuppliersCommandModel=采购合同的完整模板(LOGO标识...)
-SuppliersInvoiceModel=采购账单的完整模板(LOGO标识...)
+SuppliersCommandModel=Complete template of prchase order (logo...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
 SuppliersInvoiceNumberingModel=采购账单编号模块
 IfSetToYesDontForgetPermission=如果选择"是"，请不要忘记为用户和组设置二次审核的权限
 ##### GeoIPMaxmind #####
@@ -1665,7 +1675,7 @@ NoAmbiCaracAutoGeneration=不使用模糊字符 (例如"1","l","i","|","0","O")
 SalariesSetup=薪酬模块设置
 SortOrder=排序顺序
 Format=格式
-TypePaymentDesc=0：客户支付类型，1：供应商支付类型，2：客户和供应商的付款方式
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
 IncludePath=包含路径 (定义变量 %s)
 ExpenseReportsSetup=费用报表模块设置
 TemplatePDFExpenseReports=用于生成费用报表文件的文件模板
@@ -1687,7 +1697,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Install of external module from applic
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=当鼠标经过表格明细时高亮显示
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
-TextTitleColor=页面标题颜色
+TextTitleColor=Text color of Page title
 LinkColor=颜色链接
 PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
@@ -1696,6 +1706,7 @@ TopMenuBackgroundColor=顶部菜单背景颜色
 TopMenuDisableImages=隐藏顶部菜单图片
 LeftMenuBackgroundColor=左侧菜单背景颜色
 BackgroundTableTitleColor=清单表格表头背景颜色
+BackgroundTableTitleTextColor=Text color for Table title line
 BackgroundTableLineOddColor=表格奇数背景颜色
 BackgroundTableLineEvenColor=表格偶数背景颜色
 MinimumNoticePeriod=最小通知间隔
@@ -1718,19 +1729,19 @@ FillFixTZOnlyIfRequired=例：+2 (只有问题发生时才填写)
 ExpectedChecksum=预计校验
 CurrentChecksum=当前校验
 ForcedConstants=Required constant values
-MailToSendProposal=发送客户报价
-MailToSendOrder=发送客户订单
-MailToSendInvoice=发送客户发票
-MailToSendShipment=发送发货单
-MailToSendIntervention=发送干预
-MailToSendSupplierRequestForQuotation=发送供应商报价请求
-MailToSendSupplierOrder=发送采购订单
-MailToSendSupplierInvoice=发送供应商发票
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-MailToMember=To send email from member page
-MailToUser=To send email from user page
-MailToProject= To send email from project page
+MailToSendProposal=客户报价
+MailToSendOrder=客户订单
+MailToSendInvoice=客户发票
+MailToSendShipment=运输
+MailToSendIntervention=干预
+MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierOrder=Purchase orders
+MailToSendSupplierInvoice=Vendor invoices
+MailToSendContract=合同
+MailToThirdparty=合伙人
+MailToMember=会员
+MailToUser=用户
+MailToProject=Projects page
 ByDefaultInList=默认显示列表视图
 YouUseLastStableVersion=You use the latest stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1780,7 +1791,10 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
 SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+COMPANY_AQUARIUM_REMOVE_SPECIAL=Remove special characters
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=If you store data about European companies/citizen, you can store here the contact who is responsible for the General Data Protection Regulation
 ##### Resource ####
 ResourceSetup=Configuration du module Resource
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/zh_CN/bills.lang b/htdocs/langs/zh_CN/bills.lang
index 52ce5935291..60ea161c6f2 100644
--- a/htdocs/langs/zh_CN/bills.lang
+++ b/htdocs/langs/zh_CN/bills.lang
@@ -109,7 +109,7 @@ CancelBill=取消发票
 SendRemindByMail=通过电子邮件发送提醒
 DoPayment=Enter payment
 DoPaymentBack=Enter refund
-ConvertToReduc=转换到未来的折扣
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=输入从客户收到的付款
@@ -120,7 +120,7 @@ BillStatus=发票状态
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=草案(需要确认)
 BillStatusPaid=已支付
-BillStatusPaidBackOrConverted=Credit note refund or converted into discount
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Paid (ready for consumption in final invoice)
 BillStatusCanceled=已丢弃
 BillStatusValidated=已确认 (需要付款)
@@ -296,10 +296,10 @@ DiscountType=Discount type
 NoteReason=备注/原因
 ReasonDiscount=原因
 DiscountOfferedBy=授予人
-DiscountStillRemaining=Discounts available
-DiscountAlreadyCounted=Discounts already consumed
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+SupplierDiscounts=Vendors discounts
 BillAddress=账单地址
 HelpEscompte=这是给予客户优惠折扣，因为客户在付款条件日期前已经付清全款。
 HelpAbandonBadCustomer=这一数额已被放弃（客户说是一个坏的客户），并作为一个特殊的松散考虑。
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but
 PaymentNote=付款备注
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=每 %s 天
 FrequencyPer_m=每 %s 月
 FrequencyPer_y=每 %s 年
@@ -505,9 +511,14 @@ SituationAmount=Situation invoice amount(net)
 SituationDeduction=Situation subtraction
 ModifyAllLines=全部变更
 CreateNextSituationInvoice=Create next situation
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=S
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
 NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
@@ -532,3 +543,4 @@ AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/zh_CN/categories.lang b/htdocs/langs/zh_CN/categories.lang
index 366896bbaa7..6d2463ddc65 100644
--- a/htdocs/langs/zh_CN/categories.lang
+++ b/htdocs/langs/zh_CN/categories.lang
@@ -16,7 +16,7 @@ MembersCategoriesArea=会员标签/分类区
 ContactsCategoriesArea=联系人标签/分类信息区
 AccountsCategoriesArea=账户标签/分类区
 ProjectsCategoriesArea=项目标签/分类区
-SubCats=小类
+SubCats=Sub-categories
 CatList=标签/分类列表
 NewCategory=新建标签/分类
 ModifCat=变更标签/分类
@@ -85,3 +85,4 @@ CategorieRecursivHelp=如果启动，产品也将与父类的子类添加到
 AddProductServiceIntoCategory=添加下面的产品/服务
 ShowCategory=显示标签/分类
 ByDefaultInList=按默认列表
+ChooseCategory=Choose category
diff --git a/htdocs/langs/zh_CN/commercial.lang b/htdocs/langs/zh_CN/commercial.lang
index 37fce3b30b4..3c6915c5314 100644
--- a/htdocs/langs/zh_CN/commercial.lang
+++ b/htdocs/langs/zh_CN/commercial.lang
@@ -60,8 +60,8 @@ ActionAC_CLO=关闭
 ActionAC_EMAILING=发送群发电子邮件
 ActionAC_COM=通过邮件发送客户订单
 ActionAC_SHIP=发送发货单
-ActionAC_SUP_ORD=通过邮件发送采购订单
-ActionAC_SUP_INV=通过邮件发送供应商发票
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=其他
 ActionAC_OTH_AUTO=自动插入事件
 ActionAC_MANUAL=手动插入事件
diff --git a/htdocs/langs/zh_CN/companies.lang b/htdocs/langs/zh_CN/companies.lang
index 152ea33343c..ffa926a2207 100644
--- a/htdocs/langs/zh_CN/companies.lang
+++ b/htdocs/langs/zh_CN/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Are you sure you want to delete this contact and all inheri
 MenuNewThirdParty=新建合伙人
 MenuNewCustomer=新建客户
 MenuNewProspect=新建准客户
-MenuNewSupplier=新建供应商
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=新私营个体
-NewCompany=新建公司 (准客户,客户,供应商)
-NewThirdParty=新建合伙人 (准客户,客户,供应商)
-CreateDolibarrThirdPartySupplier=创建合伙人(供应商)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=创建合伙人
 CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=准客户区
@@ -37,7 +37,7 @@ ThirdPartyProspectsStats=准客户
 ThirdPartyCustomers=客户
 ThirdPartyCustomersStats=客户
 ThirdPartyCustomersWithIdProf12=与%s或%客户s
-ThirdPartySuppliers=供应商
+ThirdPartySuppliers=Vendors
 ThirdPartyType=合伙人类型
 Individual=私营个体
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
@@ -77,11 +77,11 @@ Web=网站
 Poste= 位置
 DefaultLang=默认语言
 VATIsUsed=Sales tax is used
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Sales tax is not used
 CopyAddressFromSoc=Fill address with third party address
-ThirdpartyNotCustomerNotSupplierSoNoRef=合伙人无论客户或供应商，都没有对象可参考
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=报价
 OverAllOrders=订单
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=RE 类型
 TypeLocaltax2ES=IRPF 类型
 WrongCustomerCode=客户代码无效
-WrongSupplierCode=供应商代码无效
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=客户代码模板
-SupplierCodeModel=供应商代码模板
+SupplierCodeModel=Vendor code model
 Gencod=条码
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
@@ -267,7 +267,7 @@ Prospect=准客户
 CustomerCard=客户信息
 Customer=客户
 CustomerRelativeDiscount=相对客户折扣
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=相对折扣
 CustomerAbsoluteDiscountShort=绝对优惠
 CompanyHasRelativeDiscount=这个客户有一个<b>%s的%%</b>的折扣
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this suppl
 CompanyHasNoAbsoluteDiscount=此客户没有提供贴息贷款
 CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
 CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=无
 Supplier=供应商
 AddContact=创建联系人
@@ -304,13 +304,13 @@ DeleteACompany=删除公司
 PersonalInformations=个人资料
 AccountancyCode=会计账户
 CustomerCode=客户代码
-SupplierCode=供应商代码
+SupplierCode=Vendor code
 CustomerCodeShort=客户代码
-SupplierCodeShort=供应商代码
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=客户代码，为所有客户提供唯一的客户代码值
-SupplierCodeDesc=供应商代码，所有供应商的代码均是唯一的
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=要求合伙人为客户或是准客户
-RequiredIfSupplier=要求合伙人为供应商
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=有效性控制模块
 ThisIsModuleRules=这是本单元的规则
 ProspectToContact=准客户到联系人
@@ -338,7 +338,7 @@ MyContacts=我的联系人
 Capital=注册资金
 CapitalOf=注册资金 %s
 EditCompany=编辑公司
-ThisUserIsNot=该用户不是准客户，也不是客户更不是供应商
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=支票
 VATIntraCheckDesc=<b>%s的</b>允许该链接要求欧盟增值税检查服务。从服务器的外部网络连接需要这项服务工作。
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -396,7 +396,7 @@ ImportDataset_company_4=Third parties/Sales representatives (Assign sales repres
 PriceLevel=价格级别
 DeliveryAddress=送货地址
 AddAddress=添加地址
-SupplierCategory=供应商分类
+SupplierCategory=Vendor category
 JuridicalStatus200=独立
 DeleteFile=删除文件
 ConfirmDeleteFile=你确定要删除这个文件？
@@ -406,7 +406,7 @@ FiscalYearInformation=会计年度信息
 FiscalMonthStart=会计年度初始月
 YouMustAssignUserMailFirst=您必须为此账户添加电子邮箱，首先可为他添加电子邮件通知功能。
 YouMustCreateContactFirst=能够添加电子邮件通知, 首先你必须填写合伙人的有效Email地址
-ListSuppliersShort=供应商列表
+ListSuppliersShort=List of vendors
 ListProspectsShort=准客户列表
 ListCustomersShort=客户列表
 ThirdPartiesArea=合伙人信息区
@@ -420,7 +420,7 @@ CurrentOutstandingBill=当前优质账单
 OutstandingBill=优质账单最大值
 OutstandingBillReached=已达到最大优质账单值
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=返回格式%syymm为客户代码以及%syymm -○○○○供应商代码其中YY是年numero，MM是月，nnnn是一个没有休息，没有为0返回序列。
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=客户/供应商代码是免费的。此代码可以随时修改。
 ManagingDirectors=公司高管(s)称呼 (CEO, 董事长, 总裁...)
 MergeOriginThirdparty=重复第三方(第三方要删除)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=销售代表登陆
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/zh_CN/compta.lang b/htdocs/langs/zh_CN/compta.lang
index 0062da8d52f..b08e2d42a63 100644
--- a/htdocs/langs/zh_CN/compta.lang
+++ b/htdocs/langs/zh_CN/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=净支出
 VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
-VATSummary=Tax Balance
+VATSummary=Tax monthly
+VATBalance=Tax Balance
 VATPaid=Tax paid
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=会计/库务区
 NewPayment=新建支付
 Payments=付款
 PaymentCustomerInvoice=客户发票付款
-PaymentSupplierInvoice=供应商发票付款
+PaymentSupplierInvoice=Vendor invoice payment
 PaymentSocialContribution=社会/财政税款
 PaymentVat=增值税纳税
 ListPayment=付款列表
 ListOfCustomerPayments=客户付款列表
-ListOfSupplierPayments=供应商付款的名单
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=起始日期时期
 DateEndPeriod=结束日期时期
 newLT1Payment=New tax 2 payment
@@ -110,7 +111,7 @@ ShowVatPayment=显示增值税纳税
 TotalToPay=共支付
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
 CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=客户账户代码
 SupplierAccountancyCodeShort=供应商账户代码
 AccountNumber=帐号
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=按合伙人 RE 报表
 LT2ReportByCustomersES=按合伙人IRPF的报表
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=每客户增值税征收和支付的报表
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Chart of accounts models
 Pcg_type=PCG类型
 Pcg_subtype=PCG子类型
 InvoiceLinesToDispatch=待分配的发票行
-ByProductsAndServices=通过产品和服务
+ByProductsAndServices=By product and service
 RefExt=外部编码
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
 LinkedOrder=链接到订单
@@ -215,7 +218,8 @@ Mode1=方法 1
 Mode2=方法 2
 CalculationRuleDesc=要计算增值税总额，有两种方法： <br>方法1是在每一行四舍五入，然后对它们求和。 <br>方法2是在总结增值税在每一行，然后四舍五入结果。 <br>最后的结果可能不同，从几毛钱。默认模式是：<b>%s</b> 。
 CalculationRuleDescSupplier=According to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=计算模式
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=复制 social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
@@ -242,3 +246,10 @@ FiscalPeriod=Accounting period
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/zh_CN/dict.lang b/htdocs/langs/zh_CN/dict.lang
index 9056e8341d6..bab583c41ff 100644
--- a/htdocs/langs/zh_CN/dict.lang
+++ b/htdocs/langs/zh_CN/dict.lang
@@ -5,7 +5,8 @@ CountryIT=意大利
 CountryES=西班牙
 CountryDE=德国
 CountryCH=瑞士
-CountryGB=大不列颠
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=英国
 CountryUK=英国
 CountryIE=爱尔兰
 CountryCN=中国
diff --git a/htdocs/langs/zh_CN/ecm.lang b/htdocs/langs/zh_CN/ecm.lang
index 39ebb056c29..df401ec6161 100644
--- a/htdocs/langs/zh_CN/ecm.lang
+++ b/htdocs/langs/zh_CN/ecm.lang
@@ -39,9 +39,10 @@ ShowECMSection=显示目录
 DeleteSection=删除目录
 ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
 ECMDirectoryForFiles=相对目录的文件
-CannotRemoveDirectoryContainsFiles=删除不可能的，因为它包含了一些文件
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=档案管理员
-ECMSelectASection=请在左侧目录树中选取目录...
+ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
diff --git a/htdocs/langs/zh_CN/errors.lang b/htdocs/langs/zh_CN/errors.lang
index 1df6a6feb47..80b8871fd69 100644
--- a/htdocs/langs/zh_CN/errors.lang
+++ b/htdocs/langs/zh_CN/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=需要条形码
 ErrorCustomerCodeAlreadyUsed=客户代码已被使用
 ErrorBarCodeAlreadyUsed=条码已存在且已使用
 ErrorPrefixRequired=前缀要求
-ErrorBadSupplierCodeSyntax=错误的供应商代码
-ErrorSupplierCodeRequired=要求供应商代码
-ErrorSupplierCodeAlreadyUsed=供应商代码已被使用
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=错误的参数
 ErrorBadValueForParameter=错误值 '%s' 参数 '%s'
 ErrorBadImageFormat=图片格式不支持(你的PHP不支持图片格式转换功能)
@@ -87,7 +87,7 @@ ErrorsOnXLines=<b>%</b>误差<b>的</b>源上线
 ErrorFileIsInfectedWithAVirus=防病毒程序无法验证文件（文件可能被病毒感染）
 ErrorSpecialCharNotAllowedForField=特殊字符不为外地允许“%s的”
 ErrorNumRefModel=存在一个引用（%s）和编号是不符合本规则兼容到数据库。记录中删除或重命名参考激活此模块。
-ErrorQtyTooLowForThisSupplier=数量过低，供应商或供应商在这此产品没有价格定义
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=模块设置看起来未完成设置。请到 主页->设置->模块菜单 完成模块的设置。
 ErrorBadMask=在面具的错误
 ErrorBadMaskFailedToLocatePosOfSequence=没有序列号错误，面具
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
-ErrorSupplierCountryIsNotDefined=此供应商国是没有定义。正确的这第一。
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=两条记录合并失败。请求已取消。
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
diff --git a/htdocs/langs/zh_CN/install.lang b/htdocs/langs/zh_CN/install.lang
index 873de199770..acb42845d19 100644
--- a/htdocs/langs/zh_CN/install.lang
+++ b/htdocs/langs/zh_CN/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=配置文件<b>%s</b>不存在并且
 ConfFileCouldBeCreated=已创建好 <b>%s</b> 配置文件。
 ConfFileIsNotWritable=配置文件 <b>%s</b> 没有写权限。烦请再次检查权限设置。首次安装时，Web服务器必须设置该配置文件为可写权限 (例如Unix系统中需要用"chmod 666"命令来赋予权限)。
 ConfFileIsWritable=配置文件 <b>%s</b> 为可写权限。
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=从新的配置文件中加载全部信息。
 PHPSupportSessions=PHP多线程支持。
 PHPSupportPOSTGETOk=PHP的POST和GET支持。
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
 WarningRemoveInstallDir=温馨提示，出于安全考量，安装或升级完成后你应删除<b>安装目录<b>或重命名为 <b>install.lock</b> ，以避免被他人恶意利用重装Dolibarr。
 FunctionNotAvailableInThisPHP=此服务器上的PHP不支持
 ChoosedMigrateScript=选择迁移脚本
-DataMigration=数据迁移
-DatabaseMigration=结构数据库迁移
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=脚本处理
 ChooseYourSetupMode=选择你的安装模式，然后点击“开始”...
 FreshInstall=全新安装
@@ -146,7 +147,7 @@ NothingToDo=Nothing to do
 # upgrade
 MigrationFixData=修正了非规范化数据
 MigrationOrder=数据迁移的客户订单
-MigrationSupplierOrder=数据迁移对供应商订单
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=数据迁移的商业报价
 MigrationInvoice=数据迁移的客户发票
 MigrationContract=数据迁移合同
@@ -196,6 +197,8 @@ MigrationEvents=迁移事件数据：将事件所有者数据添加到任务列
 MigrationEventsContact=Migration of events to add event contact into assignement table
 MigrationRemiseEntity=更新 llx_societe_remise 的实际栏位参数值
 MigrationRemiseExceptEntity=更新 llx_societe_remise_except 的实际栏位参数值
+MigrationUserRightsEntity=Update entity field value of llx_user_rights
+MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
 MigrationReloadModule=重载模块%s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 ShowNotAvailableOptions=显示不可用的选项
diff --git a/htdocs/langs/zh_CN/ldap.lang b/htdocs/langs/zh_CN/ldap.lang
index c1f3678b1b9..0e344352314 100644
--- a/htdocs/langs/zh_CN/ldap.lang
+++ b/htdocs/langs/zh_CN/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=密码域
 YouMustChangePassNextLogon=<b>%</b>用户密码<b>%之S</b>必须改变对域。
 UserMustChangePassNextLogon=用户必须更改密码的域%s
 LDAPInformationsForThisContact=在此LDAP数据库信息联系
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Member type synchronized
 ContactSynchronized=同步联系人
 ForceSynchronize=力同步Dolibarr - &gt;的LDAP
 ErrorFailedToReadLDAP=无法读取LDAP数据库。检查的LDAP模块设置和数据库获取。
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/zh_CN/loan.lang b/htdocs/langs/zh_CN/loan.lang
index e71195d1390..823169c28ea 100644
--- a/htdocs/langs/zh_CN/loan.lang
+++ b/htdocs/langs/zh_CN/loan.lang
@@ -10,6 +10,7 @@ LoanCapital=注册资金
 Insurance=保险
 Interest=利率
 Nbterms=一些条款
+Term=Term
 LoanAccountancyCapitalCode=Accounting account capital
 LoanAccountancyInsuranceCode=Accounting account insurance
 LoanAccountancyInterestCode=Accounting account interest
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=确认删除本贷款
 LoanDeleted=成功删除贷款
 ConfirmPayLoan=确认支付本贷款
 LoanPaid=贷款已支付
-# Calc
-LoanCalc=银行贷款计算器
-PurchaseFinanceInfo=购买及财务信息
-SalePriceOfAsset=资产出售价格
-PercentageDown=贬值比率
-LengthOfMortgage=贷款期限
-AnnualInterestRate=年度利率
-ExplainCalculations=解释计算方式
-ShowMeCalculationsAndAmortization=显示计算结果及分期摊销
-MortgagePaymentInformation=抵押付款信息
-DownPayment=定金
-DownPaymentDesc=这个 <b>预付订金</b>（注：订金，根据中国现行法律的有关规定，其不具有定金，不是订金哦，其不具有定金的性质，只是单方行为，不具有明显的担保性质。交付订金的一方主张定金权利的，人民法院不予支持。 = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)这句数学没学好不译了：）
-InterestRateDesc=<b>利率</b> = 按百分比显示的年度利率
-MonthlyFactorDesc=<b>月度因子</b> = 下列公式的结果
-MonthlyInterestRateDesc=<b>月度利率</b> = 年度利率除以12（按每年12个月计算）
-MonthTermDesc=贷款按每月计算的 <b>月限</b> =您借款年限乘以12
-MonthlyPaymentDesc=月度付款按以下公式计算
-AmortizationPaymentDesc= <a href="#摊销">摊销</a> 确定您每月支付的银行利息是多少，而本金又是多少。
-AmountFinanced=财务金额
-AmortizationMonthlyPaymentOverYears=月度付款的摊销：: <b>%s</b> 按 %s 年计算
-Totalsforyear=年度合计
-MonthlyPayment=月度付款
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
-GoToInterest=%s 将指向利率
-GoToPrincipal=%s 将指向注册资金
-YouWillSpend=你将花费 %s 年 %s
 ListLoanAssociatedProject=List of loan associated with the project
 AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=利率
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=货款模块设置
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-FinancialCommitment=Financial commitment
 CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/langs/zh_CN/mails.lang b/htdocs/langs/zh_CN/mails.lang
index 3a2361fb308..ab268c6d0de 100644
--- a/htdocs/langs/zh_CN/mails.lang
+++ b/htdocs/langs/zh_CN/mails.lang
@@ -11,7 +11,9 @@ MailFrom=寄件者
 MailErrorsTo=Errors to
 MailReply=回复
 MailTo=收件者(s)
+MailToUsers=To user(s)
 MailCC=抄送
+MailToCCUsers=Copy to users(s)
 MailCCC=缓存副本
 MailTopic=主题
 MailText=内容
@@ -164,4 +166,4 @@ InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=信息
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang
index 408def9d9bb..a2dd2fb65af 100644
--- a/htdocs/langs/zh_CN/main.lang
+++ b/htdocs/langs/zh_CN/main.lang
@@ -92,6 +92,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is se
 Administrator=管理员
 Undefined=未定义
 PasswordForgotten=忘记密码？
+NoAccount=No account?
 SeeAbove=见上文
 HomeArea=首页信息状态区
 LastConnexion=最后上线时间
@@ -402,6 +403,7 @@ DefaultTaxRate=Default tax rate
 Average=平均
 Sum=总和
 Delta=增量
+RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=选项
@@ -414,7 +416,7 @@ Favorite=收藏夹
 ShortInfo=信息
 Ref=编号
 ExternalRef=外部编号
-RefSupplier=供应商编号
+RefSupplier=Ref. vendor
 RefPayment=付款编号
 CommercialProposalsShort=报价单
 Comment=说明
@@ -493,7 +495,7 @@ Received=已收
 Paid=已支付
 Topic=主题
 ByCompanies=由合伙人
-ByUsers=通过用户
+ByUsers=By user
 Links=链接
 Link=链接
 Rejects=拒绝
@@ -619,9 +621,9 @@ BuildDoc=生成Doc文件
 Entity=实体
 Entities=实体
 CustomerPreview=客户预览
-SupplierPreview=供应商预览
+SupplierPreview=Vendor preview
 ShowCustomerPreview=显示客户预览
-ShowSupplierPreview=显示供应商预览
+ShowSupplierPreview=Show vendor preview
 RefCustomer=客户编号
 Currency=货币
 InfoAdmin=信息管理员
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=产品或服务
 SearchIntoProjects=项目
 SearchIntoTasks=任务
 SearchIntoCustomerInvoices=客户发票
-SearchIntoSupplierInvoices=供应商发票
+SearchIntoSupplierInvoices=Vendor invoices
 SearchIntoCustomerOrders=客户订单
-SearchIntoSupplierOrders=供应商订单
+SearchIntoSupplierOrders=Purchase orders
 SearchIntoCustomerProposals=客户报价
-SearchIntoSupplierProposals=供应商报价
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=干预
 SearchIntoContracts=合同
 SearchIntoCustomerShipments=客户运输
@@ -941,3 +943,5 @@ Remote=Remote
 LocalAndRemote=Local and Remote
 KeyboardShortcut=Keyboard shortcut
 AssignedTo=分配给
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/zh_CN/margins.lang b/htdocs/langs/zh_CN/margins.lang
index 46f38d29bf1..29da0d1f5b6 100644
--- a/htdocs/langs/zh_CN/margins.lang
+++ b/htdocs/langs/zh_CN/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=作为服务
 UseDiscountOnTotal=在小计
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
 MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=供应商最高价
+MargeType1=Margin on Best vendor price
 MargeType2=加权平均价差 (WAP)
 MargeType3=成本价格保证金
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=成本价
 UnitCharges=费用单位
 Charges=费用
diff --git a/htdocs/langs/zh_CN/members.lang b/htdocs/langs/zh_CN/members.lang
index a8b551ae323..52119219ec7 100644
--- a/htdocs/langs/zh_CN/members.lang
+++ b/htdocs/langs/zh_CN/members.lang
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
diff --git a/htdocs/langs/zh_CN/opensurvey.lang b/htdocs/langs/zh_CN/opensurvey.lang
index 820896d0e8d..d65fa009d15 100644
--- a/htdocs/langs/zh_CN/opensurvey.lang
+++ b/htdocs/langs/zh_CN/opensurvey.lang
@@ -58,3 +58,4 @@ MoreChoices=Enter more choices for the voters
 SurveyExpiredInfo=The poll has been closed or voting delay has expired.
 EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
 ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/zh_CN/orders.lang b/htdocs/langs/zh_CN/orders.lang
index e042df91ac1..7ee5500dce9 100644
--- a/htdocs/langs/zh_CN/orders.lang
+++ b/htdocs/langs/zh_CN/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=客户订单区
-SuppliersOrdersArea=供应商订单区
+SuppliersOrdersArea=Purchase orders area
 OrderCard=订单信息
 OrderId=订单编号
 Order=订单
@@ -13,9 +13,9 @@ OrderToProcess=待处理订单
 NewOrder=新订单
 ToOrder=订单填写
 MakeOrder=订单填写
-SupplierOrder=供应商订单
-SuppliersOrders=供应商订单
-SuppliersOrdersRunning=当前供应商订单
+SupplierOrder=Purchase order
+SuppliersOrders=Purchase orders
+SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=客户订单
 CustomersOrders=客户订单
 CustomersOrdersRunning=当前客户订单
@@ -24,7 +24,7 @@ OrdersDeliveredToBill=Customer orders delivered to bill
 OrdersToBill=客户订单交期
 OrdersInProcess=待处理客户订单
 OrdersToProcess=待处理客户订单
-SuppliersOrdersToProcess=供应商订单处理
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=已取消
 StatusOrderDraftShort=草稿
 StatusOrderValidatedShort=已验证
@@ -75,15 +75,15 @@ ShowOrder=显示订单
 OrdersOpened=处理订单
 NoDraftOrders=没有订单草稿
 NoOrder=空空如也——没有订单
-NoSupplierOrder=空空如也——没有供应商订单
+NoSupplierOrder=No purchase order
 LastOrders=最新 %s 客户订单
 LastCustomerOrders=最新 %s 客户订单
-LastSupplierOrders=最近的 %s 份供应商订单
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=最近变更的 %s 份订单
 AllOrders=所有的订单
 NbOfOrders=订单号码
 OrdersStatistics=订单统计
-OrdersStatisticsSuppliers=供应商订单统计
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=按月份订单数
 AmountOfOrdersByMonthHT=每月订单金额(税后)
 ListOfOrders=订单列表
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</
 GenerateBill=生成发票
 ClassifyShipped=归类"已交付"
 DraftOrders=订单草稿
-DraftSuppliersOrders=供应商订单草稿
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=处理中订单
 RefOrder=订单编号
 RefCustomerOrder=客户订单编号
-RefOrderSupplier=供应商订单编号
-RefOrderSupplierShort=Ref. order supplier
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=通过邮件发送订单
 ActionsOnOrder=订单上的事件
 NoArticleOfTypeProduct=任何类型的产品文章'，以便对这一秩序shippable文章
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
 DispatchSupplierOrder=接收供应商订单 %s
 FirstApprovalAlreadyDone=审批已完成
 SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=供应商订单 %s 接收 %s
-SupplierOrderSubmitedInDolibarr=供应商订单 %s 提交
-SupplierOrderClassifiedBilled=Supplier order %s set billed
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=其他订单
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=代表跟进客户订单
@@ -125,11 +125,11 @@ 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_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=送货跟进
-TypeContact_order_supplier_external_BILLING=供应商发票联系人
-TypeContact_order_supplier_external_SHIPPING=供应商送货联系人
-TypeContact_order_supplier_external_CUSTOMER=供应商跟进订单联系人
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=常量COMMANDE_SUPPLIER_ADDON没有定义
 Error_COMMANDE_ADDON_NotDefined=常量COMMANDE_ADDON没有定义
 Error_OrderNotChecked=选定发票中没有订单
diff --git a/htdocs/langs/zh_CN/other.lang b/htdocs/langs/zh_CN/other.lang
index c5090dd8387..7391216e7e3 100644
--- a/htdocs/langs/zh_CN/other.lang
+++ b/htdocs/langs/zh_CN/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=文件过大
 PleaseBePatient=请耐心等待...
 NewPassword=New password
 ResetPassword=Reset password
-RequestToResetPasswordReceived=已收到你的Dolibarr密码修改申请
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=你的新登陆码如上
 NewKeyWillBe=你的新登陆码将会是
 ClickHereToGoTo=点击这里 %s
@@ -233,6 +233,8 @@ PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=导出区
 AvailableFormats=可用的格式
diff --git a/htdocs/langs/zh_CN/productbatch.lang b/htdocs/langs/zh_CN/productbatch.lang
index e293e67b49d..fccb54d3730 100644
--- a/htdocs/langs/zh_CN/productbatch.lang
+++ b/htdocs/langs/zh_CN/productbatch.lang
@@ -16,7 +16,7 @@ printEatby=食用日期: %s
 printSellby=销售日期: %s
 printQty=数量: %d
 AddDispatchBatchLine=添加一个用于货架寿命调度
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic increase/decrease stock mode is forced to shipping validate and manual dispatching for reception and can't be edited. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=此产品不使用批号/序列号
 ProductLotSetup=Setup of module lot/serial
 ShowCurrentStockOfLot=Show current stock for couple product/lot
diff --git a/htdocs/langs/zh_CN/products.lang b/htdocs/langs/zh_CN/products.lang
index f5c0347d047..6a01c03693d 100644
--- a/htdocs/langs/zh_CN/products.lang
+++ b/htdocs/langs/zh_CN/products.lang
@@ -70,6 +70,7 @@ SoldAmount=销售总额
 PurchasedAmount=采购总额
 NewPrice=新增价格
 MinPrice=最低销售价
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=售价不能低于此产品的最低价格 (%s 税前)。此消息也可能在您输入折扣巨大时出现
 ContractStatusClosed=已禁用
 ErrorProductAlreadyExists=编号为 %s 的产品已存在。
@@ -155,7 +156,7 @@ BuyingPrices=买价
 CustomerPrices=客户价格
 SuppliersPrices=供应商价格
 SuppliersPricesOfProductsOrServices=供应商价格(产品或服务)
-CustomCode=Customs/Commodity/HS code
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=产地国
 Nature=属性
 ShortLabel=标签别名
diff --git a/htdocs/langs/zh_CN/projects.lang b/htdocs/langs/zh_CN/projects.lang
index d36f70f7bb7..eec25ad997f 100644
--- a/htdocs/langs/zh_CN/projects.lang
+++ b/htdocs/langs/zh_CN/projects.lang
@@ -77,6 +77,7 @@ Time=时间
 ListOfTasks=任务列表
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=任务列表
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=项目相关的商业报价列表
 ListOrdersAssociatedProject=List of customer orders associated with the project
@@ -226,4 +227,4 @@ AllowCommentOnProject=Allow user comments on projects
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/zh_CN/stocks.lang b/htdocs/langs/zh_CN/stocks.lang
index 6d0b194265b..becb2074736 100644
--- a/htdocs/langs/zh_CN/stocks.lang
+++ b/htdocs/langs/zh_CN/stocks.lang
@@ -203,3 +203,4 @@ RegulateStock=Regulate Stock
 ListInventory=名单
 StockSupportServices=Stock management support services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/zh_CN/stripe.lang b/htdocs/langs/zh_CN/stripe.lang
index 2809d73f9e6..0f0247fdfbe 100644
--- a/htdocs/langs/zh_CN/stripe.lang
+++ b/htdocs/langs/zh_CN/stripe.lang
@@ -58,8 +58,8 @@ NameOnCard=Name on card
 CardNumber=Card Number
 ExpiryDate=Expiry Date
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/zh_CN/supplier_proposal.lang b/htdocs/langs/zh_CN/supplier_proposal.lang
index 5599fa751ed..dad1e3f4b1e 100644
--- a/htdocs/langs/zh_CN/supplier_proposal.lang
+++ b/htdocs/langs/zh_CN/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=供应商商业报价
-supplier_proposalDESC=管理供应商询价申请
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
 SupplierProposalNew=新建询价申请
 CommRequest=询价申请
 CommRequests=询价申请
 SearchRequest=搜索申请
 DraftRequests=草稿
-SupplierProposalsDraft=供应商报价草稿
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=最近变更的 %s 份询价申请
 RequestsOpened=打开询价申请
-SupplierProposalArea=供应商报价区
-SupplierProposalShort=供应商报价
-SupplierProposals=供应商报价
-SupplierProposalsShort=供应商报价
+SupplierProposalArea=Vendor proposals area
+SupplierProposalShort=Vendor proposal
+SupplierProposals=Vendor proposals
+SupplierProposalsShort=Vendor proposals
 NewAskPrice=新建询价申请
 ShowSupplierProposal=显示询价申请
 AddSupplierProposal=创建询价申请
-SupplierProposalRefFourn=供应商编号
+SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=交货日期
 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>?
@@ -47,9 +47,9 @@ CommercialAsk=询价申请
 DefaultModelSupplierProposalCreate=设置默认模板
 DefaultModelSupplierProposalToBill=当关闭询价申请时的默认模板 (接受)
 DefaultModelSupplierProposalClosed=当关闭询价申请时的默认模板 (拒绝)
-ListOfSupplierProposals=供应商报价需求列表
-ListSupplierProposalsAssociatedProject=供应商报价与项目列表
-SupplierProposalsToClose=供应商无效报价
-SupplierProposalsToProcess=处理供应商报价
+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=全部申请
diff --git a/htdocs/langs/zh_CN/suppliers.lang b/htdocs/langs/zh_CN/suppliers.lang
index 04f56c4ed84..5aa256c3c48 100644
--- a/htdocs/langs/zh_CN/suppliers.lang
+++ b/htdocs/langs/zh_CN/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=供应商
-SuppliersInvoice=供应商发票
-ShowSupplierInvoice=显示供应商发票
-NewSupplier=新供应商
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=历史
-ListOfSuppliers=供应商列表
-ShowSupplier=查看供应商
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=订购日期
 BuyingPriceMin=最优采购价
 BuyingPriceMinShort=最优采购价
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=子产品销售价格合计
 SomeSubProductHaveNoPrices=某些副产品没有定义价格
 AddSupplierPrice=添加采购价
 ChangeSupplierPrice=更改采购价
-SupplierPrices=供应商价格
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=该参考供应商已经与一参考：%s的
-NoRecordedSuppliers=空空如也——没有供应商记录
-SupplierPayment=供应商付款
-SuppliersArea=供应商区
-RefSupplierShort=供应商编号
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=可用性
-ExportDataset_fournisseur_1=供应商发票清单和发票的路线
-ExportDataset_fournisseur_2=供应商发票和付款
-ExportDataset_fournisseur_3=供应商订单和订单行
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=批准这一命令
 ConfirmApproveThisOrder=是否确定要批准此订单 <b>%s</b> ?
 DenyingThisOrder=否认这笔订单
 ConfirmDenyingThisOrder=是否确定要拒绝此订单 <b>%s</b>？
 ConfirmCancelThisOrder=是否确定要取消此订单 <b>%s</b>？
-AddSupplierOrder=创建供应商订单
-AddSupplierInvoice=创建供应商发票
-ListOfSupplierProductForSupplier=产品和供应商价格列表 <b>%s</b>
-SentToSuppliers=发送到供应商
-ListOfSupplierOrders=供应商订单列表
-MenuOrdersSupplierToBill=供应商订单发票
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=交货延迟天数
 DescNbDaysToDelivery=此订单产品的最长交货延迟
-SupplierReputation=供应商信誉
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=不订购
 NotTheGoodQualitySupplier=劣质
 ReputationForThisProduct=信誉
 BuyerName=买家名称
 AllProductServicePrices=全部 产品/服务 价格
 AllProductReferencesOfSupplier=供应商的所有 产品/服务 参考
-BuyingPriceNumShort=供应商价格
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/zh_CN/website.lang b/htdocs/langs/zh_CN/website.lang
index beca972780b..6fb270ee4f0 100644
--- a/htdocs/langs/zh_CN/website.lang
+++ b/htdocs/langs/zh_CN/website.lang
@@ -73,7 +73,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
diff --git a/htdocs/langs/zh_CN/workflow.lang b/htdocs/langs/zh_CN/workflow.lang
index 5cde16c93c5..2aa7123b2ff 100644
--- a/htdocs/langs/zh_CN/workflow.lang
+++ b/htdocs/langs/zh_CN/workflow.lang
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=当客户账单被确认时，
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=当客户账单设定为支付时，将关联源客户订单分类为账单（如果账单金额与关联订单总额相同）
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=将关联源客户订单分类为发货时进行验证 (如果所有装运的货物数量与更新的订单相同)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=对供应商发票进行验证时关联的源供应商方案进行分类 (如果发票金额与关联的方案总金额相同)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=在验证供应商发票时对关联的源供应商订单进行分类（如果发票金额与关联的订单总金额相同）
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=自动创建
 AutomaticClassification=自动分类
diff --git a/htdocs/langs/zh_TW/accountancy.lang b/htdocs/langs/zh_TW/accountancy.lang
index c013c65bd55..df4506f6ea6 100644
--- a/htdocs/langs/zh_TW/accountancy.lang
+++ b/htdocs/langs/zh_TW/accountancy.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - en_US - Accounting Expert
+Accounting=Accounting
 ACCOUNTING_EXPORT_SEPARATORCSV=匯出檔案的欄位分隔字元
 ACCOUNTING_EXPORT_DATE=匯出檔案日期格式
 ACCOUNTING_EXPORT_PIECE=匯出數量
@@ -39,11 +40,11 @@ AccountWithNonZeroValues=非零值的會計項目
 ListOfAccounts=會計項目清單
 
 MainAccountForCustomersNotDefined=設定中客戶的主要會計項目未定義
-MainAccountForSuppliersNotDefined=設定中供應商的主要會計項目未定義
+MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
 MainAccountForUsersNotDefined=設定中用戶的主要會計項目未定義
 MainAccountForVatPaymentNotDefined=設定中營業稅的應繳金額的主要會計項目未定義
 
-AccountancyArea=會計區
+AccountancyArea=Accounting area
 AccountancyAreaDescIntro=使用會計模組需要以下步驟：
 AccountancyAreaDescActionOnce=接下來的動作通常只做一次或一年做一次…
 AccountancyAreaDescActionOnceBis=下一步驟為當製作日記簿(記錄到日記帳簿及總分類帳)時，建議由預設會計項目以節省您的時間。
@@ -89,7 +90,7 @@ MenuProductsAccounts=產品會計項目
 ProductsBinding=產品會計項目
 Ventilation=關聯到各式會計項目
 CustomersVentilation=客戶發票的關聯
-SuppliersVentilation=供應商發票的關聯
+SuppliersVentilation=Vendor invoice binding
 ExpenseReportsVentilation=費用報表的關聯
 CreateMvts=建立新的交易
 UpdateMvts=交易的修改
@@ -97,7 +98,7 @@ ValidTransaction=驗證交易
 WriteBookKeeping=在總帳中記錄交易
 Bookkeeping=總帳
 AccountBalance=項目餘額
-ObjectsRef=Source object ref
+ObjectsRef=參考的來源物件
 CAHTF=稅前總採購供應商
 TotalExpenseReport=總費用報表
 InvoiceLines=關聯的各式發票
@@ -136,6 +137,7 @@ ACCOUNTING_PURCHASE_JOURNAL=進貨簿
 ACCOUNTING_MISCELLANEOUS_JOURNAL=其他日記簿
 ACCOUNTING_EXPENSEREPORT_JOURNAL=費用日記簿
 ACCOUNTING_SOCIAL_JOURNAL=交際/社交會計項目
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=過帳的會計項目
 ACCOUNTING_ACCOUNT_SUSPENSE=等待的會計項目
@@ -185,11 +187,12 @@ ListeMvts=移動清單
 ErrorDebitCredit=借方金額不等貸方金額
 AddCompteFromBK=新增各式會計項目到大類
 ReportThirdParty=合作方會計項目清單
-DescThirdPartyReport=在此查閱合作方中客戶及供應商名單及其的各式會計項目
+DescThirdPartyReport=Consult here the list of the third party customers and vendors and their accounting accounts
 ListAccounts=各式會計項目清單
 UnknownAccountForThirdparty=未知合作方會計項目。我們將使用%s
 UnknownAccountForThirdpartyBlocking=未知合作方會計項目。阻止錯誤
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=未知合作方會計項目及等待會計項目未定義。阻止錯誤
+PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
 Pcgtype=會計項目大類
 Pcgsubtype=會計項目中類
@@ -204,8 +207,8 @@ DescVentilDoneCustomer=在此查閱已開立各式發票客戶的清單及其產
 DescVentilTodoCustomer=關聯發票沒有關聯到產品會計項目
 ChangeAccount=用以下會計項目變更產品/服務的會計項目：
 Vide=-
-DescVentilSupplier=在此查閱供應商發票關聯或未關聯到產品會計項目的清單
-DescVentilDoneSupplier=在此查閱已開立發票供應商的清單及其會計項目
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices vendors and their accounting account
 DescVentilTodoExpenseReport=關聯費用報表行數還沒準備好要關聯費用會計項目
 DescVentilExpenseReport=在此查閱費用報表行數是否關聯到費用會計項目的清單
 DescVentilExpenseReportMore=若您在費用報表行數的類別設定會計項目，只要按一鍵<strong>"%s"</strong>，程式將會在您費用報表行及會計項目表的會計項目中進行關聯。若在費用目錄中會計項目未設定，或您仍有某些行數沒有關聯到任何會計項目，您要在選單 "<strong>%s</strong>" 中人工進行關聯。
@@ -215,7 +218,7 @@ ValidateHistory=自動地關聯
 AutomaticBindingDone=自動關聯已完成
 
 ErrorAccountancyCodeIsAlreadyUse=錯誤，您不能刪除此會計項目，因為已使用
-MvtNotCorrectlyBalanced=移動後借貸不平 。借方 = 1%s , 貸方 = 1%s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=關聯中卡片
 GeneralLedgerIsWritten=交易已紀錄到總帳中
 GeneralLedgerSomeRecordWasNotRecorded=某些交易未記錄。若沒有其他錯誤，這可能是因為已被記錄。
@@ -234,15 +237,15 @@ AccountingJournal=會計日記簿
 NewAccountingJournal=新會計日記簿
 ShowAccoutingJournal=顯示會計日記簿
 Nature=性質
-AccountingJournalType1=Miscellaneous operations
+AccountingJournalType1=雜項操作
 AccountingJournalType2=各式銷貨
 AccountingJournalType3=各式採購
 AccountingJournalType4=銀行
 AccountingJournalType5=費用報表
-AccountingJournalType8=Inventory
-AccountingJournalType9=Has-new
+AccountingJournalType8=庫存
+AccountingJournalType9=擁有-全新
 ErrorAccountingJournalIsAlreadyUse=此日記簿已使用
-AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
+AccountingAccountForSalesTaxAreDefinedInto=注意：銷項稅額的會計項目定義到選單 <b>%s</b> - <b>%s</b>
 
 ## Export
 ExportDraftJournal=匯出日記簿草稿
@@ -293,4 +296,9 @@ Binded=關聯行數
 ToBind=關聯行
 UseMenuToSetBindindManualy=不能自動檢測，使用選單 <a href="%s">%s</a> 用人工方式關聯
 
+## Import
+ImportAccountingEntries=Accounting entries
+
 WarningReportNotReliable=警告，此報表非依總帳製作的，所以不含總帳中人工修改的交易。若您日記簿是最新的日期，則記帳檢視會比較準確。
+ExpenseReportJournal=Expense Report Journal
+InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
index 738c1ef929b..3c91dad953e 100644
--- a/htdocs/langs/zh_TW/admin.lang
+++ b/htdocs/langs/zh_TW/admin.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - admin
 Foundation=基金會
 Version=版本
-Publisher=Publisher
+Publisher=發佈者
 VersionProgram=版本計劃
 VersionLastInstall=初始安裝版
 VersionLastUpgrade=升級最新版本
@@ -37,11 +37,11 @@ UnlockNewSessions=移除連線鎖定
 YourSession=您的連線階段
 Sessions=用戶連線階段
 WebUserGroup=網頁伺服器的用戶/組
-NoSessionFound=您的 PHP 似乎不容許列出啟動的連線。用於保存連線<b>（%s）</b>檔案目錄的可能受到保護（例如，由作業系統的權限，或由 PHP 指令的 open_basedir）。
+NoSessionFound=您的 PHP 似乎不容許列出啟動的連線。用於保存連線<b>（%s）</b>資料夾的可能受到保護（例如，由作業系統的權限，或由 PHP 指令的 open_basedir）。
 DBStoringCharset=儲存資料的資料庫字集
 DBSortingCharset=資料排序以資料庫字集
 ClientCharset=客戶端字集
-ClientSortingCharset=Client collation
+ClientSortingCharset=客戶端整理
 WarningModuleNotActive=模組<b>%s</b>必須啓用
 WarningOnlyPermissionOfActivatedModules=在此顯示已啓動模組之相關權限。你可在 首頁 -> 設定 -> 模組頁上啓動其他模組。
 DolibarrSetup=Dolibarr 安裝或昇級
@@ -53,7 +53,7 @@ GUISetup=顯示設定
 SetupArea=設定區
 UploadNewTemplate=上傳新的範例
 FormToTestFileUploadForm=上傳測試檔案(根據設定)
-IfModuleEnabled=註：若模組<b>%s</b>是啓動時，「是的」有效。
+IfModuleEnabled=註：若模組<b>%s</b>是啓用時，「是的」有效。
 RemoveLock=若此檔案存在允許昇級工具移除<b>%s</b>檔案。
 RestoreLock=回存檔案 <b>%s</b> ，僅有唯讀權限，並關閉任何昇級工具。
 SecuritySetup=安全設定
@@ -61,13 +61,13 @@ SecurityFilesDesc=在此定義上傳檔案相關的安全設定。
 ErrorModuleRequirePHPVersion=錯誤，這個模組需要的PHP版本是 %s 或更高版本
 ErrorModuleRequireDolibarrVersion=錯誤，這個模組需要 Dolibarr 版本 %s 或更高版本
 ErrorDecimalLargerThanAreForbidden=錯誤，高度精密的 <b> %s </b>不支援。
-DictionarySetup=目錄設定
-Dictionary=目錄
+DictionarySetup=詞典設定
+Dictionary=各式詞典
 ErrorReservedTypeSystemSystemAuto='system' 及 'systemauto' 為保留值。你可使用 'user' 值加到您自己的紀錄中。
 ErrorCodeCantContainZero=不含 0 值
 DisableJavascript=不啓動 JavaScript and Ajax 功能 (建議盲人或是文字型瀏覽器使用)
-UseSearchToSelectCompanyTooltip=另外，你若有大量合作方 (> 100 000), 您可在'設定 -> 其他'設定常數 COMPANY_DONOTSEARCH_ANYWHERE 為 1 增加速度。尋找將會限制在字串的開頭。
-UseSearchToSelectContactTooltip=另外，你若有大量合作方 (> 100 000), 您可在'設定 -> 其他'設定常數 CONTACT_DONOTSEARCH_ANYWHERE 為 1 增加速度。尋找將會限制在字串的開頭。
+UseSearchToSelectCompanyTooltip=另外您若有大量合作方 (> 100,000), 您可在 "設定 -> 其他" 設定常數 COMPANY_DONOTSEARCH_ANYWHERE 為 1 增加速度。蒐尋則只限在字串的開頭。
+UseSearchToSelectContactTooltip=另外您若有大量合作方 (> 100,000), 您可在 " 設定 -> 其他" 中設定常數 CONTACT_DONOTSEARCH_ANYWHERE 為 1 以增加速度。蒐尋則只限在字串的開頭。
 DelaiedFullListToSelectCompany=等你在載入合作方組合列表的內容之前按下一個鍵 (如果你有大量的合作方這可增加效能，不過會減少便利)
 DelaiedFullListToSelectContact=等你在載入第三方組合列表的內容之前按下一個鍵 (如果你有大量的第三方程式這可增加效能，不過會減少便利)
 NumberOfKeyToSearch=需要 %s 個字元進行搜尋
@@ -80,7 +80,7 @@ PreviewNotAvailable=無法預覽
 ThemeCurrentlyActive=目前可用的主題
 CurrentTimeZone=PHP (服務器) 的時區
 MySQLTimeZone=MySql (資料庫) 的時區
-TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
+TZHasNoEffect=資料庫伺服器內已儲存及返回值的日期，就像他保存為傳送的字串一樣。當使用 UNIX_TIMESTAMP 功能(此不是由 Dolibarr 使用，所以資料庫時區是無效的，就算是已輸入資料已變更也是)時，時區是有效的。
 Space=空間
 Table=表格
 Fields=欄位
@@ -89,8 +89,8 @@ Mask=遮罩
 NextValue=下一個值
 NextValueForInvoices=下一個值(發票號)
 NextValueForCreditNotes=下一個值(貸方通知單號)
-NextValueForDeposit=Next value (down payment)
-NextValueForReplacements=Next value (replacements)
+NextValueForDeposit=下一個值 (預付款)
+NextValueForReplacements=下一個值(代替)
 MustBeLowerThanPHPLimit=註：你的 PHP 限制每個上傳檔案的大小為<b>%s%s</b>，因此不用此參數的值
 NoMaxSizeByPHPLimit=註：你的 PHP 偏好設定為無限制
 MaxSizeForUploadedFiles=上傳檔案最大值（0 為禁止上傳）
@@ -131,7 +131,7 @@ HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on thi
 Box=小工具
 Boxes=各式小工具
 MaxNbOfLinesForBoxes=各式小工具最大行數
-AllWidgetsWereEnabled=All available widgets are enabled
+AllWidgetsWereEnabled=所有可用小工具都啟用
 PositionByDefault=預設排序
 Position=位置
 MenusDesc=選單管理器設定2項選單欄(垂直及水平)
@@ -143,15 +143,15 @@ SystemInfo=系統資訊
 SystemToolsArea=系統各式工具區
 SystemToolsAreaDesc=此區提供了管理層面功能，請使用選單來選擇你想要的功能。
 Purge=清除
-PurgeAreaDesc=此頁允許您刪除已產生的檔案或存在 Dolibarr ( 在<b>%s</b>的檔案目錄下的暫存檔或全部檔案)。這功能不是必要的。因為此是提供給dolibarr是架在網頁伺服器供應商者，且其無權限刪除檔案者使用。
+PurgeAreaDesc=此頁允許您刪除已產生的檔案或存在 Dolibarr ( 在<b>%s</b>的資料夾下的暫存檔或全部檔案)。這功能不是必要的。因為此是提供給dolibarr是架在網頁伺服器供應商者，且其無權限刪除檔案者使用。
 PurgeDeleteLogFile=刪除 log 檔案，包含Syslog 模組的 <b>%s</b> (沒有遺失資料風險)
 PurgeDeleteTemporaryFiles=刪除全部暫存檔案(沒有遺失資料風險)
-PurgeDeleteTemporaryFilesShort=Delete temporary files
-PurgeDeleteAllFilesInDocumentsDir=在檔案目錄<b>%s</b>中刪除所有檔案。暫存檔案不只是資料庫備份(dumps)、元件的夾檔 ( 合作方、各式發票... ) 及上傳到 ECM 模組的將會被刪除。
+PurgeDeleteTemporaryFilesShort=刪除範本檔案
+PurgeDeleteAllFilesInDocumentsDir=在資料夾<b>%s</b>中刪除所有檔案。暫存檔案不只是資料庫備份(dumps)、元件的夾檔 ( 合作方、各式發票... ) 及上傳到 ECM 模組的將會被刪除。
 PurgeRunNow=立即清除
-PurgeNothingToDelete=沒有可以刪除的檔案目錄或檔案。
-PurgeNDirectoriesDeleted=<b>%s的</b>檔案或目錄已刪除。
-PurgeNDirectoriesFailed=Failed to delete <b>%s</b> files or directories.
+PurgeNothingToDelete=沒有可以刪除的資料夾或檔案。
+PurgeNDirectoriesDeleted=<b>%s的</b>檔案或資料夾已刪除。
+PurgeNDirectoriesFailed=刪除<b>%s</b>檔案或資料夾失敗。
 PurgeAuditEvents=清除所有安全性事件
 ConfirmPurgeAuditEvents=您確定要清除全部安全事件？所有安全性 log 將會被刪除，沒有其他資料被移除。
 GenerateBackup=產生備份
@@ -190,30 +190,30 @@ EncodeBinariesInHexa=在十六進制編碼的二進制數據
 IgnoreDuplicateRecords=忽略重覆資料的錯誤訊息 (INSERT IGNORE)
 AutoDetectLang=自動檢測（瀏覽器的語言）
 FeatureDisabledInDemo=在展示中禁用功能
-FeatureAvailableOnlyOnStable=Feature only available on official stable versions
+FeatureAvailableOnlyOnStable=在官方穩定版本中可用的功能
 BoxesDesc=小工具是顯示您自行增加個人化的資料。您可選擇顯示小工具或由選定目標頁點選啟動或禁用。
-OnlyActiveElementsAreShown=僅從<a href="%s">啟動模組</a>後元件才會顯示。
-ModulesDesc=Dolibarr 程式/功能的模組可在軟體內啟動。某些程式/模組您必須允許用戶權限，之後再啟動。點選按鈕 on/off 啟動模組/程式。
+OnlyActiveElementsAreShown=僅從<a href="%s">啟用模組</a>後元件才會顯示。
+ModulesDesc=Dolibarr 程式/功能的模組可在軟體內啟用。某些程式/模組您必須允許用戶權限，之後再啟動。點選按鈕 on/off 啟用模組/程式。
 ModulesMarketPlaceDesc=您可在外部網頁中找到更多可下載的模組...
-ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab <strong>%s</strong>.
+ModulesDeployDesc=若檔案系統的權限允許，則可以使用此工具來部署外部模組。 該模組將在選項卡上顯示<strong>%s</strong>。
 ModulesMarketPlaces=找外部 app / 模組
-ModulesDevelopYourModule=Develop your own app/modules
-ModulesDevelopDesc=You can develop or find a partner to develop for you, your personalised module
+ModulesDevelopYourModule=發展您自己的應用程式及模組
+ModulesDevelopDesc=您可以發展或找到夥伴一起發展您的個人化模組
 DOLISTOREdescriptionLong=Instead of switching on <a href="https://www.dolistore.com">www.dolistore.com</a> web site to find an external module, you can use this embedded tool that will make the seach on the external market place for you (may be slow, need an internet access)...
 NewModule=新
 FreeModule=Free
-CompatibleUpTo=Compatible with version %s
-NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s - Max %s).
-CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
-SeeInMarkerPlace=See in Market place
-Updated=Updated
-Nouveauté=Novelty
-AchatTelechargement=Buy / Download
-GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at <a href="%s">%s</a>.
+CompatibleUpTo=與版本%s相容
+NotCompatible=此模組似乎不相容您 Dolibarr %s (適用最低版本 %s - 最高版本 %s)。
+CompatibleAfterUpdate=此模組需要昇級您的 Dolibarr %s (至少 %s - %s)。
+SeeInMarkerPlace=在市場可以看到
+Updated=昇級
+Nouveauté=新奇
+AchatTelechargement=購買 / 下載
+GoModuleSetupArea=要部署/安裝新模組，請轉到模組設定區域<a href="%s">%s</a>。
 DoliStoreDesc=DoliStore 是 Dolibarr ERP / CRM 外部模組的官方市集
-DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
+DoliPartnersDesc=各家公司提供客制發展模組功能的清單明細(注意：任何有經驗的PHP程式編輯人員可提供客制化發展的開放原始碼專案)
 WebSiteDesc=參考網頁找到更多模組...
-DevelopYourModuleDesc=Some solutions to develop your own module...
+DevelopYourModuleDesc=某些解決方式要您自行發展模組...
 URL=連線
 BoxesAvailable=可用小工具
 BoxesActivated=小工具已啟用
@@ -222,7 +222,7 @@ ActiveOn=已啟用
 SourceFile=來源檔案
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=僅當 JavaScript 不是禁用時可用
 Required=必須
-UsedOnlyWithTypeOption=Used by some agenda option only
+UsedOnlyWithTypeOption=只供行程選項使用
 Security=安全
 Passwords=密碼
 DoNotStoreClearPassword=在資料庫中不要存明碼，要存成加密(建議啟動)
@@ -235,63 +235,64 @@ Feature=功能特色
 DolibarrLicense=授權
 Developpers=開發商/貢獻者
 OfficialWebSite=Dolibarr國際官方網站
-OfficialWebSiteLocal=Local web site (%s)
+OfficialWebSiteLocal=本地網站(%s)
 OfficialWiki=Dolibarr維基
 OfficialDemo=Dolibarr在線展示
 OfficialMarketPlace=外部模組/插件官方市場
 OfficialWebHostingService=可參考的網站主機服務 (雲端主機)
-ReferencedPreferredPartners=Preferred Partners
-OtherResources=Other resources
-ExternalResources=External resources
-SocialNetworks=Social Networks
+ReferencedPreferredPartners=首選合作夥伴
+OtherResources=其他資源
+ExternalResources=外部資源
+SocialNetworks=社會網路
 ForDocumentationSeeWiki=有關用戶或開發人員的文件（文件，常見問題...), <br>可在Dolibarr維基查閱： <br> <a href="%s" target="_blank"><b>%s的</b></a>
 ForAnswersSeeForum=有關任何其他問題/幫助，您可以使用Dolibarr論壇： <br> <a href="%s" target="_blank"><b>%s的</b></a>
 HelpCenterDesc1=此區可以幫助你取得 Dolibarr 的幫忙支援服務。
 HelpCenterDesc2=某些服務<b>僅可使用英文</b> 。
 CurrentMenuHandler=目前選單處理者
 MeasuringUnit=衡量單位
-LeftMargin=Left margin
-TopMargin=Top margin
-PaperSize=Paper type
-Orientation=Orientation
-SpaceX=Space X
-SpaceY=Space Y
-FontSize=Font size
-Content=Content
-NoticePeriod=Notice period
-NewByMonth=New by month
-Emails=Emails
-EMailsSetup=Email 設定
-EMailsDesc=此頁允許您複寫您 email 傳送的 php 參數。在 Unix/Linux 系統中多數案例，您 php 設定正確及參數是無效的。
-EmailSenderProfiles=Emails sender profiles
+LeftMargin=左邊邊界
+TopMargin=上面邊界
+PaperSize=紙張類型
+Orientation=方向
+SpaceX=空間 X
+SpaceY=空間 Y
+FontSize=字型大小
+Content=內容
+NoticePeriod=通知期
+NewByMonth=新的一個月
+Emails=各式電子郵件
+EMailsSetup=電子郵件設定
+EMailsDesc=此頁允許您複寫您電子郵件傳送的 php 參數。在 Unix/Linux 系統中多數案例，您 php 設定正確及參數是無效的。
+EmailSenderProfiles=電子郵件傳送者簡歷
 MAIN_MAIL_SMTP_PORT=SMTP / SMTPS 連接埠 ( 在 php.ini 中預設值:<b>%s</b>)
 MAIN_MAIL_SMTP_SERVER=SMTP / SMTPS 主機 ( 在 php.ini 中是預設的:<b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP / SMTPS 連接埠 ( 在 Unix like 系統內，沒有定義在 PHP中)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPS 主機 ( 在 Unix like 系統內，沒有定義在 PHP 中)
-MAIN_MAIL_EMAIL_FROM=自動郵件信件時寄件者(在 php.ini中預設值:<b>%s</b>)
-MAIN_MAIL_ERRORS_TO=在寄出mail時使用 'Errors-To' 欄位
-MAIN_MAIL_AUTOCOPY_TO= 系統私下寄送所有發送郵件的副件給
-MAIN_DISABLE_ALL_MAILS=禁用傳送所有郵件(適用於測試目的或是展示)
-MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
+MAIN_MAIL_EMAIL_FROM=自動化電子郵件的寄件者(在 php.ini中預設值:<b>%s</b>)
+MAIN_MAIL_ERRORS_TO=Eemail used for error returns emails (fields 'Errors-To' in emails sent)
+MAIN_MAIL_AUTOCOPY_TO= 系統私下寄送所有發送的電子郵件副件給
+MAIN_DISABLE_ALL_MAILS=禁用傳送所有電子郵件(適用於測試目的或是展示)
+MAIN_MAIL_FORCE_SENDTO=傳送全部電子郵件到(此為測試用，不是真正的收件人)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Add employees users with email into allowed destinaries list
 MAIN_MAIL_SENDMODE=傳送電子郵件方法
 MAIN_MAIL_SMTPS_ID=SMTP 帳號（如果需要驗證）
 MAIN_MAIL_SMTPS_PW=SMTP 密碼（如果需要驗證）
 MAIN_MAIL_EMAIL_TLS= 使用 TLS (SSL) 的加密
-MAIN_MAIL_EMAIL_STARTTLS= Use TLS (STARTTLS) encrypt
+MAIN_MAIL_EMAIL_STARTTLS= 使用 TLS (STARTTLS) 加密
 MAIN_DISABLE_ALL_SMS=禁用傳送所有簡訊/SMS(適用於測試目的或展示)
 MAIN_SMS_SENDMODE=使用傳送簡訊/SMS的方法
 MAIN_MAIL_SMS_FROM=傳送簡訊/SMS的傳送者預設電話號碼
-MAIN_MAIL_DEFAULT_FROMTYPE=Sender email by default for manual sendings (User email or Company email)
-UserEmail=User email
-CompanyEmail=Company email
+MAIN_MAIL_DEFAULT_FROMTYPE=人工傳送時預設的寄件者電子郵件(用戶電子郵件或公司電子郵件)
+UserEmail=用戶電子郵件
+CompanyEmail=公司電子郵件
 FeatureNotAvailableOnLinux=在Unix系列系統中不能使用功能。在本地測試您的寄送郵件程式。
-SubmitTranslation=若未完整地翻譯您的語言或您找到錯誤，您可透過編輯檔案放到<b>langs/%s</b>的檔案目錄中修正他們，或是傳送您做的異動到 www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+SubmitTranslation=若未完整地翻譯您的語言或您找到錯誤，您可透過編輯檔案放到<b>langs/%s</b>的資料夾中修正他們，或是傳送您做的異動到 www.transifex.com/dolibarr-association/dolibarr/
+SubmitTranslationENUS=若您的語言翻譯尚未完成，或是您到錯誤，您可以透過編輯在資料夾 <b>langs/%s</b>中的檔案修正它，並把修改後檔案傳送到 dolibarr.org/forum 或是給在  github.com/Dolibarr/dolibarr 開發者。
 ModuleSetup=模組設定
 ModulesSetup=模組/程式設定
 ModuleFamilyBase=系統
 ModuleFamilyCrm=客戶關係管理(CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilySrm=Vendor Relation Management (VRM)
 ModuleFamilyProducts=產品管理 (PM)
 ModuleFamilyHr=人力資源管理 (HR)
 ModuleFamilyProjects=專案 / 協同作業
@@ -300,33 +301,33 @@ ModuleFamilyTechnic=多種模組工具
 ModuleFamilyExperimental=實驗性模組
 ModuleFamilyFinancial=財務模組（會計/財務）
 ModuleFamilyECM=數位內容管理 (ECM)
-ModuleFamilyPortal=Web sites and other frontal application
-ModuleFamilyInterface=Interfaces with external systems
+ModuleFamilyPortal=網站及其他應用程式
+ModuleFamilyInterface=外部系統的介面
 MenuHandlers=選單處理程序
 MenuAdmin=選單編輯器
 DoNotUseInProduction=請勿在實際工作環境使用
 ThisIsProcessToFollow=此處理步驟：
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
+ThisIsAlternativeProcessToFollow=代替的人工設定程序：
 StepNb=步驟 %s 
 FindPackageFromWebSite=尋找您想要功能的套件(在官網 %s 上有範例)。
 DownloadPackageFromWebSite=下載套件(在官網%s上有範例)。
-UnpackPackageInDolibarrRoot=解壓縮的套件檔案到伺服器下的 dolibarr 檔案目錄:<b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: <b>%s</b>
-SetupIsReadyForUse=模組的發展已完成。您必須透過模組設定頁面啟動及在您的程式中設定模組:<a href="%s">%s</a>
-NotExistsDirect=替代根檔案目錄沒有定義到已存在的檔案目錄。<br>
-InfDirAlt=自從第3版起，可定義替代根檔案目錄。此允許您儲存到指定檔案目錄、插件及客製化範本。<br>只要在 dolibarr 的根目錄內建立檔案目錄(例如: 客戶)。<br>
-InfDirExample=<br>在 <strong>conf.php 檔案宣告 <br>$dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>若這幾行已用"#"方式註解了，啟動他，也就是移除 "#"。
+UnpackPackageInDolibarrRoot=解壓縮的套件檔案到伺服器下的 dolibarr 資料夾:<b>%s</b>
+UnpackPackageInModulesRoot=要部署/安裝外部模組，請將打包的檔案解壓縮到專用於模組的服務器資料夾中：<b>%s</b>
+SetupIsReadyForUse=模組的發展已完成。您必須透過模組設定頁面啟用及在您的程式中設定模組:<a href="%s">%s</a>
+NotExistsDirect=替代根資料夾的資訊沒有定義到已存在的資料夾中。<br>
+InfDirAlt=從第3版起，可定義替代根資料夾。此允許您儲存到指定資料夾、插件及客製化範本。<br>只要在 dolibarr 的根資料夾內建立資料夾(例如: 客戶)。<br>
+InfDirExample=<br>在 <strong>conf.php</strong> 檔案宣告 <br>$dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>若這幾行已用"#"方式註解了，啟用他，也就是移除 "#"。
 YouCanSubmitFile=此步驟，您可傳送模組套件的 .zip 檔案到此:
 CurrentVersion=Dolibarr 目前版本
 CallUpdatePage=到此頁昇級資料庫架構及資料:%s。
 LastStableVersion=最新穩定版本
-LastActivationDate=Latest activation date
-LastActivationAuthor=Latest activation author
-LastActivationIP=Latest activation IP
-UpdateServerOffline=Update server offline
-WithCounter=Manage a counter
+LastActivationDate=最新啟動日期
+LastActivationAuthor=最新啟動的作者
+LastActivationIP=最新啟動的 IP
+UpdateServerOffline=離線昇級伺服器
+WithCounter=管理計數器
 GenericMaskCodes=您可使用任何數字遮罩。在此遮罩下可使用接下來的標籤:<br>1. <b>{000000}</b>表示每個 %s 編碼會依據此參數產生序號字串，且會自動遞增。有多少個0就表示序號字串有多長，滿最大值會自動歸0。<br>2. <b>{000000+000}</b> 同上面第一條，但是多了 offset 功能，也就第一筆 %s 編碼的起始序號會根據 + 號後面的參數而定。<br>3. <b>{000000@x}</b> 同上面第一條，但是每當為新的月份時，會將序號歸 0 ( x介於 1 到 12 間，或是使用 0 則依您偏好設定中已定義的財務年度的最早月份，或是使用 99 代表每月重新歸 0)。如果使用兩個x 則必需要有 {yy}{mm} 或 {yyyy}{mm} 參數。<br><b>{dd}</b> 表示天 (01 到 31).<br><b>{mm}</b> 表示月 (01 到 12)<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b>  表示用 2、4 或 1 位數顯示年<br>
-GenericMaskCodes2=在n字元下客戶代號為<b>{cccc}</b><br>在n字元下客戶代號為<b>{cccc000}</b>是專門給客戶的計數器。此計數器大於全域計數器時會重新歸0。<br>在n字元下合作方類型代號為<b>{tttt}</b>(在選單首頁 - 設定 - 目錄 - 合作方類型)。若您增加標籤，每個合作方類型的計數器會不同。<br>
+GenericMaskCodes2=在n字元下客戶代號為<b>{cccc}</b><br>在n字元下客戶代號為<b>{cccc000}</b>是專門給客戶的計數器。此計數器大於全域計數器時會重新歸0。<br>在n字元下合作方類型代號為<b>{tttt}</b>(在選單首頁 - 設定 - 詞典 - 合作方類型)。若您增加標籤，每個合作方類型的計數器會不同。<br>
 GenericMaskCodes3=非遮罩字元的則該字元維持不變，也就是 A 就是 A，Z 就是 Z<br>注意:不允許空白字元。<br>
 GenericMaskCodes4a=<u>例如: 日期在 2007-01-31 的第99個%s合作方公司:</u><br>
 GenericMaskCodes4b=<u>例如: 在 2007-03-01 建立的合作方:</u><br>
@@ -338,11 +339,11 @@ ServerNotAvailableOnIPOrPort=網址<b>%s</b>連接埠<b>%s</b>的伺服器無法
 DoTestServerAvailability=測試伺服器連線
 DoTestSend=傳送測試
 DoTestSendHTML=測試傳送HTML
-ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
+ErrorCantUseRazIfNoYearInMask=錯誤，若序列 {yy} 或 {yyyy} 在條件中，則不能使用 @ 以便每年重新計數。
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=錯誤，若序列 {yy}{mm} 或 {yyyy}{mm} 不在遮罩內則不能使用選項 @。
 UMask=在 Unix/Linux/BSD/Mac 的檔案系統中新檔案的 UMask 參數。
 UMaskExplanation=此參數允許您定義在伺服器上由 Dolibarr 建立的檔案的權限(例如在上載檔案時)。 <br>這是八進位(例如，0666 為全部人可讀寫)。<br>此參數無法在 Windows 伺服器上使用。
-SeeWikiForAllTeam=在 wiki 頁面中查看所有角色及其組織的完整清單
+SeeWikiForAllTeam=在 wiki 頁面中查看所有角色及其組織的完整清單明細
 UseACacheDelay= 以秒為單位的遞延匯出反應的時間(0或空格為沒有緩衝)
 DisableLinkToHelpCenter=登錄頁面上隱藏連線“ <b>需要幫助或支援</b>"
 DisableLinkToHelp=隱藏連線到線上幫助 "<b>%s</b>"
@@ -350,20 +351,20 @@ AddCRIfTooLong=沒有自動換行功能，若一行太長，請自行按下 Ente
 ConfirmPurge=您確認要執行刪除嗎？<br>此會刪您所有資料，且無法還復(含 ECM 檔案及各式夾檔)。
 MinLength=最小長度
 LanguageFilesCachedIntoShmopSharedMemory=.lang 檔案載入分享記憶體中
-LanguageFile=Language file
+LanguageFile=語系檔
 ExamplesWithCurrentSetup=現在執行範例設定
-ListOfDirectories=OpenDocument 範本檔案目錄下的清單
-ListOfDirectoriesForModelGenODT=包含 OpenDocument 格式範本的檔案目錄清單。<br><br>檔案目錄完整路徑放在這裡。<br>每一檔案目錄之間要用 enter 鍵。<br>為增加 GED 模組的檔案目錄，請放在<b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>。<br><br>在這些檔案目錄的檔案結尾必須是 <b>.odt</b> 或 <b>.ods</b>。
-NumberOfModelFilesFound=在這些檔案目錄中找到 ODT/ODS 範本檔數字
+ListOfDirectories=OpenDocument 範本資料夾下的清單明細
+ListOfDirectoriesForModelGenODT=包含 OpenDocument 格式範本的資料夾清單明細。<br><br>資料夾完整路徑放在這裡。<br>每一資料夾之間要用 enter 鍵。<br>為增加 GED 模組的資料夾，請放在<b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>。<br><br>在這些資料夾的檔案結尾必須是 <b>.odt</b> 或 <b>.ods</b>。
+NumberOfModelFilesFound=在這些資料夾中找到 ODT/ODS 範本檔數量
 ExampleOfDirectoriesForModelGen=語法範例:<br> ç:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
-FollowingSubstitutionKeysCanBeUsed=<br>要知道如何建立您的ODT文件範本，並儲存在這些目錄，請上 wiki 網站：
+FollowingSubstitutionKeysCanBeUsed=<br>要知道如何建立您的ODT文件範本，並儲存在這些資料夾，請上 wiki 網站：
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=名字/姓氏的位置
-DescWeather=當最後動作的數量達到以下值，以下的圖片將會顯示在儀表板上：
+DescWeather=當最新行動的數量達到以下值，接以下的圖片將會顯示在儀表板上：
 KeyForWebServicesAccess=輸入使用 Web 服務（在 WebServices 的參數是“dolibarrkey”）
 TestSubmitForm=輸入測試表單
 ThisForceAlsoTheme=無論用戶的選擇為何，使用此選單管理器也將使用其本身的主題。此選單管理器是專適用於智慧手機，但並不適用於全部的智慧手機。若您遇到問題，請使用另一個選單管理器。
-ThemeDir=skins目錄
+ThemeDir=skins資料夾
 ConnectionTimeout=連線超時
 ResponseTimeout=回應超時
 SmsTestMessage=測試訊息從 __PHONEFROM__ 到 __PHONETO__
@@ -373,13 +374,14 @@ NoSmsEngine=沒有簡訊/SMS傳送器可用。簡訊/SMS傳送器預設沒有安
 PDF=PDF格式
 PDFDesc=您可以設定每個全域選項關連到 PDF產生器
 PDFAddressForging=產生地址規則
-HideAnyVATInformationOnPDF=在產生的 PDF 上隱藏所有有關營業稅的資訊
-PDFLocaltax=Rules for %s
-HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
+HideAnyVATInformationOnPDF=Hide all information related to Sales tax / VAT on generated PDF
+PDFRulesForSalesTax=Rules for Sales Tax / VAT
+PDFLocaltax=%s的規則
+HideLocalTaxOnPDF=將 %s 稅率隱藏到 pdf 列銷售稅中
 HideDescOnPDF=在產生的 PDF 上隱藏產品描述
 HideRefOnPDF=在產生的 PDF 上隱藏產品參考號
 HideDetailsOnPDF=在產生的 PDF 上產品線詳細資訊
-PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
+PlaceCustomerAddressToIsoLocation=使用法國標準位置（La Poste）作為客戶地址位置
 Library=程式庫
 UrlGenerationParameters=將網址安全化的參數
 SecurityTokenIsUnique=每個URL使用獨特的安全/securekey參數
@@ -392,7 +394,7 @@ PriceBaseTypeToChange=根據已定義的基礎參考價參修改價格
 MassConvert=啟動大量轉換
 String=字串
 TextLong=長字串
-HtmlText=Html text
+HtmlText=Html 文字
 Int=整數
 Float=浮點數
 DateAndTime=日期時間
@@ -402,23 +404,23 @@ ExtrafieldPhone = 電話
 ExtrafieldPrice = 價格
 ExtrafieldMail = 電子郵件
 ExtrafieldUrl = Url
-ExtrafieldSelect = 選擇清單
+ExtrafieldSelect = 選擇清單明細
 ExtrafieldSelectList = 從表格選取
 ExtrafieldSeparator=分隔 (非欄位)
 ExtrafieldPassword=密碼
 ExtrafieldRadio=雷達鈕 (限選擇性質)
 ExtrafieldCheckBox=勾選方框
-ExtrafieldCheckBoxFromList=Checkboxes from table
-ExtrafieldLink=Link to an object
-ComputedFormula=Computed field
+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, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties 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>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->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->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
-ExtrafieldParamHelpPassword=Keep this field empty means value will be stored without encryption (field must be only hidden with star on screen).<br>Set here value 'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retreive original value)
-ExtrafieldParamHelpselect=此行的清單清，其格式為 關鍵字,值(關鍵字不為'0')<br><br>例如:<br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>為使清單可依賴於其他補充屬性清單:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key<br><br>為使清單可依賴於另一清單:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
-ExtrafieldParamHelpcheckbox=此行的清單值，其格式為 關鍵字,值 (關鍵字不能為 '0')<br><br>例如:<br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=此行的清單值，其格式為 關鍵字,值 (關鍵字不能為 '0')<br><br>例如:<br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=從表格來的清單值<br>語法:table_name:label_field:id_field::filter<br>例如:c_typent:libelle:id::filter<br><br>-idfilter 是必須地且主要的初始關鍵字<br>-filter 可以簡單測試(啟動為active=1)只顯示下啟動值<br>您也可以在過濾器中使用 $ID$ 過瀘當期的 id<br>為使用 SELECT 可在過瀘器中使用$SEL$<br>若你想要過濾額外欄位使用語為 extra.fieldcode=... (欄位代號為額外欄位的代號)<br><br>為使清單可依賴另外的補充屬性的清單:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>為使清單可依賴於另外清單:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Examples :<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelpPassword=不要加密儲存，此欄位保持空白(在螢幕中欄位有星星的必須隱藏)。<br>此處值設定為'自動'則使用預設的加密規則儲存密碼到資料庫(沒有辦法讀取原始值)
+ExtrafieldParamHelpselect=此行的清單明細值，其格式為關鍵字,值(關鍵字不為'0')<br><br>例如:<br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>為使清單明細可依賴於其他補充屬性清單明細:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key<br><br>為使清單明細可依賴於另一清單明細:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
+ExtrafieldParamHelpcheckbox=此行的清單明細值，其格式為關鍵字,值 (關鍵字不能為 '0')<br><br>例如:<br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldParamHelpradio=此行的清單明細值，其格式為關鍵字,值 (關鍵字不能為 '0')<br><br>例如:<br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldParamHelpsellist=從表格來的清單明細值<br>語法:table_name:label_field:id_field::filter<br>例如:c_typent:libelle:id::filter<br><br>-idfilter 是必須地且主要的初始關鍵字<br>-filter 可以簡單測試(啟動為active=1)只顯示下啟動值<br>您也可以在過濾器中使用 $ID$ 過瀘當期的 id<br>為使用 SELECT 可在過瀘器中使用$SEL$<br>若你想要過濾額外欄位使用語為 extra.fieldcode=... (欄位代號為額外欄位的代號)<br><br>為使清單明細可依賴另外的補充屬性的清單:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>為使清單明細可依賴於另外清單明細:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=表單中值的清單<br>語法： table_name:label_field:id_field::filter<br>例如：: c_typent:libelle:id::filter<br><br>篩選可以是一個簡單的測試 (例如 啟動 =1 ) 只顯示啟動的值<br>您也可以在篩選中使用 $ID$作為目前物件的ID<br>在篩選器中執行 SELECT 則使用 $SEL$<br>若您要在額外欄位篩選使用語法 extra.fieldcode=... (extra.fileldcode為欄位的代碼)<br><br>為使清單明細依賴於另一個補充屬性的清單明細：<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter<br><br>為使清單明細依賴於另一個補充屬性清單明細：<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelplink=參數必須是 ObjectName:Classpath<br>語法：ObjectName:Classpath<br>例如：<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
 LibraryToBuildPDF=PDF產生器使用程式庫
 LocalTaxDesc=某些國家在每張發票適用 2 或 3 種稅率。若在此情況，選擇第二和三種稅率。可能類型:<br>1: 在地稅率適用不含營業稅的產品及服務(此是以未稅金額計算)<br>2:在地稅率適用含營業稅的產品及服務(此是以金額+主要稅金計算)<br>3:在地稅率適用不含營業稅的產品(此是以未稅金額計算)<br>4:在地稅率適用含營業稅的產品(此是以金額+主要營業稅計算)<br>5:在地稅率適用不含營業稅的服務(此是以未稅金額計算)<br>6:在地稅率適用含營業稅的服務(此是以金額+稅金計算)
 SMS=簡訊
@@ -427,50 +429,54 @@ RefreshPhoneLink=更新連線
 LinkToTest=用戶產生可連線 <strong>%s</strong> (點選電話號碼來測試)
 KeepEmptyToUseDefault=保留空白則使用預設值
 DefaultLink=預設連線
-SetAsDefault=Set as default
+SetAsDefault=設定成預設值
 ValueOverwrittenByUserSetup=警告，用戶指定設定會覆蓋該值(每位用戶可設定自己的 URL )
-ExternalModule=External module - Installed into directory %s
-BarcodeInitForThirdparties=Mass barcode init for thirdparties
-BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Init value for next %s empty records
-EraseAllCurrentBarCode=Erase all current barcode values
-ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
-AllBarcodeReset=All barcode values have been removed
-NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into barcode module setup.
-EnableFileCache=Enable file cache
-ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
-NoDetails=No more details in footer
-DisplayCompanyInfo=Display company address
-DisplayCompanyManagers=Display manager names
-DisplayCompanyInfoAndManagers=Display company address and manager names
-EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
-ModuleCompanyCodePanicum=Return an empty accounting code.
-ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party 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...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) does not allow you to send an email from another server than their own server. Your current setup use the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not a server of them, so few of your sent Emails may not be accepted (be carefull also to your email provider sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account).
-WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of your ERP CRM application: <strong>%s</strong>.
-ClickToShowDescription=Click to show description
-DependsOn=This module need the module(s)
-RequiredBy=This module is required by module(s)
+ExternalModule=外部模組 - 已安裝到資料夾 %s
+BarcodeInitForThirdparties=合作方的大量條碼初始值
+BarcodeInitForProductsOrServices=大量條碼初始值或是重新設產品或服務
+CurrentlyNWithoutBarCode=目前您在沒有條碼的<strong>%s</strong>%s中有<strong>%s</strong>的記錄。
+InitEmptyBarCode=下一筆%s記錄初始值
+EraseAllCurrentBarCode=刪除目前全部的條碼現有值
+ConfirmEraseAllCurrentBarCode=您確定您要刪除目前全部的條碼現有值？
+AllBarcodeReset=全部的條碼值已刪除
+NoBarcodeNumberingTemplateDefined=沒有啟用條碼模組設定的編號條碼範本
+EnableFileCache=啟用檔案快取
+ShowDetailsInPDFPageFoot=增加更多詳細資料到 PDF 檔案的頁腳，像您公司地址，或是管理者名稱 (要完成專業證號、公司資本額及VAT字號)。
+NoDetails=頁腳沒有更多的詳細資料
+DisplayCompanyInfo=顯示公司地址
+DisplayCompanyManagers=顯示管理者名稱
+DisplayCompanyInfoAndManagers=顯示公司地址及管理者名稱
+EnableAndSetupModuleCron=若您要自動地產生循環發票，模組"%s"必須啟用且正確設定。然而各式發票的產生必須從此範例的 "建立" 鈕以人工完成。注意即使你啟用自動產生，你仍可安全地以人工方式執行而產生。在相同時間內不能重覆產生發票。
+ModuleCompanyCodeCustomerAquarium=%s followed by third party customer code for a customer accounting code
+ModuleCompanyCodeSupplierAquarium=%s followed by third party supplier code for a supplier accounting code
+ModuleCompanyCodePanicum=回傳空白會計代碼。
+ModuleCompanyCodeDigitaria=會計代碼依著合作方代碼。代碼是由第一個字母 "C" 接下來是合作方代碼的前面5 個字母組成的。
+Use3StepsApproval=存預設情況下，採購訂單需要由 2 個不同的用戶建立和核准 (一個步驟/用戶建立，另一個步驟/用戶核准。請注意，若用戶同時具有建立和批准的權限，則一個步驟/用戶就足夠了) 。 若金額高於指定值時，您可以通過此選項進行要求以引入第三步/用戶核准 (因此需要3個步驟：1 =驗證，2 =首次批准，3 =若金額足夠，則為第二次批准) 。 <br>若一次核准 ( 2個步驟) 就足夠，則將不做任何設定，若總是需要第二次批准 (3個步驟)，則將其設置為非常低的值 (0.1)。
+UseDoubleApproval=當金額(未稅)大於...時使用3步驟核准
+WarningPHPMail=警告：通常設定寄出的電子郵件為您提供的電子郵件伺服器以代替預設值是比較好的。某些電子郵件提供者(像 Yahoo)不允許您傳送電子郵件從另一個伺服器到他們自己的伺服器。您正確的設定要使用應用軟體的伺服器傳送電子郵件而不是您的電子郵件提供者，所以某些收件者(與限制性DMARC協議兼容的一種)會詢問您的電子郵件提供者，若他們可接受您的電子郵件及某些電子郵件提供者(像 Yahoo)可能回應"no"，因為伺服器不是他們的伺服器，所以少數您寄的電子郵件可能不被接受(也還要小心你的電子郵件提供者發送大小限制)。<br>若您的電子郵件提供者(像 Yahoo)有限制，您必須變更您電子郵件設定為選用其他方法 "SMTP 伺服器" 及輸入 SMTP 伺服器及由您電子郵件提供者提供的認證(詢問您的電子郵件提供者為您的電子郵件帳戶取得 SMTP 認證)。
+WarningPHPMail2=若您的電子郵件 SMTP 供應商需要將電子郵件客戶端限制為某些 IP 地址(非常罕見)，則您的ERP CRM 應用程序的 IP 地址：<strong>%s</strong>
+ClickToShowDescription=點一下顯示描述
+DependsOn=此模組需要其他各式模組
+RequiredBy=模組需要此模組
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. This need to have technical knowledges to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter here the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples:
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-EnableDefaultValues=Enable usage of personalized default values
-EnableOverwriteTranslation=Enable usage of overwrote translation
-GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation.
+PageUrlForDefaultValues=您必須在此輸入相對頁面的URL。 若您在URL中包含參數時，若所有參數都設為相同的值，則預設值將生效。 例如：
+PageUrlForDefaultValuesCreate=<br>對表單來建立新的合作方，他是 <strong>%s</strong>，<br>若只要在 url 中有一些參數時才需要預設值，則可以使用 <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>此頁為合作方清單，是<strong>%s</strong>，<br>若只有當 url 有參數時才需要預設值，您可使用 <strong>%s</strong>
+EnableDefaultValues=啟用個人使用的預設值
+EnableOverwriteTranslation=啟用使用覆寫翻譯
+GoIntoTranslationMenuToChangeThis=此程式碼值找到翻譯，因此要更改此值，您必須到 首頁 - 設定 - 翻譯 進行編輯。
 WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
 Field=欄位
-ProductDocumentTemplates=Document templates to generate product document
-FreeLegalTextOnExpenseReports=Free legal text on expense reports
-WatermarkOnDraftExpenseReports=Watermark on draft expense reports
-AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
-FilesAttachedToEmail=Attach file
-SendEmailsReminders=Send agenda reminders by emails
-davDescription=Add a component to be a DAV server
+ProductDocumentTemplates=文件範例產生產品文件檔
+FreeLegalTextOnExpenseReports=在費用報表中加註法律文字
+WatermarkOnDraftExpenseReports=在草稿的費用報表中的浮水印
+AttachMainDocByDefault=若您要預設將主要文件附加到電子郵件(若適用的話)，此值設定為 1
+FilesAttachedToEmail=附加檔案
+SendEmailsReminders=用電子郵件傳送行程提醒
+davDescription=新增元件到 DAV 伺服器
+DAVSetup=Setup of module DAV
+DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDav directory with no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The WebDav public directory is a WebDAV directory everybody can access to (in read and write mode), with no need to have/use an existing login/password account.
 # Modules
 Module0Name=用戶和群組
 Module0Desc=用戶/員工以及群組管理
@@ -479,7 +485,7 @@ Module1Desc=公司和聯絡人的管理(客戶、潛在客戶)
 Module2Name=商業
 Module2Desc=商業管理
 Module10Name=會計
-Module10Desc=簡單的會計管理（發票和付款作業）
+Module10Desc=Simple accounting reports (journals, turnover) based onto database content. Does not use any ledger table.
 Module20Name=建議書
 Module20Desc=商業建議書的管理
 Module22Name=大量發送的電子郵件
@@ -520,8 +526,8 @@ Module70Name=干預/介入
 Module70Desc=干預/介入的管理
 Module75Name=費用和出差筆記
 Module75Desc=費用和旅遊音符的管理
-Module80Name=出貨
-Module80Desc=出貨和交貨單的管理
+Module80Name=裝貨
+Module80Desc=裝貨和交貨單的管理
 Module85Name=銀行及現金
 Module85Desc=銀行或現金帳戶管理
 Module100Name=外部網站
@@ -529,7 +535,7 @@ Module100Desc=本模組將一個外部網站或網頁含到 Dolibarr 選單中
 Module105Name=Mailman and SPIP
 Module105Desc=會員模組用的 Mailman 或 SPIP 介面
 Module200Name=LDAP
-Module200Desc=LDAP 檔案目錄的同步
+Module200Desc=LDAP 資料夾的同步
 Module210Name=PostNuke
 Module210Desc=PostNuke 的整合
 Module240Name=匯出資料
@@ -546,86 +552,86 @@ Module400Name=專案/機會/潛在客戶
 Module400Desc=各式專案、機會/潛在客戶及或任務的管理。您也可以分配任何元件(發票、訂單、提案/建議書、干預/介入...)到專案及從專案檢視中以橫向檢視。
 Module410Name=Webcalendar
 Module410Desc=Webcalendar 整合
-Module500Name=特別支出
-Module500Desc=特別支出管理(稅負、社會或年度稅負、分配)
-Module510Name=Payment of employee wages
-Module510Desc=Record and follow payment of your employee wages
-Module520Name=Loan
-Module520Desc=Management of loans
+Module500Name=Taxes and Special expenses
+Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
+Module510Name=支付員工薪資
+Module510Desc=記錄及接下來支付您員工薪資
+Module520Name=借款
+Module520Desc=借款的管理
 Module600Name=商業事件通知
-Module600Desc=傳送 EMail 通知 ( 由某些商業事件引起 ) 給用戶 ( 在每位用戶中設定 )、給合作方通訊錄 ( 在每位合作方中設定 ) 或是給固定的 email
-Module600Long=Note that this module is dedicated to send real time emails when a dedicated business event occurs. If you are looking for a feature to send reminders by email of your agenda events, go into setup of module Agenda.
-Module610Name=Product Variants
-Module610Desc=Allows creation of products variant based on attributes (color, size, ...)
+Module600Desc=傳送電子郵件通知 ( 由某些商業事件引起 ) 給用戶 ( 在每位用戶中設定 )、給合作方通訊錄 ( 在每位合作方中設定 ) 或是給固定的電子郵件
+Module600Long=請注意，此模組專用於在發生專用商務事件時發送即時的電子郵件。若您正在尋找通過您的行程事件的電子郵件傳送提醒的功能，請進入行程模組的設定。
+Module610Name=產品變種
+Module610Desc=允許基於屬性(顏色、大小...)建立產品變種
 Module700Name=捐贈
 Module700Desc=捐款的管理
-Module770Name=Expense reports
-Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module770Name=費用報表
+Module770Desc=管理及認列費用報表(交通、餐飲...等)
+Module1120Name=Vendor commercial proposal
+Module1120Desc=Request vendor commercial proposal and prices
 Module1200Name=Mantis 工作管理
 Module1200Desc=Mantis 功能整合
-Module1520Name=Document Generation
-Module1520Desc=Mass mail document generation
+Module1520Name=文件的產生
+Module1520Desc=大量郵件文件的產生
 Module1780Name=標籤/分類
-Module1780Desc=建立標籤/分類 (產品、客戶、供應商、通訊錄或是會員)
+Module1780Desc=Create tags/category (products, customers, vendors, contacts or members)
 Module2000Name=所視即所得編輯器
 Module2000Desc=允許使用進階的編輯器 ( CKEditor ) 編輯某些文字區
-Module2200Name=Dynamic Prices
-Module2200Desc=Enable the usage of math expressions for prices
+Module2200Name=浮動價格
+Module2200Desc=啟用價格的數學表達式
 Module2300Name=排程工作
 Module2300Desc=排程工作管理(連到 cron 或是 chrono table)
 Module2400Name=事件/行程
-Module2400Desc=遵循完成及即將發生的事件。讓應用程式記錄自動事件以用於跟踪目的或記錄手動事件或rendez-vous。
-Module2500Name=DMS / ECM
+Module2400Desc=Follow done and upcoming events. Let application logs automatic events for tracking purposes or record manual events or rendez-vous. This is the main important module for a good Customer or Supplier Relationship Management.
+Module2500Name=檔案管理系統(DMS) / 電子控制管理(ECM)
 Module2500Desc=文件管理系統 / 電子內容管理。您產生或是儲存的文件會自動整理組織。當您有需要就分享吧。
 Module2600Name=API/Web 服務 ( SOAP 伺服器 )
-Module2600Desc=啟動 Dolibarr SOAP 伺服器提供 API 服務 
-Module2610Name=API/Web services (REST server)
-Module2610Desc=Enable the Dolibarr REST server providing API services
-Module2660Name=Call WebServices (SOAP client)
-Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
+Module2600Desc=啟用 Dolibarr SOAP 伺服器提供 API 服務 
+Module2610Name=API/Web 服務( REST 伺服器)
+Module2610Desc=啟用 Dolibarr REST 伺服器提供 API 服務
+Module2660Name=呼叫網站服務 (SOAP 客戶端)
+Module2660Desc=啟用 Dolibarr 網站服務客戶端(可以使用傳送資料及要求到外部伺服器。目前只支援供應商訂單)
 Module2700Name=Gravatar
-Module2700Desc=使用線上的 Gravatar 服務 ( www.gravatar.com )，以顯示用戶/會員的照片 (使用本身的 email 尋找)。此需要連上網
+Module2700Desc=使用線上的 Gravatar 服務 ( www.gravatar.com )，以顯示用戶/會員的照片 (使用本身的電子郵件尋找)。此需要連上網
 Module2800Desc=FTP 客戶端
 Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind 的轉換功能
 Module3100Name=Skype
-Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
-Module3200Name=Unalterable Archives
+Module3100Desc=增加 Skype 鈕到用戶 / 合作方 / 通訊錄 / 會員資料卡中
+Module3200Name=不可改變的檔案
 Module3200Desc=Activate log of some business events into an unalterable log. Events are archived in real-time. The log is a table of chained events that can be read only and exported. This module may be mandatory for some countries.
-Module4000Name=HRM
-Module4000Desc=Human resources management (management of department, employee contracts and feelings)
+Module4000Name=人資
+Module4000Desc=人力資源管理(部門、員工合約及感受的管理)
 Module5000Name=多個公司
 Module5000Desc=允許您管理多個公司
-Module6000Name=Workflow
-Module6000Desc=Workflow management
-Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
+Module6000Name=工作流程
+Module6000Desc=工作流程管理
+Module10000Name=網站
+Module10000Desc=透過所見即所視的編輯器建立公開網站。只要設定您網站伺服器 (Apache, Nginx,...) 指向專用的 Dolibarr 資料夾，使其通過 internet 連線到您自己的網域即可。
 Module20000Name=離職申請管理
 Module20000Desc=聲明並遵守員工離職申請
 Module39000Name=產品批次
 Module39000Desc=在產品中批次或序號、有效日及銷售日的管理
 Module50000Name=PayBox
 Module50000Desc=提供使用 PayBox 的借貸卡做為線上支付方式的模組。此可允許您客戶免付款或是用在特定Dolibarr元件 ( 發票、訂單 ... ) 上付款。
-Module50100Name=銷售時點情報
-Module50100Desc=銷售時點情報模組 ( POS )
+Module50100Name=收銀機
+Module50100Desc=收銀機模組 ( POS )
 Module50200Name=Paypal
 Module50200Desc=提供使用 PayPal ( 信用卡或是 PayPal 信用) 做為線上支付方式的模組。此可允許您客戶免付款或是在特定 Dolibarr 元件 ( 發票、訂單 ... ) 上付款。
-Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
+Module50400Name=會計(進階)
+Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software format.
 Module54000Name=PrintIPP
-Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
-Module55000Name=Poll, Survey or Vote
-Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
+Module54000Desc=直接列印(不用打開文件)使用 Cups IPP 介面(印表機可在伺服器上看到，且 CUPS 必須已安裝在伺服器上)。
+Module55000Name=問卷、調查或票選
+Module55000Desc=製作問卷、調查或票選的模組(像 Doodle, Styds, Rdvz, ...)
 Module59000Name=利潤
 Module59000Desc=模組管理利潤
 Module60000Name=委員會
 Module60000Desc=模組管理委員會
-Module62000Name=Incoterm
-Module62000Desc=Add features to manage Incoterm
+Module62000Name=交易條件
+Module62000Desc=新增功能管理交易條件
 Module63000Name=資源
-Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
+Module63000Desc=管理資源 (印表機、車子、會議室...) 您可在之後分享到事件中
 Permission11=讀取客戶發票
 Permission12=建立/修改客戶發票
 Permission13=使客戶發票無效
@@ -648,7 +654,7 @@ Permission38=匯出產品資訊
 Permission41=讀取專案及任務(分享專案及有關我的專案聯絡人)。也可針對自己或是層級已分配的任務輸入處理時間(時間表)
 Permission42=建立/修改專案(分享專案及有關我的專案聯絡人)。也可建立任務及分配用戶的專案及任務
 Permission44=刪除專案（分享專案及有關我的專案聯絡人）
-Permission45=Export projects
+Permission45=匯出各式專案
 Permission61=讀取干預/介入
 Permission62=建立/修改干預/介入
 Permission64=刪除干預/介入
@@ -667,10 +673,10 @@ Permission86=發送客戶訂單
 Permission87=結束客戶訂單(結案)
 Permission88=取消客戶訂單
 Permission89=刪除客戶訂單
-Permission91=讀取社會或年度稅務及營業稅
-Permission92=建立/修改社會或年度稅務及營業稅
-Permission93=刪除社會或年度稅務及營業稅
-Permission94=匯出社會或年度稅務及營業稅
+Permission91=讀取社會或年度稅費及營業稅
+Permission92=建立/修改社會或年度稅費及營業稅
+Permission93=刪除社會或年度稅費及營業稅
+Permission94=匯出社會或年度稅費及營業稅
 Permission95=讀取報告
 Permission101=讀取出貨資訊
 Permission102=建立/修改出貨單
@@ -702,11 +708,11 @@ Permission162=建立/修改合約/訂閱
 Permission163=啟動服務合約/合約的訂閱
 Permission164=禁用服務合約/合約的訂閱
 Permission165=刪除合約/訂閱
-Permission167=Export contracts
+Permission167=匯出合約
 Permission171=讀取旅費(您與您的部屬)
 Permission172=建立及修改旅費
 Permission173=刪除旅費
-Permission174=Read all trips and expenses
+Permission174=讀取全部旅費及費用
 Permission178=匯出旅費
 Permission180=讀取供應商資訊
 Permission181=讀取供應商訂單
@@ -781,17 +787,17 @@ Permission401=讀取折扣
 Permission402=建立/修改折扣
 Permission403=驗證折扣
 Permission404=刪除折扣
-Permission501=Read employee contracts/salaries
-Permission502=Create/modify employee contracts/salaries
-Permission511=Read payment of salaries
-Permission512=Create/modify payment of salaries
-Permission514=Delete salaries
-Permission517=Export salaries
-Permission520=Read Loans
-Permission522=Create/modify loans
-Permission524=Delete loans
-Permission525=Access loan calculator
-Permission527=Export loans
+Permission501=讀取員工合約/薪資
+Permission502=建立/修改員工合約/薪資
+Permission511=讀取薪資的付款方式
+Permission512=建立/修改支付的薪資
+Permission514=刪除薪資
+Permission517=匯出薪資
+Permission520=讀取借款
+Permission522=建立/修改借款
+Permission524=刪除借款
+Permission525=存取借款計算器
+Permission527=匯出借款
 Permission531=讀取服務
 Permission532=建立/修改服務
 Permission534=刪除服務
@@ -800,13 +806,13 @@ Permission538=匯出服務
 Permission701=讀取捐款
 Permission702=建立/修改捐款
 Permission703=刪除捐款
-Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
-Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
-Permission775=Approve expense reports
-Permission776=Pay expense reports
-Permission779=Export expense reports
+Permission771=讀取費用報表(您自己及您下屬的)
+Permission772=建立/修改費用報表
+Permission773=刪除費用報表
+Permission774=讀取全部費用報表(甚至非屬於用戶的下屬)
+Permission775=核准費用報表
+Permission776=支付費用報表
+Permission779=匯出費用報表
 Permission1001=讀取庫存資訊
 Permission1002=建立/修改倉庫
 Permission1003=刪除倉庫
@@ -824,7 +830,7 @@ Permission1185=核准供應商訂單
 Permission1186=訂購供應商訂單
 Permission1187=告知供應商訂單的接收資訊
 Permission1188=刪除供應商訂單
-Permission1190=Approve (second approval) supplier orders
+Permission1190=核准(第二次核准)供應商訂單
 Permission1201=取得匯出結果
 Permission1202=建立/修改匯出
 Permission1231=讀取供應商發票
@@ -836,14 +842,14 @@ Permission1236=匯出供應商發票、屬性及其付款資訊
 Permission1237=匯出供應商訂單及其詳細資料
 Permission1251=執行匯入大量外部資料到資料庫的功能 (載入資料)
 Permission1321=匯出客戶發票、屬性及其付款資訊
-Permission1322=Reopen a paid bill
+Permission1322=重啟已付帳單
 Permission1421=匯出客戶訂單及屬性資訊
-Permission20001=Read leave requests (your leaves and the one of your subordinates)
-Permission20002=Create/modify your leave requests (yours leaves and the one of your subordinates)
-Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin leave requests (setup and update balance)
+Permission20001=讀取離職需求(您的離職及您的下屬)
+Permission20002=建立/修改您離職需求(您的離職及您的下屬)
+Permission20003=刪除離職需求
+Permission20004=讀取全部離職需求 (甚至非您下屬的用戶)
+Permission20005=建立/修改全部人離職需求(甚至非您下屬的用戶)
+Permission20006=管理員離職需求(設定及昇級平衡)
 Permission23001=讀取預定工作
 Permission23002=建立/更新預定工作
 Permission23003=刪除預定工作
@@ -854,66 +860,66 @@ Permission2403=刪除連結到其帳戶的行動（事件或任務）
 Permission2411=讀取其他的行動（事件或任務）
 Permission2412=建立/修改其他的行動（事件或任務）
 Permission2413=刪除其他的行動（事件或任務）
-Permission2414=Export actions/tasks of others
+Permission2414=匯入其他的行動/任務
 Permission2501=讀取/下載文件
 Permission2502=下載文件
 Permission2503=提交或刪除文件
-Permission2515=設定文件的檔案目錄
+Permission2515=設定文件的各式資料夾
 Permission2801=在唯讀模式下使用 FTP 客戶端 (僅瀏覽及下載)
 Permission2802=在寫入模式下使用 FTP 客戶端 (可刪除或上傳檔案)
-Permission50101=使用銷售時點情報系統
+Permission50101=使用收銀機
 Permission50201=讀取交易
 Permission50202=匯入交易
-Permission54001=Print
-Permission55001=Read polls
-Permission55002=Create/modify polls
-Permission59001=Read commercial margins
-Permission59002=Define commercial margins
-Permission59003=Read every user margin
-Permission63001=Read resources
-Permission63002=Create/modify resources
-Permission63003=Delete resources
-Permission63004=Link resources to agenda events
-DictionaryCompanyType=Types of thirdparties
-DictionaryCompanyJuridicalType=Legal forms of thirdparties
-DictionaryProspectLevel=展望潛在水平
+Permission54001=列印
+Permission55001=讀取問卷
+Permission55002=建立/修改問卷
+Permission59001=讀取商業邊際利潤
+Permission59002=定義商業邊際利潤
+Permission59003=取得每位用戶利潤
+Permission63001=讀取資源
+Permission63002=建立/修改資源
+Permission63003=刪除資源
+Permission63004=連線資源到行程事件
+DictionaryCompanyType=合作方類型
+DictionaryCompanyJuridicalType=合作方的法律形式
+DictionaryProspectLevel=展望潛在水準
 DictionaryCanton=州/省
 DictionaryRegion=地區
 DictionaryCountry=國家
 DictionaryCurrency=幣別
-DictionaryCivility=Personal and professional titles
-DictionaryActions=Types of agenda events
-DictionarySocialContributions=Social or fiscal taxes types
-DictionaryVAT=營業稅率
-DictionaryRevenueStamp=Amount of revenue stamps
+DictionaryCivility=個人及專業頭銜
+DictionaryActions=行程事件的類型
+DictionarySocialContributions=社會或年度稅費類型
+DictionaryVAT=營業稅率或銷售稅率
+DictionaryRevenueStamp=收入印花稅的金額
 DictionaryPaymentConditions=付款條件
 DictionaryPaymentModes=付款方式
-DictionaryTypeContact=聯絡人類型
-DictionaryTypeOfContainer=Type of website pages/containers
-DictionaryEcotaxe=Ecotax指令（WEEE）
+DictionaryTypeContact=聯絡人/地址類型
+DictionaryTypeOfContainer=網站頁面/容器的類型
+DictionaryEcotaxe=Ecotax（WEEE）
 DictionaryPaperFormat=文件格式
-DictionaryFormatCards=Cards formats
-DictionaryFees=Expense report - Types of expense report lines
-DictionarySendingMethods=出貨方式
+DictionaryFormatCards=卡片格式
+DictionaryFees=費用報表-費用報表類型行
+DictionarySendingMethods=裝貨方式
 DictionaryStaff=員工人數
 DictionaryAvailability=遲延交付
-DictionaryOrderMethods=排列方法
-DictionarySource=訂單來源方式
-DictionaryAccountancyCategory=Personalized groups for reports
-DictionaryAccountancysystem=Models for chart of accounts
+DictionaryOrderMethods=下訂方法
+DictionarySource=原始的提案/建議書/訂單
+DictionaryAccountancyCategory=報表的個人化群組
+DictionaryAccountancysystem=會計項目表的模組
 DictionaryAccountancyJournal=各式會計日記簿
-DictionaryEMailTemplates=Emails templates
+DictionaryEMailTemplates=電子郵件的範本
 DictionaryUnits=單位
-DictionaryProspectStatus=Prospection status
-DictionaryHolidayTypes=Types of leaves
+DictionaryProspectStatus=預測狀況
+DictionaryHolidayTypes=離職類型
 DictionaryOpportunityStatus=專案/潛在客戶的機會狀況
-DictionaryExpenseTaxCat=Expense report - Transportation categories
-DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryExpenseTaxCat=費用報表 -  交通各式類別
+DictionaryExpenseTaxRange=費用報表 - 依交通類別劃分範圍
 SetupSaved=設定值已儲存
-SetupNotSaved=Setup not saved
-BackToModuleList=返回模組清單
-BackToDictionaryList=回到設定選項清單
-TypeOfRevenueStamp=Type of revenue stamp
+SetupNotSaved=設定未儲存
+BackToModuleList=返回模組清單明細
+BackToDictionaryList=回到詞典明細清單
+TypeOfRevenueStamp=稅收類型
 VATManagement=營業稅管理
 VATIsUsedDesc=當建立潛在客戶、發票、訂單等營業稅稅率會以下列標準規則啟動：<br>若賣方不接受營業稅，則營業稅預設為 0 的規則。<br>若(買賣雙方國家)相同時，營業稅率會預設為賣方國家的產品營業稅。<br>若賣方與買方皆歐盟國家且貨物是運輸產品(車子、船舶、飛機)，則預設營業稅為 0 ( 營業稅由買方支付給買方國家，非賣方 )。<br>若賣方與買方皆歐盟國家且買方非公司組織，則營業稅預設為銷售產品的營業稅。<br>若賣方與買方皆歐盟國家且買方是公司組織，則營業稅預設為 0。<br>其他例子則預設營業稅為 0。
 VATIsNotUsedDesc=預設情況下建議的營業稅為 0，可用於像協會、個人或是小型公司。
@@ -943,26 +949,26 @@ LocalTax2IsUsedDescES= 當在建立潛在客戶、發票、訂單等後續活動
 LocalTax2IsNotUsedDescES= 預設的 IRPF 建議值為0。
 LocalTax2IsUsedExampleES= 在西班牙，自由職業者及提供服務的專業人士及選擇稅務系統模組的公司。
 LocalTax2IsNotUsedExampleES= 在西班牙他們是生意不是稅務系統模組話題。
-CalcLocaltax=Reports on local taxes
-CalcLocaltax1=Sales - Purchases
-CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
+CalcLocaltax=地方稅報表
+CalcLocaltax1=銷貨 - 採購
+CalcLocaltax1Desc=地方稅報表是由銷貨的地方稅與採購的地方稅之差異。
 CalcLocaltax2=可否採購
-CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
+CalcLocaltax2Desc=地方稅報表是地方稅採購總數
 CalcLocaltax3=可否銷售
-CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
+CalcLocaltax3Desc=地方稅報表是地方稅銷貨總數
 LabelUsedByDefault=若代號沒有找翻譯字句，則預設使用標籤
 LabelOnDocuments=文件上的標籤
 NbOfDays=Nb 的天數
 AtEndOfMonth=月底
-CurrentNext=Current/Next
+CurrentNext=現在/下一個
 Offset=抵銷
 AlwaysActive=始終啟動
 Upgrade=升級
 MenuUpgrade=升級/擴充
 AddExtensionThemeModuleOrOther=部署/安裝外部程式/模組
 WebServer=網頁伺服器
-DocumentRootServer=網頁伺服器的根目錄
-DataRootServer=資料檔案的檔案目錄
+DocumentRootServer=網頁伺服器的根資料夾
+DataRootServer=資料檔案的資料夾
 IP=IP
 Port=連接埠
 VirtualServerName=虛擬服務器名稱
@@ -982,19 +988,19 @@ NbOfRecord=Nb 的記錄
 Host=服務器
 DriverType=驅動程式類型
 SummarySystem=系統資訊摘要
-SummaryConst=所有 Dolibarr 設定參數清單
+SummaryConst=所有 Dolibarr 設定參數清單明細
 MenuCompanySetup=公司/組織
 DefaultMenuManager= 標準選單管理器
 DefaultMenuSmartphoneManager=智慧型手機選單管理器
 Skin=佈景主題
 DefaultSkin=預設佈景主題
-MaxSizeList=清單的最大長度
-DefaultMaxSizeList=預設清單的最大長度
-DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
+MaxSizeList=清單明細的最大長度
+DefaultMaxSizeList=預設清單明細的最大長度
+DefaultMaxSizeShortList=縮短名單預設最大長度（即在客戶卡中）
 MessageOfDay=一天的訊息
 MessageLogin=登錄頁的訊息
-LoginPage=Login page
-BackgroundImageLogin=Background image
+LoginPage=登入頁面
+BackgroundImageLogin=背景圖片
 PermanentLeftSearchForm=左側選單上的尋找表單
 DefaultLanguage=預設使用語言（語言代號）
 EnableMultilangInterface=啟用多語言界面
@@ -1007,7 +1013,7 @@ CompanyZip=郵遞區號
 CompanyTown=鄉鎮市區
 CompanyCountry=國家
 CompanyCurrency=主要貨幣
-CompanyObject=Object of the company
+CompanyObject=公司的物件
 Logo=組織標誌
 DoNotSuggestPaymentMode=不建議
 NoActiveBankAccountDefined=沒有定義有效的銀行帳戶
@@ -1018,8 +1024,8 @@ Alerts=警告
 DelaysOfToleranceBeforeWarning=警告提醒
 DelaysOfToleranceDesc=此螢幕允許您定義對每一元件用形狀%s的螢幕警告提醒。
 Delays_MAIN_DELAY_ACTIONS_TODO=在已計劃的事件(行程事件)中尚未完成的警告提醒(以天計)
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=沒有即時結束專案提醒的延遲容忍度（以天為單位）
-Delays_MAIN_DELAY_TASKS_TODO=Delay tolerance (in days) before alert on planned tasks (project tasks) not completed yet
+Delays_MAIN_DELAY_PROJECT_TO_CLOSE=沒有即時結束專案的警告提醒(以天計)
+Delays_MAIN_DELAY_TASKS_TODO=計劃中任務(專案任務)尚未完成前的警告提醒(以天計)
 Delays_MAIN_DELAY_ORDERS_TO_PROCESS=對訂單尚未完成程序的警告提醒(以天計)
 Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=對供應商訂單尚未完成的警告提醒(以天計)
 Delays_MAIN_DELAY_PROPALS_TO_CLOSE=在結束提案前的警告提醒(以天計)
@@ -1031,45 +1037,46 @@ Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=對尚未付款客戶發票的警告提
 Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=正在等待銀行對帳的警告提醒(以天計)
 Delays_MAIN_DELAY_MEMBERS=對延遲會員費用的警告提醒(以天計)
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=檢查存款的警告提醒(以天計)
-Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
+Delays_MAIN_DELAY_EXPENSEREPORTS=費用報表核准前的警告提醒(以天計)
 SetupDescription1=在使用 Dolibarr 前"設定區"是一開始要設定的參數。
-SetupDescription2=這兩個必需的設定步驟是左側設定選單中的前兩個步驟：%s設定頁面及%s設定頁面：
-SetupDescription3=在選單的參數<a href="%s">%s -> %s</a>是必須的，因為在 Dolibarr 螢幕會使用到定義的資料及以客制化的預設軟體行為(例如與各國相關的功能)
-SetupDescription4=在選單的參數<a href="%s">%s -> %s</a>是必須的，因為 Dolibarr ERP/CRM 是數個模組/程式的集合，或多或少是獨立的。每一啟動的模組會增加選單的功能。
+SetupDescription2=The two mandatory setup steps are the following steps (the two first entries in the left setup menu):
+SetupDescription3=Settings in menu <a href="%s">%s -> %s</a>. This step is required because it defines data used on Dolibarr screens to customize the default behavior of the software (for country-related features for example).
+SetupDescription4=Settings in menu <a href="%s">%s -> %s</a>. This step is required because Dolibarr ERP/CRM is a collection of several modules/applications, all more or less independent. New features are added to menus for every module you activate.
 SetupDescription5=其他選單項管理可選的參數。
 LogEvents=安全稽核事件
 Audit=稽核
 InfoDolibarr=關於 Dolibarr
-InfoBrowser=About Browser
+InfoBrowser=有關於瀏覽器
 InfoOS=關於作業系統
 InfoWebServer=關於網頁伺服器
 InfoDatabase=關於資料庫
 InfoPHP=關於 PHP
-InfoPerf=About Performances
-BrowserName=Browser name
-BrowserOS=Browser OS
-ListOfSecurityEvents=Dolibarr 安全事件清單
+InfoPerf=有關效/性能
+BrowserName=瀏覽器名稱
+BrowserOS=瀏覽器操作系統
+ListOfSecurityEvents=Dolibarr 安全事件清單明細
 SecurityEventsPurged=清除安全事件
-LogEventDesc=您可以啟動記錄 Dolibarr 安全事件日誌。管理員就可以透過選單<b>系統工具-稽核</b> 看到內容。警告，此功能在資料庫中消耗了大量資料。
+LogEventDesc=您可以啟用記錄 Dolibarr 安全事件日誌。管理員就可以透過選單<b>系統工具-稽核</b> 看到內容。警告，此功能在資料庫中消耗了大量資料。
 AreaForAdminOnly=設定參數僅由<b>管理員用戶</b>設定。
 SystemInfoDesc=僅供具有系統管理員以唯讀及可見模式取得系統資訊。
 SystemAreaForAdminOnly=此區僅供具有管理員權限用戶。Dolibarr 權限都不能減少此限制。
-CompanyFundationDesc=在此頁編輯你需要管理的公司或是基金會的全部已知資訊(點選下方的"修改"或是儲存"鈕)。
-AccountantDesc=Edit on this page all known information about your accountant/bookkeeper
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "%s" or "%s" button at bottom of page)
+AccountantDesc=在此頁面上編輯有關於您的會計師/記帳士的資訊
+AccountantFileNumber=File number
 DisplayDesc=您可以選擇與 Dolibarr 的外觀及感受有關的每一項參數
 AvailableModules=可用的程式/模組
 ToActivateModule=為啟動模組則到設定區（首頁 -> 設定 -> 模組）。
 SessionTimeOut=連線階段超時
 SessionExplanation=當此連線階段由內部PHP連線階段清除器清除時(沒有別的)，此數字保證連線階段在遞延前不會到期。內部PHP連線階段清除器不會保證此遞延後的連線階段將會到期。當連線階段清除器在執行時，則此遞延之後將會到期，所以每個<b>%s/%s</b>存取，不只限制由其他階段存取的期間。<br>注意：有外部連線階段清除機器的某些伺服器( DEBIAN, UBUNTU 下的 CRON)，不論參數值多少，當預設參數<strong>session.gc_maxlifetime</strong>定義後，連線階段會被破壞。
 TriggersAvailable=可用的觸發器
-TriggersDesc=觸發器是可以修改Dolibarr工作流程行為的檔案，一旦複製到該檔案目錄<b>/htdocs/core/triggers</b>。他們實現了新的行動，啟動 Dolibarr 事件（新公司的建立，發票驗證...)。
+TriggersDesc=觸發器是可以修改Dolibarr工作流程行為的檔案，一旦複製到該資料夾<b>/htdocs/core/triggers</b>。他們實現了新的行動，啟動 Dolibarr 事件（新公司的建立，發票驗證...)。
 TriggerDisabledByName=在此檔案中觸發器是禁用的，其名稱尾碼<b>-NORUN</b>。
 TriggerDisabledAsModuleDisabled=當模組<b>%s</b>禁用時，此檔案中觸發器是禁用的。
 TriggerAlwaysActive=此檔案中觸發器是活躍的，無論啟動任何 Dolibarr 模組。
-TriggerActiveAsModuleActive=當模組<b>%s</b>為啟動時，此檔案中觸發器是可用的。
+TriggerActiveAsModuleActive=當模組<b>%s</b>為啟用時，此檔案中觸發器是可用的。
 GeneratedPasswordDesc=在此定義當您詢問需要自動產生密碼時，您就要使用新密碼
-DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=此頁允許您編輯所有不在前頁的參數。這些主要是為開發人員或進階故障排除預留參數。<a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">在此可檢查</a>選項清單。
+DictionaryDesc=插入全部參考資料。您可加入您的預設值。
+ConstDesc=此頁允許您編輯所有不在前頁的參數。這些主要是為開發人員或進階故障排除預留參數。<a href="https://wiki.dolibarr.org/index.php/Setup_Other#List_of_known_hidden_options" title="External Site - opens in a new window" target="_blank">在此可檢查</a>選項清單明細。
 MiscellaneousDesc=所有其他與安全參數有關的在此定義。
 LimitsSetup=限制及精準度設定
 LimitsDesc=在此 Dolibarr 使用您定義的限制、精準度及最佳化。
@@ -1080,17 +1087,17 @@ MAIN_ROUNDING_RULE_TOT=捨去範圍的步驟 (對於基數為10以外的國家/
 UnitPriceOfProduct=產品的淨單位價格
 TotalPriceAfterRounding=捨去後總價格（淨價/營業稅/含稅價）
 ParameterActiveForNextInputOnly=下一個輸入參數才能有效
-NoEventOrNoAuditSetup=尚未有被記錄的安全事件。若“設定 - 安全 - 稽核”頁面沒有啟動稽核，則為正常的。
+NoEventOrNoAuditSetup=尚未有被記錄的安全事件。若“設定 - 安全 - 稽核”頁面沒有啟用稽核，則為正常的。
 NoEventFoundWithCriteria=沒有搜尋到此條件的安全事件。
 SeeLocalSendMailSetup=查看本地的 sendmail 的設定
 BackupDesc=為了完整的 Dolibarr 備份，您必須：
-BackupDesc2=儲存文件檔案目錄的內 (<b>%s</b>) 包含所有已上傳及產生的檔案 ( 所以此包含在步驟1中所有產生的轉存檔案 )
+BackupDesc2=儲存文件資料夾內容 (<b>%s</b>) 包含所有已上傳及產生的檔案 ( 所以此包含在步驟1中所有產生的轉存檔案 )
 BackupDesc3=儲存您資料庫的內容(<b>%s</b>)到轉存檔案。為完成此您要使用接下來的助理。
-BackupDescX=檔案目錄應該被存放於安全的地方。
+BackupDescX=資料夾應該被存放於安全的地方。
 BackupDescY=產生的轉存檔案應存放於安全的地方。
 BackupPHPWarning=此法不能保證可備份。使用上一個
 RestoreDesc=還原 Dolibarr 備份檔，您必須：
-RestoreDesc2=還原文件目錄的檔案 (例如 ZIP 檔) 是將以樹狀目錄的方式解壓檔案到新安裝 Dolibarr 的文件檔案目錄內或是解到目前文件檔案目錄(<b>%s</b>)。
+RestoreDesc2=還原文件資料夾的檔案 (例如 ZIP 檔) 是將以樹狀目錄的方式解壓檔案到新安裝 Dolibarr 的文件資料夾內或是解到目前文件資料夾(<b>%s</b>)。
 RestoreDesc3=從備份轉存檔案還原的資料匯入到新安裝的 Dolibarr 或是目前已安裝的程式 (<b>%s</b>)。警告，一旦還原完成，您必須使用回復的資料庫中的用戶及密碼重新連線。還原備份資料庫到目前已安裝的程式，你可以依照接以下的幫助處理。
 RestoreMySQL=匯入 MySQL
 ForcedToByAModule= 啟動的模組<b>%s</b>都強制適用此規則
@@ -1105,11 +1112,11 @@ ShowProfIdInAddress=顯示在文件中專業  ID
 ShowVATIntaInAddress=隱藏在文件中營業稅內部編號
 TranslationUncomplete=部分翻譯
 MAIN_DISABLE_METEO=禁用氣象檢視
-MeteoStdMod=Standard mode
-MeteoStdModEnabled=Standard mode enabled
-MeteoPercentageMod=Percentage mode
-MeteoPercentageModEnabled=Percentage mode enabled
-MeteoUseMod=Click to use %s
+MeteoStdMod=標準模式
+MeteoStdModEnabled=標準模式啟用
+MeteoPercentageMod=百分比模式
+MeteoPercentageModEnabled=百分比模式啟用
+MeteoUseMod=點擊使用 %s
 TestLoginToAPI=測試登入到 API
 ProxyDesc=Dolibarr 的某些功能需要連上網路工作。此定義為這類參數。，如果 Dolibarr 服務器是在隱藏在代理服務器後，則那些參數為通知 Dolibarr 要如何通過它來連上網路。
 ExternalAccess=外部存取
@@ -1120,245 +1127,248 @@ MAIN_PROXY_USER=登入使用代理服務器
 MAIN_PROXY_PASS=使用代理服務器的密碼
 DefineHereComplementaryAttributes=在此定義全部屬性，也包含了預設可用的屬性，以便讓 %s 模組可以支援顯示。
 ExtraFields=補充屬性
-ExtraFieldsLines=Complementary attributes (lines)
-ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
+ExtraFieldsLines=補充屬性(行)
+ExtraFieldsLinesRec=補充屬性 ( 範本發票行)
+ExtraFieldsSupplierOrdersLines=補充屬性(訂單行)
+ExtraFieldsSupplierInvoicesLines=補充屬性(發票行)
 ExtraFieldsThirdParties=補充屬性(合作方)
 ExtraFieldsContacts=補充屬性(聯絡資訊/地址)
 ExtraFieldsMember=補充屬性(會員)
 ExtraFieldsMemberType=補充屬性(會員類型)
 ExtraFieldsCustomerInvoices=補充屬性(發票)
-ExtraFieldsCustomerInvoicesRec=Complementary attributes (templates invoices)
+ExtraFieldsCustomerInvoicesRec=互補屬性(範本發票)
 ExtraFieldsSupplierOrders=補充屬性(訂單)
 ExtraFieldsSupplierInvoices=補充屬性(發票)
 ExtraFieldsProject=補充屬性(專案)
 ExtraFieldsProjectTask=補充屬性(任務)
 ExtraFieldHasWrongValue=屬性 %s 有錯誤值。
-AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
+AlphaNumOnlyLowerCharsAndNoSpace=只限字母數字和小寫字元且沒有空格
 SendmailOptionNotComplete=警告，在某些Linux系統，從您的電子郵件發送電子郵件，必須包含 sendmail 的執行設置選項 -ba（在您的 php.ini 檔案設定參數 mail.force_extra_parameters ）。如果收件人沒有收到電子郵件，嘗試編輯 mail.force_extra_parameters = -ba 這個PHP參數。
 PathToDocuments=文件路徑
-PathDirectory=目錄
-SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
+PathDirectory=資料夾
+SendmailOptionMayHurtBuggedMTA=傳送郵件使用 "PHP mail direct" 的功能可能會由接收方郵件伺服器產生不正確的郵件訊息。結果是某些郵件無法讀取。這是因為某些網路供應商(例如在法國的 Orange)。這不是 Dolibarr 也不是 PHP 問題，而是接收郵件伺服器的問題。然而您可修改在「設定-其他」並增加一個選項 MAIN_FIX_FOR_BUGGED_MTA 為 1 以避免這個問題。然而您也可能有經歷過其他嚴格遵守 SMTP 標準的伺服器問題。因此其他解決方式 (建議) 是使用 "SMTP socket library" 會比較沒有風險。
 TranslationSetup=翻譯設定
-TranslationKeySearch=Search a translation key or string
-TranslationOverwriteKey=Overwrite a translation string
+TranslationKeySearch=尋找翻譯值或字串
+TranslationOverwriteKey=覆寫翻譯字串
 TranslationDesc=如何設定顯示應用程式語言: <br>* 系統上: 選單 <strong> 首頁 - 設定 - 顯示</strong><br> * 每個人: 在用戶卡 (點選螢幕最上方的用戶) 使用 <strong>用戶顯示設定</strong> 分頁。
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
-TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
-TranslationString=Translation string
-CurrentTranslationString=Current translation string
-WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
-NewTranslationStringToShow=New translation string to show
-OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exists in any language files
+TranslationOverwriteDesc=您也可以用覆寫的方式填滿接下來的表格。選擇您的語言從 "%s" 下拉，插入翻譯字串到 "%s" 及您的新翻譯到 "%s"
+TranslationOverwriteDesc2=您可使用其他分頁幫助您使用知道的翻譯值
+TranslationString=翻譯字串
+CurrentTranslationString=目前翻譯字串
+WarningAtLeastKeyOrTranslationRequired=搜索條件至少要有一個值或翻譯字串
+NewTranslationStringToShow=顯示新翻譯字串
+OriginalValueWas=已覆蓋原始翻譯。 原始值是：<br><br>%s
+TransKeyWithoutOriginalValue=您強制不存在於任何語言檔案中新翻譯的翻譯值 '<strong>%s</strong>' 
 TotalNumberOfActivatedModules=已啟動程式/模組: <b>%s</b> / <b>%s</b>
-YouMustEnableOneModule=您至少要啟動 1 個模組
+YouMustEnableOneModule=您至少要啟用 1 個模組
 ClassNotFoundIntoPathWarning=在 PHP 路徑沒有找到 Class %s
 YesInSummer=是的，在夏天
 OnlyFollowingModulesAreOpenedToExternalUsers=注意，接下來的模組由外部用戶 ( 無論用戶的權限為何 ) 開啟且只有授權的情況下：
 SuhosinSessionEncrypt=以 Suhosin 加密方式儲存連線階段
 ConditionIsCurrently=目前情況 %s
-YouUseBestDriver=You use driver %s that is best driver available currently.
-YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization.
-SearchOptim=Search optimization
-YouHaveXProductUseSearchOptim=You have %s product into database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 into Home-Setup-Other, you limit the search to the beginning of strings making possible for database to use index and you should get an immediate response.
-BrowserIsOK=You are using the web browser %s. This browser is ok for security and performance.
-BrowserIsKO=You are using the web browser %s. This browser is known to be a bad choice for security, performance and reliability. We recommand you to use Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
-AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp".
-AskForPreferredShippingMethod=Ask for preferred Sending Method for Third Parties.
-FieldEdition=外地版 %s
-FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
-GetBarCode=Get barcode
+YouUseBestDriver=目前您可用的驅動程式 %s。
+YouDoNotUseBestDriver=您必須驅動%s，但建議用%s的驅動程式
+NbOfProductIsLowerThanNoPb=您只能放%s產品/服務到資料庫中。不用任何的最佳化程序。
+SearchOptim=最佳化的蒐尋
+YouHaveXProductUseSearchOptim=您放%s產品到資料庫中。您必須在「首頁-設定-其他」增加常數 PRODUCT_DONOTSEARCH_ANYWHERE 為 1 。您限制在資料庫中使用索引以便一輸入字串即蒐尋，以便您立即反應。
+BrowserIsOK=您使用瀏覽器為%s。此瀏覽器在安全及效能上是沒問題的。
+BrowserIsKO=您使用中的瀏覽器為%s。此瀏覽器在安全、效能及可靠上是不好的選。我們建議您使用 Firefox, Chrome, Opera 或 Safari。
+XDebugInstalled=已載入 XDebug。
+XCacheInstalled=已載入 XCache。
+AddRefInList=在清單明細(選擇清單明細或是混合框)中顯示客戶/供應商參考資訊及超連結。合作方將以"CC12345 - SC45678 - The big company coorp"代替"The big company coorp"的名稱顯現。
+AskForPreferredShippingMethod=詢問合作方的預備傳送方法
+FieldEdition=欗位的編輯 %s
+FillThisOnlyIfRequired=例如： +2 (若遇到時區偏移問題時才填寫)
+GetBarCode=取得條碼
 ##### Module password generation
 PasswordGenerationStandard=回到由 Dolibarr 本身算法所產生的密碼：8個字元，包含小寫數字和字元。
 PasswordGenerationNone=不建議產生任何密碼，必須由人工輸入。
-PasswordGenerationPerso=Return a password according to your personally defined configuration.
-SetupPerso=According to your configuration
-PasswordPatternDesc=Password pattern description
+PasswordGenerationPerso=根據您個人定義的偏號設定返回密碼。
+SetupPerso=根據你的偏好設定
+PasswordPatternDesc=密碼模式描述
 ##### Users setup #####
 RuleForGeneratedPasswords=依建議的規則產生密碼或驗證密碼
 DisableForgetPasswordLinkOnLogonPage=在登入頁面不顯示連結“忘記密碼”的連線
 UsersSetup=用戶模組設定
 UserMailRequired=建立用戶時需要輸入電子郵件資訊
 ##### HRM setup #####
-HRMSetup=HRM module setup
+HRMSetup=人資模組設定
 ##### Company setup #####
 CompanySetup=各式公司模組設定
-CompanyCodeChecker=產生及檢查合作方代號的模組(客戶或供應商)
-AccountCodeManager=產生會計代號的模組(客戶或供應商)
-NotificationsDesc=EMail 通知功能允許您在某些 Dolibarr 事件時自動傳送郵件。通知的標的如下：
-NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
-NotificationsDescGlobal=* or by setting global target emails in module setup page.
+CompanyCodeChecker=Module for third parties code generation and checking (customer or vendor)
+AccountCodeManager=Module for accounting code generation (customer or vendor)
+NotificationsDesc=電子郵件通知功能允許您在某些 Dolibarr 事件時自動傳送郵件。通知的標的如下：
+NotificationsDescUser=在時間內 * 每位用戶，一用戶。
+NotificationsDescContact=* per third parties contacts (customers or vendors), one contact at time.
+NotificationsDescGlobal=* 或在模組設定頁面中設定全域目標的電子郵件。
 ModelModules=文件範本
 DocumentModelOdt=從 OpenDocument 的範本產生文件(可由 OpenOffice, KOffice, TextEdit 開啟的 .ODT 或.ODS檔案)
 WatermarkOnDraft=在草稿文件上產生浮水印字串(如果以下文字框不是空字串)
-JSOnPaimentBill=Activate feature to autofill payment lines on payment form
+JSOnPaimentBill=啟動在付款表單中自動填入付款行的功能
 CompanyIdProfChecker=專業術語欄位ID是否獨一無二
 MustBeUnique=必須是唯一值？
 MustBeMandatory=強制建立合作方？
 MustBeInvoiceMandatory=強制驗證發票？
-TechnicalServicesProvided=Technical services provided
+TechnicalServicesProvided=提供的科技服務
+#####DAV #####
+WebDAVSetupDesc=This is the links 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 need an existing login account/password to access to.
+WebDavServer=Root URL of %s server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=匯出連接到 <b>%s</b> 格式可在以下連結：%s的
 ##### Invoices #####
 BillsSetup=發票模組設定
 BillsNumberingModule=發票及貸方通知單編號模組
 BillsPDFModules=發票文件模組
-PaymentsPDFModules=Payment documents models
+PaymentsPDFModules=付款文件模式
 CreditNote=貸方通知單
 CreditNotes=貸方通知單
 ForceInvoiceDate=強制使用驗證日期為發票(invoice)日期
 SuggestedPaymentModesIfNotDefinedInInvoice=如果在發票上沒有定義付款方式，則其預設值。
 SuggestPaymentByRIBOnAccount=建議用匯款方式付款
 SuggestPaymentByChequeToAddress=建議用支票方式付款
-FreeLegalTextOnInvoices=輸入額外的發票資訊
+FreeLegalTextOnInvoices=在發票中加註文字
 WatermarkOnDraftInvoices=在發票草稿上的浮水印(若空白則無)
-PaymentsNumberingModule=Payments numbering model
+PaymentsNumberingModule=付款編號模式
 SuppliersPayment=已收到的供應商付款單據清單
-SupplierPaymentSetup=Suppliers payments setup
+SupplierPaymentSetup=供應商付款設定
 ##### Proposals #####
 PropalSetup=商業報價/提案模組設定
 ProposalsNumberingModules=商業報價/提案編號模式
 ProposalsPDFModules=商業報價/提案文件模式
-FreeLegalTextOnProposal=輸入額外的商業報價/提案
+FreeLegalTextOnProposal=在商業報價/提案中加註文字
 WatermarkOnDraftProposal=商業報價/提案草稿上的浮水印(若空白則無)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=詢問建議/提案/報價標的的銀行帳戶
 ##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
-WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
+SupplierProposalSetup=Price requests vendors module setup
+SupplierProposalNumberingModules=Price requests vendors numbering models
+SupplierProposalPDFModules=Price requests vendors documents models
+FreeLegalTextOnSupplierProposal=Free text on price requests vendors
+WatermarkOnDraftSupplierProposal=Watermark on draft price requests vendors (none if empty)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=詢問價格需求的目的地銀行帳戶
+WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=詢問訂單的倉庫來源
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of supplier order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
 OrdersSetup=訂單管理設定
 OrdersNumberingModules=訂單編號模組
 OrdersModelModule=訂單文件模式
-FreeLegalTextOnOrders=可在下面輸入額外的訂單資訊
+FreeLegalTextOnOrders=在訂單中加註文字
 WatermarkOnDraftOrders=訂單草稿上的浮水印(若空白則無)
-ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
+ShippableOrderIconInList=在訂單明細清單中增加指明訂單是否可出貨的圖示
+BANK_ASK_PAYMENT_BANK_DURING_ORDER=詢問訂單的目的地銀行帳戶
 ##### Interventions #####
-InterventionsSetup=干預模組設置
-FreeLegalTextOnInterventions=可在下面輸入額外的調停(干涉)資訊
-FicheinterNumberingModules=干預編號模組
-TemplatePDFInterventions=干預卡文件模式
-WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
+InterventionsSetup=干預/介入模組設定
+FreeLegalTextOnInterventions=在干預/介入文件中加註文字
+FicheinterNumberingModules=干預/介入編號模式
+TemplatePDFInterventions=干預/介入卡片文件模式
+WatermarkOnDraftInterventionCards=在干預/介入卡片文件上的浮水印(若無則空白)
 ##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
-ContractsNumberingModules=合同編號模組
-TemplatePDFContracts=Contracts documents models
-FreeLegalTextOnContracts=Free text on contracts
-WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
+ContractsSetup=合約/訂閱模組設定
+ContractsNumberingModules=合約編號模組
+TemplatePDFContracts=合約文件模式
+FreeLegalTextOnContracts=合約加註文字
+WatermarkOnDraftContractCards=草稿合約的浮水印(若空白則無)
 ##### Members #####
-MembersSetup=委員模組設置
+MembersSetup=會員模組設定
 MemberMainOptions=主要選項
-AdherentLoginRequired= 管理每個成員登錄
-AdherentMailRequired=電子郵件要求創建一個新成員
-MemberSendInformationByMailByDefault=複選框發送電子郵件確認為成員（驗證或新訂閲）預設是
-VisitorCanChooseItsPaymentMode=Visitor can choose among available payment modes
+AdherentLoginRequired= 管理每位會員登入
+AdherentMailRequired=建立一位新會員需要電子郵件
+MemberSendInformationByMailByDefault=預設傳送電子郵件以驗證成員（驗證或新訂閲）的確認鍵是開啟的
+VisitorCanChooseItsPaymentMode=訪客可選擇適合的付款模式
 ##### LDAP setup #####
-LDAPSetup=LDAP設置
-LDAPGlobalParameters=全局參數
+LDAPSetup=LDAP 設定
+LDAPGlobalParameters=全域參數
 LDAPUsersSynchro=用戶
 LDAPGroupsSynchro=群組
-LDAPContactsSynchro=往來
-LDAPMembersSynchro=成員
+LDAPContactsSynchro=通訊錄
+LDAPMembersSynchro= 會員
 LDAPMembersTypesSynchro=成員類型
-LDAPSynchronization=LDAP同步
-LDAPFunctionsNotAvailableOnPHP=LDAP的功能不可用在你的PHP
+LDAPSynchronization=LDAP 同步
+LDAPFunctionsNotAvailableOnPHP=您的 PHP 中的 LDAP 的功能無法使用
 LDAPToDolibarr=LDAP的 - > Dolibarr
-DolibarrToLDAP=Dolibarr - >的LDAP
-LDAPNamingAttribute=關鍵在LDAP
-LDAPSynchronizeUsers=在LDAP的用戶組織
-LDAPSynchronizeGroups=在LDAP群組組織
-LDAPSynchronizeContacts=在LDAP組織接觸
-LDAPSynchronizeMembers=地基的成員組織在LDAP
-LDAPSynchronizeMembersTypes=Organization of foundation's members types in LDAP
-LDAPPrimaryServer=主服務器
-LDAPSecondaryServer=中學服務器
-LDAPServerPort=服務器連接埠
+DolibarrToLDAP=Dolibarr - > LDAP
+LDAPNamingAttribute=在 LDAP 的關鍵值
+LDAPSynchronizeUsers=在 LDAP 中用戶的組織
+LDAPSynchronizeGroups=在 LDAP 中群組的組織
+LDAPSynchronizeContacts=在 LDAP 中通訊錄的組織
+LDAPSynchronizeMembers=在 LDAP 中基金會會員的組織
+LDAPSynchronizeMembersTypes=在 LDAP 中基金會組織的會員類型
+LDAPPrimaryServer=主要伺服器
+LDAPSecondaryServer=次要伺服器
+LDAPServerPort=伺服器連接埠
 LDAPServerPortExample=預設連接埠：389
-LDAPServerProtocolVersion=協議版本
-LDAPServerUseTLS=使用TLS
-LDAPServerUseTLSExample=您的LDAP服務器使用TLS
-LDAPServerDn=服務器的DN
-LDAPAdminDn=管理員的DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
+LDAPServerProtocolVersion=通訊協議版本
+LDAPServerUseTLS=使用 TLS
+LDAPServerUseTLSExample=您的 LDAP 服務器使用TLS
+LDAPServerDn=DN 的伺服器
+LDAPAdminDn=DN 的管理員
+LDAPAdminDnExample=完整 DN ( 例如：針對啟動資料夾 cn=admin, dc=example, dc=com 或  cn=Administrator, cn=Users, dc=example, dc=com )
 LDAPPassword=管理員密碼
 LDAPUserDn=用戶的DN
-LDAPUserDnExample=完整的DN（例如：歐=用戶，直流=社會，直流= com）上
-LDAPGroupDn=組'的DN
-LDAPGroupDnExample=完整的DN（例如：歐=組，直流=社會，直流= com）上
-LDAPServerExample=服務器地址（例如：本地主機，192.168.0.2，ldaps：/ / ldap.example.com /）
-LDAPServerDnExample=完整的DN（例如：直流=公司，直流= com）上
-LDAPDnSynchroActive=用戶和組同步
-LDAPDnSynchroActiveExample=LDAP來Dolibarr或Dolibarr到LDAP同步
-LDAPDnContactActive=聯繫人的同步
-LDAPDnContactActiveExample=激活/未活化同步
-LDAPDnMemberActive=議員的同步
-LDAPDnMemberActiveExample=激活/未活化同步
-LDAPDnMemberTypeActive=Members types' synchronization
-LDAPDnMemberTypeActiveExample=激活/未活化同步
-LDAPContactDn=Dolibarr接觸'的DN
-LDAPContactDnExample=完整的DN（例如：歐=接觸，直流=社會，直流= com）上
-LDAPMemberDn=Dolibarr成員的DN
-LDAPMemberDnExample=完整的DN（例如：歐=成員，直流=社會，直流= com）上
-LDAPMemberObjectClassList=objectClass 清單
-LDAPMemberObjectClassListExample=objectClass 清單已定義記錄屬性(例如：top,inetOrgPerson 或是 top, 啟動檔案目錄的用戶)
-LDAPMemberTypeDn=Dolibarr members types DN
-LDAPMemberTypepDnExample=Complete DN (ex: ou=memberstypes,dc=example,dc=com)
+LDAPUserDnExample=完整的DN ( 例如：ou=users, dc=example, dc=com )
+LDAPGroupDn=群組的 DN
+LDAPGroupDnExample=完整的 DN ( 例如：ou=groups, dc=example, dc=com )
+LDAPServerExample=伺服器網址 ( 例如： localhost, 192.168.0.2, ldaps://ldap.example.com/ )
+LDAPServerDnExample=完整的 DN ( 例如：dc=example,dc=com )
+LDAPDnSynchroActive=用戶和群組同步
+LDAPDnSynchroActiveExample=LDAP 到 Dolibarr 或 Dolibarr 到 LDAP 的同步
+LDAPDnContactActive=通訊錄同步
+LDAPDnContactActiveExample=啟動或不啟動同步
+LDAPDnMemberActive=會員的同步
+LDAPDnMemberActiveExample=啟動或不啟動同步
+LDAPDnMemberTypeActive=會員類型的同步化
+LDAPDnMemberTypeActiveExample=啟動/未啟動同步
+LDAPContactDn=Dolibarr 通訊錄的 DN
+LDAPContactDnExample=完整的 DN (例如: ou=contacts, dc=example, dc=com)
+LDAPMemberDn=Dolibarr 會員 DN
+LDAPMemberDnExample=完整的 DN (ex: ou=members,dc=example,dc=com)
+LDAPMemberObjectClassList=objectClass 清單明細
+LDAPMemberObjectClassListExample=objectClass 清單定義記錄屬性 ( 例如：top, inetOrgPerson 或 top, 啟動資料夾的用戶 )
+LDAPMemberTypeDn=Dolibarr 會員類型 DN
+LDAPMemberTypepDnExample=完整 DN (ex: ou=memberstypes,dc=example,dc=com)
 LDAPMemberTypeObjectClassList=objectClass的名單
 LDAPMemberTypeObjectClassListExample=定義（例如：記錄屬性objectclass列表的頂部，groupOfUniqueNames）
-LDAPUserObjectClassList=objectClass 清單
-LDAPUserObjectClassListExample=objectClass 清單已定義記錄屬性(例如：top,inetOrgPerson 或是 top, 啟動檔案目錄的用戶)
-LDAPGroupObjectClassList=objectClass 清單
-LDAPGroupObjectClassListExample=objectClass 清單已定義記錄屬性(例如：top,groupOfUniqueNames)
-LDAPContactObjectClassList=objectClass 清單
-LDAPContactObjectClassListExample=objectClass 清單已定義記錄屬性(例如：top,inetOrgPerson 或是 top, 啟動檔案目錄的用戶)
-LDAPTestConnect=測試LDAP連接
-LDAPTestSynchroContact=測試聯繫人的同步
+LDAPUserObjectClassList=objectClass 清單明細
+LDAPUserObjectClassListExample=objectClass 清單明細定義記錄屬性 ( 例如：top, inetOrgPerson 或 top, 啟動資料夾的用戶 )
+LDAPGroupObjectClassList=objectClass 清單明細
+LDAPGroupObjectClassListExample=objectClass 清單明細定義記錄屬性 ( 例如：top, groupOfUniqueNames )
+LDAPContactObjectClassList=objectClass 清單明細
+LDAPContactObjectClassListExample=objectClass 清單明細定義記錄屬性 ( 例如：top, inetOrgPerson 或 top, 啟動資料夾的用戶 )
+LDAPTestConnect=測試 LDAP 連線
+LDAPTestSynchroContact=測試通訊錄的同步
 LDAPTestSynchroUser=測試用戶的同步
-LDAPTestSynchroGroup=試驗組的同步
-LDAPTestSynchroMember=測試成員的同步
-LDAPTestSynchroMemberType=Test member type synchronization
-LDAPTestSearch= Test a LDAP search
+LDAPTestSynchroGroup=測試群組的同步
+LDAPTestSynchroMember=測試會員的同步
+LDAPTestSynchroMemberType=測試會員類型同步
+LDAPTestSearch= 測試 LDAP 蒐尋
 LDAPSynchroOK=同步測試成功
 LDAPSynchroKO=同步測試失敗
-LDAPSynchroKOMayBePermissions=同步失敗的考驗。檢查聯接到服務器的正確配置，並允許LDAP的udpates
-LDAPTCPConnectOK=TCP連接到LDAP服務器的成功（服務器=%s連接埠=%s）的
-LDAPTCPConnectKO=TCP連接到LDAP服務器失敗（服務器=%s連接埠=%s）的
-LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPBindKO=連接/ Authentificate到LDAP服務器失敗（服務器=%s連接埠=%s後，管理員=%s的，密碼=%s）的
-LDAPSetupForVersion3=LDAP服務器配置為第3版
-LDAPSetupForVersion2=LDAP服務器配置為版本2
-LDAPDolibarrMapping=Dolibarr映射
-LDAPLdapMapping=LDAP的映射
-LDAPFieldLoginUnix=登錄（Unix系統）
-LDAPFieldLoginExample=例如：的UID
-LDAPFilterConnection=搜尋篩選器
-LDAPFilterConnectionExample=例如：＆（objectClass的=的inetOrgPerson）
-LDAPFieldLoginSamba=登錄（桑巴，activedirectory）
-LDAPFieldLoginSambaExample=例如：sAMAccountName賦
-LDAPFieldFullname=名字名稱
-LDAPFieldFullnameExample=例如：架CN
+LDAPSynchroKOMayBePermissions=同步測試失敗。檢查連線到伺服器的設定是否正確，並允許 LDAP 的昇級
+LDAPTCPConnectOK=TCP 成功地連線到 LDAP 伺服器 ( 伺服器 = %s, 連接埠 = %s )
+LDAPTCPConnectKO=TCP 連線到 LDAP 伺服器失敗 (伺服器 = %s, 連接埠 = %s )
+LDAPBindOK=成功地連線/驗證到 LDAP 伺服器 ( 伺服器=%s, 連線埠=%s, 管理者 =%s, 密碼=%s)
+LDAPBindKO=連接/驗證到 LDAP 伺服器失敗 ( 伺服器=%s, 連接埠=%s, 管理者=%s, 密碼=%s)
+LDAPSetupForVersion3=第 3 版的 LDAP 伺服器設定
+LDAPSetupForVersion2=第 2 版的 LDAP 伺服器設定
+LDAPDolibarrMapping=Dolibarr 映射
+LDAPLdapMapping=LDAP 映射
+LDAPFieldLoginUnix=登入（Unix系統）
+LDAPFieldLoginExample=例如：uid
+LDAPFilterConnection=蒐尋篩選器
+LDAPFilterConnectionExample=例如：&(objectClass=inetOrgPerson）
+LDAPFieldLoginSamba=登入 (samba, activedirectory)
+LDAPFieldLoginSambaExample=例如：samaccountname
+LDAPFieldFullname=全名
+LDAPFieldFullnameExample=例如：CN
 LDAPFieldPasswordNotCrypted=不加密的密碼
 LDAPFieldPasswordCrypted=密碼加密的
-LDAPFieldPasswordExample=例如：userPassword時
-LDAPFieldCommonNameExample=例如：架CN
+LDAPFieldPasswordExample=例如：userPassword
+LDAPFieldCommonNameExample=例如：CN
 LDAPFieldName=名稱
-LDAPFieldNameExample=例如：錫
+LDAPFieldNameExample=例如：sn
 LDAPFieldFirstName=名字
-LDAPFieldFirstNameExample=例如：givenname
-LDAPFieldMail=電郵地址
+LDAPFieldFirstNameExample=例如：givenName
+LDAPFieldMail=電子郵件地址
 LDAPFieldMailExample=例如：郵件
 LDAPFieldPhone=專業的電話號碼
 LDAPFieldPhoneExample=例如：telephonenumber
@@ -1366,97 +1376,97 @@ LDAPFieldHomePhone=個人電話號碼
 LDAPFieldHomePhoneExample=例如：homephone
 LDAPFieldMobile=手機
 LDAPFieldMobileExample=例如：移動
-LDAPFieldFax=傳真號
+LDAPFieldFax=傳真號碼
 LDAPFieldFaxExample=例如：facsimiletelephonenumber
-LDAPFieldAddress=街頭
-LDAPFieldAddressExample=例如：街道
-LDAPFieldZip=拉鏈
+LDAPFieldAddress=街道名稱
+LDAPFieldAddressExample=例如：street
+LDAPFieldZip=郵遞區號
 LDAPFieldZipExample=例如：郵遞區號
-LDAPFieldTown=鎮
-LDAPFieldTownExample=例如：升
+LDAPFieldTown=鄉鎮區
+LDAPFieldTownExample=例如：l
 LDAPFieldCountry=國家
 LDAPFieldDescription=描述
 LDAPFieldDescriptionExample=例如：說明
-LDAPFieldNotePublic=Public Note
-LDAPFieldNotePublicExample=Example : publicnote
-LDAPFieldGroupMembers= 集團成員
+LDAPFieldNotePublic=公開註解
+LDAPFieldNotePublicExample=例如：公開註解
+LDAPFieldGroupMembers= 群組會員
 LDAPFieldGroupMembersExample= 例如：uniqueMember
 LDAPFieldBirthdate=生日
 LDAPFieldCompany=公司
-LDAPFieldCompanyExample=例如：O型
-LDAPFieldSid=的SID
-LDAPFieldSidExample=例如：的objectSID
-LDAPFieldEndLastSubscription=認購結束日期
-LDAPFieldTitle=Job position
-LDAPFieldTitleExample=Example: title
-LDAPSetupNotComplete=LDAP的安裝程序不完整的（對別人去標籤）
-LDAPNoUserOrPasswordProvidedAccessIsReadOnly=沒有管理員或密碼。 LDAP的訪問將是匿名的，在只讀模式。
-LDAPDescContact=此頁面允許您定義的LDAP屬性的LDAP樹就Dolibarr接觸發現每個數據的名稱。
-LDAPDescUsers=此頁面允許您定義的LDAP屬性的LDAP樹就Dolibarr用戶發現每個數據的名稱。
-LDAPDescGroups=此頁面允許您定義的LDAP屬性的LDAP樹就Dolibarr組發現每個數據的名稱。
-LDAPDescMembers=此頁面允許您定義的LDAP屬性的LDAP樹就Dolibarr成員發現每個數據模組的名稱。
-LDAPDescMembersTypes=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members types.
-LDAPDescValues=例如<b>OpenLDAP的</b>設計值與下列加載模式<b>：core.schema，cosine.schema，inetorgperson.schema）。</b>如果您使用thoose價值觀和OpenLDAP，修改您的LDAP配置文件<b>的slapd.conf</b>讓所有thoose模式加載。
-ForANonAnonymousAccess=對於一個寫驗證存取權限，例如訪問（）
-PerfDolibarr=Performance setup/optimizing report
-YouMayFindPerfAdviceHere=You will find on this page some checks or advices related to performance.
-NotInstalled=Not installed, so your server is not slow down by this.
-ApplicativeCache=Applicative cache
-MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
-MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
-MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
-OPCodeCache=OPCode cache
-NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad).
-HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
-FilesOfTypeCached=Files of type %s are cached by HTTP server
-FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
-FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
-FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
-CacheByServer=Cache by server
+LDAPFieldCompanyExample=例如：O
+LDAPFieldSid=SID
+LDAPFieldSidExample=例如：objectsid
+LDAPFieldEndLastSubscription=訂閱結束日期
+LDAPFieldTitle=工作職稱
+LDAPFieldTitleExample=例如：頭銜
+LDAPSetupNotComplete=LDAP 的設定不完整(可到其他分頁)
+LDAPNoUserOrPasswordProvidedAccessIsReadOnly=沒有提供管理者或密碼。 LDAP 將以匿名且唯讀模式存取。
+LDAPDescContact=此頁面允許您在 LDAP 樹狀圖中定義每一個您在 Dolibarr 通訊錄中找到的 LDAP 屬性名稱。
+LDAPDescUsers=此頁面允許您在 LDAP 樹狀圖中定義每一個您在 Dolibarr 用戶中找到的 LDAP 屬性名稱。
+LDAPDescGroups=此頁面允許您在 LDAP 樹狀圖中定義每一個您在 Dolibarr 群組中找到的 LDAP 屬性名稱。
+LDAPDescMembers=此頁面允許您在 LDAP 樹狀圖中定義每一個您在 Dolibarr 會員模組中找到的 LDAP 屬性名稱。
+LDAPDescMembersTypes=此頁面允許您在 LDAP樹狀圖中對在 Dolibarr 會員類型中找的資料定義 LDAP 屬性名稱。
+LDAPDescValues=例如 <b>OpenLDAP</b> 的設計值是載入以下架構： <b>core.schema, cosine.schema, inetorgpersion.schema</b>)。若您使用這些值及 OpenLDAP, 修改您的 LDAP 設定檔 <b>slapd.conf</b> 這些 schemas 將全載入。
+ForANonAnonymousAccess=已驗證存取(例如在寫入的存取)
+PerfDolibarr=設定/最佳化效能報表
+YouMayFindPerfAdviceHere=您可在此頁找到相關效能的檢查項或是建議。
+NotInstalled=未安裝，所以您伺服器不會減少速度。
+ApplicativeCache=應用程式的快取
+MemcachedNotAvailable=沒有找到應用程式快取。你可安裝快取伺服器 Memcached 及該伺服器啟動該模組以增加效能。<br>更多的資訊在<a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>。<br>注意多數的伺服器供應商不提供類似的快取伺服器。
+MemcachedModuleAvailableButNotSetup=找到可快取模組的應用程式快取，但模組設定沒有完成。
+MemcachedAvailableAndSetup=啟用由可快取模組決定使用 memcached 伺服器
+OPCodeCache=OPCode 快取
+NoOPCodeCacheFound=沒找到 OPCode 快取。可能您使用另外的 Xcache 或 eAccelerator (好的選擇) 取代 OPCode 快取，也可能您沒有 OPCode 快取 (很糟的選擇)。
+HTTPCacheStaticResources=統計資源 (css, img, javascipt) 的 HTTP 快取
+FilesOfTypeCached=HTTP 伺服器已快取%s類型的檔案
+FilesOfTypeNotCached=HTTP 伺服器沒有快取%s類型的檔案
+FilesOfTypeCompressed=HTTP 伺服器已壓縮%s類型的檔案
+FilesOfTypeNotCompressed=HTTP 伺服器沒有已壓縮%s類型的檔案
+CacheByServer=伺服器的快取
 CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000"
-CacheByClient=Cache by browser
-CompressionOfResources=Compression of HTTP responses
-CompressionOfResourcesDesc=For exemple using the Apache directive "AddOutputFilterByType DEFLATE"
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
-DefaultValuesDesc=You can define/force here the default value you want to get when your create a new record, and/or defaut filters or sort order when your list record.
-DefaultCreateForm=Default values (on forms to create)
-DefaultSearchFilters=Default search filters
-DefaultSortOrder=Default sort orders
-DefaultFocus=Default focus fields
+CacheByClient=瀏覽器的快取
+CompressionOfResources=HTTP 壓縮的反應
+CompressionOfResourcesDesc=例如：使用 Apache 指令 "AddOutputFilterByType DEFLATE"
+TestNotPossibleWithCurrentBrowsers=如自動針測目前的瀏覽器是不可能的
+DefaultValuesDesc=您可以在此定義/強制建立新記錄時的預設值，以及/或者在列表清單記錄時進行過濾或排序。
+DefaultCreateForm=預設值(在表單上建立)
+DefaultSearchFilters=預設尋找過濾器
+DefaultSortOrder=預設排序訂單
+DefaultFocus=預設焦點欄位
 ##### Products #####
-ProductSetup=產品模組設置
-ServiceSetup=服務模組的設置
-ProductServiceSetup=產品和服務模組的設置
-NumberOfProductShowInSelect=在 combos 選擇清單中，最大可供選擇的產品數量（0 =沒有限制）
-ViewProductDescInFormAbility=在表單上是否可以直接顯示產品描述資訊(如果關閉則採用彈出式訊息框方式顯示)
-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=Visualization of products descriptions in the third party language
-UseSearchToSelectProductTooltip=Also if you have a large number of product (> 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 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=預設的條碼類型
-SetDefaultBarcodeTypeThirdParties=預設的條碼類型給客戶/供應商模組使用
-UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
-ProductCodeChecker= Module for product code generation and checking (product or service)
-ProductOtherConf= Product / Service configuration
-IsNotADir=is not a directory!
+ProductSetup=產品模組設定
+ServiceSetup=服務模組設定
+ProductServiceSetup=產品和服務模組設定
+NumberOfProductShowInSelect=在混合選擇清單明細中，最大可供選擇的產品數量（0 =沒有限制）
+ViewProductDescInFormAbility=在表單上顯示產品描述資訊 (否則則採用彈出式訊息框方式顯示)
+MergePropalProductCard=若產品/服務在報價/建議書/提案內，啟動產品/服務中夾檔分頁有選項可將產品 PDF 文件整合成報價/建議書/提案的 azur 式的 PDF
+ViewProductDescInThirdpartyLanguageAbility=在合作方語言中顯示產品描述資訊
+UseSearchToSelectProductTooltip=另外您有大量產品編號(>100,000)，您可在 " 設定 -> 其他 "中設定常數 PRODUCT_DONOTSEARCH_ANYWHERE 為 1 增加速度。蒐尋則只限在字串的開頭。
+UseSearchToSelectProduct=請按任一鍵前載入產品混合清單明細的內容(若您有大量的產品時此會增加效率，但會減少方便性)
+SetDefaultBarcodeTypeProducts=產品的預設條碼類型
+SetDefaultBarcodeTypeThirdParties=給合作方使用的預設條碼類型
+UseUnits=定義在訂單、報價/建議書/提案，或是發票版本的衡量單位
+ProductCodeChecker= 產品代號產生及檢查(產品或服務)模組
+ProductOtherConf= 產品/服務的偏好設定
+IsNotADir=不是資料夾！
 ##### Syslog #####
-SyslogSetup=系統日誌模組設置
+SyslogSetup=系統日誌模組設定
 SyslogOutput=日誌輸出
 SyslogFacility=設施
-SyslogLevel=水平
-SyslogFilename=文件名稱和路徑
-YouCanUseDOL_DATA_ROOT=你可以使用DOL_DATA_ROOT /可在Dolibarr日誌文件dolibarr.log“文件”目錄。你可以設置一個不同的路徑來存儲該文件。
-ErrorUnknownSyslogConstant=恆%s不是一個已知的syslog常數
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
-CompressSyslogs=Syslog files compression and backup
-SyslogFileNumberOfSaves=Log backups
-ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
+SyslogLevel=水準
+SyslogFilename=檔案名稱和路徑
+YouCanUseDOL_DATA_ROOT=您可使用在 Dolibarr "文件"資料夾的日誌檔案 DOL_DATA_ROOT/dolibarr.log 。您可以設定不同的路徑來存儲該檔案。
+ErrorUnknownSyslogConstant=常數 %s 不是一個已知的 Syslog 常數
+OnlyWindowsLOG_USER=Windows 只支援 LOG_USER
+CompressSyslogs=系統日誌檔案壓縮及備份
+SyslogFileNumberOfSaves=日誌備份
+ConfigureCleaningCronjobToSetFrequencyOfSaves=清除偏好設定的排程工作設定成經常備份日誌
 ##### Donations #####
-DonationsSetup=捐贈模組設置
-DonationsReceiptModel=模板的捐贈收據
+DonationsSetup=捐贈模組設定
+DonationsReceiptModel=捐贈收據的範例
 ##### Barcode #####
 BarcodeSetup=條碼設置
-PaperFormatModule=打印格式模組
+PaperFormatModule=列印格式模組
 BarcodeEncodeModule=條碼編碼類型
 CodeBarGenerator=條碼產生器
 ChooseABarCode=沒有定義條碼產生器
@@ -1464,64 +1474,64 @@ FormatNotSupportedByGenerator=條碼產生器不支援此格式
 BarcodeDescEAN8=EAN 8 條碼
 BarcodeDescEAN13=一般商品常用的 EAN 13 條碼
 BarcodeDescUPC=通用產品條碼(UPC)
-BarcodeDescISBN=書籍條碼類型
+BarcodeDescISBN=書籍條碼(ISBN)類型
 BarcodeDescC39=Code 39 條碼
 BarcodeDescC128=Code 128 條碼
-BarcodeDescDATAMATRIX=Barcode of type Datamatrix
-BarcodeDescQRCODE=Barcode of type QR code
-GenbarcodeLocation=Bar code 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
-BarcodeInternalEngine=Internal engine
-BarCodeNumberManager=Manager to auto define barcode numbers
+BarcodeDescDATAMATRIX=Datamatrix 類型的條碼
+BarcodeDescQRCODE=QR code 類型的條碼
+GenbarcodeLocation=條碼產生命令行工具 ( 某些條碼類型使用內部引擎 )。必須符合 "genbarcode"。<br>例如：/usr/local/bin/genbarcode
+BarcodeInternalEngine=內部引擎
+BarCodeNumberManager=管理自動編號的條碼
 ##### Prelevements #####
-WithdrawalsSetup=Setup of module Direct debit payment orders
+WithdrawalsSetup=模組內直接付款訂單的設定
 ##### ExternalRSS #####
-ExternalRSSSetup=外部的RSS進口格局
-NewRSS=新的RSS飼料
+ExternalRSSSetup=外部的RSS匯入設定
+NewRSS=新的 RSS 訂閱
 RSSUrl=RSS URL
-RSSUrlExample=An interesting RSS feed
+RSSUrlExample=有興趣 RSS 的訂閱
 ##### Mailing #####
-MailingSetup=設定電子郵件發送模組
-MailingEMailFrom=發件人的電子郵件（從）為通過電子郵件發送電子郵件模組
-MailingEMailError=回電子郵件（錯誤對），與錯誤的電子郵件
-MailingDelay=Seconds to wait after sending next message
+MailingSetup=設定電子郵件傳送模組
+MailingEMailFrom=電子郵件模組中傳送郵件的寄件人電子郵件(從)
+MailingEMailError=當郵件傳送錯誤時返回的電子郵件(Errors-to)
+MailingDelay=等待幾秒鐘之後傳送下一訊息
 ##### Notification #####
-NotificationSetup=EMail notification module setup
-NotificationEMailFrom=發件人的電子郵件（從）為發送通知郵件
-FixedEmailTarget=Fixed email target
+NotificationSetup=電子郵件通知模組設定
+NotificationEMailFrom=傳送通知的電子郵件之寄件人的電子郵件(從)
+FixedEmailTarget=固定電子郵件目標
 ##### Sendings #####
-SendingsSetup=設定出貨單模組
-SendingsReceiptModel=出貨單據範本
-SendingsNumberingModules=設定出貨單編號模組
-SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that is received and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
-FreeLegalTextOnShippings=Free text on shipments
+SendingsSetup=出貨單模組設定
+SendingsReceiptModel=出貨單據模式
+SendingsNumberingModules=出貨單編號模組設定
+SendingsAbility=支援客戶的裝貨單
+NoNeedForDeliveryReceipts=在多數案件中，裝貨單可當成送貨給客戶的送貨單(出貨的清單明細)及客戶收貨且簽收的簽收單。所以客戶送貨收據是有重覆功能且很少啟動的。
+FreeLegalTextOnShippings=裝貨加註文字
 ##### Deliveries #####
-DeliveryOrderNumberingModules=產品收貨編號模組
-DeliveryOrderModel=產品收貨模型
+DeliveryOrderNumberingModules=產品交貨收據編號模組
+DeliveryOrderModel=產品交貨單模型式
 DeliveriesOrderAbility=開啟或關閉出貨單支援產品的交貨單據
-FreeLegalTextOnDeliveryReceipts=可在下面輸入額外的收貨資訊
+FreeLegalTextOnDeliveryReceipts=在交貨收據中加註文字
 ##### FCKeditor #####
-AdvancedEditor=高級編輯
+AdvancedEditor=進階編輯器
 ActivateFCKeditor=以下為進階的編輯器功能，請決定啟用或關閉:
-FCKeditorForCompany=描述及註解採用所見即所得的方式建立或編輯(不含產品及服務)
-FCKeditorForProduct=產品/服務的描述及註解採用所見即所得的方式建立或編輯
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formating when building PDF files.</font>
-FCKeditorForMailing= 所見即所得創建/編輯的郵件
-FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
+FCKeditorForCompany=描述及註解採用所見即所視的方式建立或編輯(不含產品及服務)
+FCKeditorForProduct=產品/服務的描述及註解採用所見即所視的方式建立或編輯
+FCKeditorForProductDetails=針對所有項目(提案建議書、訂單、發票等)的產品描述採用所見即所視的方式建立及編輯。<font class="warning">警告：當建立 PDF 檔案時會在特定字元或頁面格式時會產生問題，因此鄭重地不建議使用此選項。</font>
+FCKeditorForMailing= 以所見即所視的建立/編輯電子郵件 ( 工具 --> 電子郵件 )
+FCKeditorForUserSignature=以所見即所視的建立/編輯用戶簽名檔
+FCKeditorForMail=以所見即所視的建立/編輯全部電子郵件( 除工具 --> 電子郵件外)
 ##### OSCommerce 1 #####
-OSCommerceErrorConnectOkButWrongDatabase=數據庫連接成功，但並不指望成為oscommerce的數據庫（關鍵%不是%s的表中找到）。
-OSCommerceTestOk=連接到服務器'%s'於資料庫'用戶'%s'的%s'的成功。
-OSCommerceTestKo1=連接到服務器'%s'的成功，但是數據庫'%s'的無法達成。
+OSCommerceErrorConnectOkButWrongDatabase=資料庫連接成功，但資料庫不是OSCommerce的資料庫（在%s表中的關鍵值不是%s）。
+OSCommerceTestOk=成功地使用用戶'%s'連線到伺服器'%s'上的資料庫'%s'。
+OSCommerceTestKo1=成功地連線到伺服器'%s'，但是資料庫'%s'的無法連上。
 OSCommerceTestKo2=連接到服務器'%s的與用戶'%s'的失敗。
 ##### Stock #####
-StockSetup=Warehouse module setup
-IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
+StockSetup=庫存模組設定
+IfYouUsePointOfSaleCheckModule=若使用收銀機模組(收銀機模組預設已提供，或是額外模組)，此設定可能會被收銀機模組忽略。大多數收銀機模組是預設馬上開立發票及馬上減少庫存，因此不論此處選項設定為何。所以若當在收銀機操作時，您需要或是不要減少庫存，請檢查您收銀機模組的設定。
 ##### Menu #####
 MenuDeleted=選單中刪除
 Menus=選單
 TreeMenuPersonalized=個性化選單
-NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
+NotTopTreeMenuPersonalized=個人化選單沒有連上到頂端選單項
 NewMenu=新選單
 Menu=選擇選單
 MenuHandler=選單處理程序
@@ -1529,32 +1539,32 @@ MenuModule=原始碼模組
 HideUnauthorizedMenu= 隱藏未經授權的選單（灰色）
 DetailId=選單編號
 DetailMenuHandler=顯示新的選單的選單處理程序
-DetailMenuModule=模組名稱，如果菜單項來自一個模組
-DetailType=類型選單（頂部或左）
-DetailTitre=選單標籤或標籤代碼翻譯
-DetailUrl=菜單上的網址發送給您（絶對網址連結或以http://外部連結）
-DetailEnabled=條件不顯示或入境
+DetailMenuModule=若選單項來自一個模組則為模組名稱
+DetailType=選單類型（在頂部或左側）
+DetailTitre=翻譯的選單標籤或標籤代碼
+DetailUrl=發送選單上的網址給您（以 http:// 的絶對網址 URL 連線或外部連線）
+DetailEnabled=條件顯示或不進入
 DetailRight=未經批准的條件，顯示灰色菜單
-DetailLangs=郎文件名稱的標籤代碼轉換
+DetailLangs=長檔案名稱的標籤代碼轉換
 DetailUser=實習生/外部/所有
 Target=目標
-DetailTarget=目標的連結（_blank頂開一新視窗）
-DetailLevel=級（-1：頂部菜單，0：頭菜單，> 0菜單和子菜單）
-ModifMenu=菜單上的變化
+DetailTarget=目標的連結（_blank top 開一新視窗）
+DetailLevel=層級（-1：頂部選單，0：頭選單，> 0 選單和子選單）
+ModifMenu=選單上的變化
 DeleteMenu=刪除選單項
-ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
-FailedToInitializeMenu=Failed to initialize menu
+ConfirmDeleteMenu=您確定要刪除選單項目 <b>%s</b>?
+FailedToInitializeMenu=初始化選單失敗
 ##### Tax #####
-TaxSetup=Taxes, social or fiscal taxes and dividends module setup
-OptionVatMode=由於營業稅
-OptionVATDefault=Standard basis
-OptionVATDebitOption=Accrual basis
-OptionVatDefaultDesc=增值稅是因為： <br> - 交貨/付款商品<br> - 關於服務費
-OptionVatDebitOptionDesc=增值稅是因為： <br> - 交貨/付款商品<br> - 對發票（付款）服務
-OptionPaymentForProductAndServices=Cash basis for products and services
-OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
-SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
-OnDelivery=交貨
+TaxSetup=各稅、社會或年度稅費及股利模組設定
+OptionVatMode=應繳營業稅
+OptionVATDefault=標準基礎
+OptionVATDebitOption=權責制
+OptionVatDefaultDesc=營業稅的發生時間： <br> - 交貨商品時(本系統使用發票日期) <br> - 服務部分則為收付款時
+OptionVatDebitOptionDesc=營業稅的發生時間： <br> - 交貨商品(本系統使用發票日期)<br> - 服務部分則為發票（貸方通知單）
+OptionPaymentForProductAndServices=產品及服務的現金基礎
+OptionPaymentForProductAndServicesDesc=營業稅是由於：<br>-支付商品<br>-支付服務費用
+SummaryOfVatExigibilityUsedByDefault=根據所選的選項預設營業稅時間：
+OnDelivery=關於交貨
 OnPayment=關於付款
 OnInvoice=關於發票
 SupposedToBePaymentDate=如果使用的付款日期交貨日期不詳
@@ -1562,228 +1572,232 @@ SupposedToBeInvoiceDate=使用的發票日期
 Buy=購買
 Sell=出售
 InvoiceDateUsed=使用的發票日期
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
-AccountancyCode=Accounting Code
-AccountancyCodeSell=Sale account. code
-AccountancyCodeBuy=Purchase account. code
+YourCompanyDoesNotUseVAT=您的公司尚未定義營業稅 ( 首頁 - 設定 - 公司/組織 )，所以在設定中沒有營業稅選項。
+AccountancyCode=會計代號
+AccountancyCodeSell=銷貨會計代號
+AccountancyCodeBuy=採購會計代號
 ##### Agenda #####
-AgendaSetup=模組設置的行動和議程
-PasswordTogetVCalExport=授權出口的關鍵環節
-PastDelayVCalExport=不要以上出口事件
-AGENDA_USE_EVENT_TYPE=Use events types (managed into menu Setup -> Dictionaries -> Type of agenda events)
-AGENDA_USE_EVENT_TYPE_DEFAULT=Set automatically this default value for type of event into event create form
-AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view
-AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on users browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
-AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
-AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
+AgendaSetup=事件及行程模組設定
+PasswordTogetVCalExport=授權匯出連線的值
+PastDelayVCalExport=不要匯出大於~的事件
+AGENDA_USE_EVENT_TYPE=使用事件類型(管理可到選單設定-->詞典-->行程事件類型)
+AGENDA_USE_EVENT_TYPE_DEFAULT=事件類型設定為自動的預設值放到建立事件表單中
+AGENDA_DEFAULT_FILTER_TYPE=設定自動帶入事件類型到事件檢視的尋找過濾器中
+AGENDA_DEFAULT_FILTER_STATUS=設定自動帶入事件狀況到事件檢視的尋找過濾器中
+AGENDA_DEFAULT_VIEW=當選定選單行事功能時預設要打開的分頁
+AGENDA_REMINDER_EMAIL=啟用<b>透過電子郵件</b>傳送事件鬧鐘(提醒選項/延遲可以在每個事件上定義)。注意：模組<strong>%s</strong>必須啟用且正確設定鬧鐘才能正確的發送。
+AGENDA_REMINDER_BROWSER=啟用<b>在用戶瀏覽器</b>顯示事件鬧鐘(若事件日期已到期，每位用戶可以拒絕來自瀏覽器確認的問題。)
+AGENDA_REMINDER_BROWSER_SOUND=啟用音效警告
+AGENDA_SHOW_LINKED_OBJECT=顯示已連接物件到行程的檢視中
 ##### 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).
-ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to call the phone number. This can be used to call a call center system from Dolibarr that can call the phone number on a SIP system for example.
-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 same computer than the browser, and called when you click on a link in your browser that start with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialUrlDesc=當點選電話圖示時則呼叫 URL。在 URL中，你可使用標籤<br><b>__PHONETO__</b>，他可取代個人的電話號碼以撥打<br><b>__PHONEFROM__</b>，他可以取代個人的電話號碼(您自己的)<br><b>__LOGIN__</b>，他可以取代點選撥打登錄(在用戶卡中定義)<br><b>__PASS__</b>，他可以取代點選撥打密碼(在用戶卡中定義)。
+ClickToDialDesc=此模組可以直接點選電話號碼。點選圖示會呼叫您手機撥號。這可用於call center 也就是從 Dolibarr 撥號到 SIP 系統。
+ClickToDialUseTelLink=在電話號碼中使用 "tel:" 連線
+ClickToDialUseTelLinkDesc=若用戶有智慧型手機或是在同一台電腦上已裝上軟體介面時使用此方法，則當您在瀏覽器上點選時連線到 "tel:" 進行呼叫。若您需要完整服務的解決方案(不需要安裝軟體到本機中)，您必須設定為 "否" 及填寫下一欄位。
 ##### Point Of Sales (CashDesk) #####
-CashDesk=銷售點
-CashDeskSetup=模組設置的銷售點
-CashDeskThirdPartyForSell=在銷售時預設一般的合作方
-CashDeskBankAccountForSell=帳戶用於接收現金付款
-CashDeskBankAccountForCheque= 帳戶用於接收支票付款
-CashDeskBankAccountForCB= 帳戶用於接收信用卡支付現金
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
-CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
-StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
-StockDecreaseForPointOfSaleDisabledbyBatch=在POS中庫存減少與批次管理不相容
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
+CashDesk=收銀機
+CashDeskSetup=收銀機模組設定
+CashDeskThirdPartyForSell=在銷售時預設的合作方
+CashDeskBankAccountForSell=預設收到合作方現金付款之帳戶
+CashDeskBankAccountForCheque= 預設收到合作方付款支票之帳戶
+CashDeskBankAccountForCB= 預設收到合作方信用卡支付之帳戶
+CashDeskDoNotDecreaseStock=禁用當在收銀機銷售完成時滅少庫存(若為「否」，代表為不論庫存模組如何設定，當透過收銀機完成銷售後，立即減少庫存)。
+CashDeskIdWareHouse=庫存減少時強制並限制倉庫使用
+StockDecreaseForPointOfSaleDisabled=禁用由收銀機減少庫存
+StockDecreaseForPointOfSaleDisabledbyBatch=在收銀機中庫存減少與批次管理不相容
+CashDeskYouDidNotDisableStockDecease=您不能禁用透過收銀機銷售時減少庫存。因此必需有倉庫。
 ##### Bookmark #####
-BookmarkSetup=模組設置書籤
-BookmarkDesc=這個模組允許您管理書籤。您還可以添加快捷方式到任何Dolibarr網頁或在您的左邊菜單externale網站。
-NbOfBoomarkToShow=最大數量的書籤顯示在左邊的菜單
+BookmarkSetup=書籤模組設定
+BookmarkDesc=這個模組允許您管理書籤。您可在左側選單中以增加捷徑方式連線到 Dolibarr 任何頁面或外部網站。
+NbOfBoomarkToShow=在左側選單中顯示最大數量的書籤
 ##### WebServices #####
-WebServicesSetup=符模組設置
-WebServicesDesc=通過啟用這個模組，Dolibarr成為網絡服務的服務器，提供網絡服務的雜項。
-WSDLCanBeDownloadedHere=的WSDL描述文件提供serviceses可以從這裡下載
-EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
+WebServicesSetup=網站伺服器模組設定
+WebServicesDesc=藉由啟用此模組，Dolibarr 會成為提供雜項網路服務的伺服器。
+WSDLCanBeDownloadedHere=提供服務的 WSDL 描述者檔案可以從這裡下載
+EndPointIs=SOAP 客戶端必須提出向 Dolibarr 的可用終端網址(URL)提出要求
 ##### API ####
-ApiSetup=API module setup
-ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore and test the APIs at URL
-OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
-ApiKey=Key for API
-WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
+ApiSetup=API 模組設定
+ApiDesc=透過啟動此模組，Dolibarr 變成 REST 伺服器以提供網站雜項服務。
+ApiProductionMode=啟用生產模式(此會啟動服務管理的快取使用)
+ApiExporerIs=您可在 URL 中探索及測試 APIs
+OnlyActiveElementsAreExposed=只有啟用模組的元件才會出現
+ApiKey=API 的值
+WarningAPIExplorerDisabled=API 瀏覽器已被禁用。 API 瀏覽器不需要提供 API 服務。 它是開發人員查找/測試 REST API的工具。 若您需要此工具，請進入模組 API REST 的設定中啟動它。
 ##### Bank #####
-BankSetupModule=銀行模組設置
-FreeLegalTextOnChequeReceipts=可在下面輸入額外的支票資訊
-BankOrderShow=顯示使用“詳細的銀行數目”國家為了銀行帳戶
+BankSetupModule=銀行模組設定
+FreeLegalTextOnChequeReceipts=在支票收據中加註文字
+BankOrderShow=針對某些國家使用“詳細的銀行號碼”顯示銀行帳戶的要求
 BankOrderGlobal=一般
 BankOrderGlobalDesc=一般的顯示順序
 BankOrderES=西班牙人
 BankOrderESDesc=西班牙的顯示順序
-ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
+ChequeReceiptsNumberingModule=檢查收據編號模組
 ##### Multicompany #####
-MultiCompanySetup=多模組安裝公司
+MultiCompanySetup=多公司模組設定
 ##### Suppliers #####
-SuppliersSetup=供應商模組設置
-SuppliersCommandModel=完整的供應商訂單文件範本（logo. ..）
-SuppliersInvoiceModel=完整的供應商發票(invoice)文件範本（logo. ...）
-SuppliersInvoiceNumberingModel=Supplier invoices numbering models
-IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
+SuppliersSetup=供應商模組設定
+SuppliersCommandModel=採購訂單的完整範本 (標誌...)
+SuppliersInvoiceModel=Complete template of vendor invoice (logo...)
+SuppliersInvoiceNumberingModel=供應商發票編號模組
+IfSetToYesDontForgetPermission=若設定為「是的」，則別忘了提供群組或用戶允許第二次批准的權限
 ##### GeoIPMaxmind #####
-GeoIPMaxmindSetup=geoip的Maxmind模組設置
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
-NoteOnPathLocation=請注意您的IP到國家數據文件必須是你的PHP目錄內可以讀取（檢查你的PHP中的open_basedir設置和文件系統權限）。
-YouCanDownloadFreeDatFileTo=你可以下載一個在%s的<b>免費演示版</b> geoip的國家Maxmind文件
-YouCanDownloadAdvancedDatFileTo=您也可以下載一個更<b>完整</b>的<b>版本，更新，</b>對Maxmind geoip的文件在%s的國家
-TestGeoIPResult=試驗的IP轉換 - >國家
+GeoIPMaxmindSetup=GeoIP Maxmind 模組設定
+PathToGeoIPMaxmindCountryDataFile=包含 Maxmind ip 位置的檔案路徑。<br>例如：<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
+NoteOnPathLocation=請注意您的 IP 到國家資料檔案必須在您 PHP 資料夾中且可以讀取（檢查您 PHP 中 open_basedir 設定和檔案系統權限）。
+YouCanDownloadFreeDatFileTo=你可以下載一個在%s Maxmind GeoIP 國家 檔案的<b>免費展示版本</b> 
+YouCanDownloadAdvancedDatFileTo=您也可以在%s下載更<b>新的完整版本</b>的 Maxmind GeoIP 國家檔案
+TestGeoIPResult=IP - > 國家轉換的測試
 ##### Projects #####
-ProjectsNumberingModules=項目編號模組
-ProjectsSetup=項目模組設置
-ProjectsModelModule=項目的報告文檔模型
-TasksNumberingModules=Tasks numbering module
-TaskModelModule=Tasks reports document model
-UseSearchToSelectProject=Wait you press a key before loading content of project combo list (This may increase performance if you have a large number of project, but it is less convenient)
+ProjectsNumberingModules=專案編號模組
+ProjectsSetup=專案模組設定
+ProjectsModelModule=專案的報告文件模式
+TasksNumberingModules=任務編號模組
+TaskModelModule=任務報告文件模式
+UseSearchToSelectProject=在載入專案組合列表的內容之前，等您按下任一個鍵 ( 若您有大量專案，這可能會提高效能，但它不太方便 )
 ##### ECM (GED) #####
 ##### Fiscal Year #####
-AccountingPeriods=Accounting periods
-AccountingPeriodCard=Accounting period
-NewFiscalYear=New accounting period
-OpenFiscalYear=Open accounting period
-CloseFiscalYear=關帳
-DeleteFiscalYear=Delete accounting period
-ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
-ShowFiscalYear=Show accounting period
-AlwaysEditable=Can always be edited
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
-NbMajMin=Minimum number of uppercase characters
-NbNumMin=Minimum number of numeric characters
-NbSpeMin=Minimum number of special characters
-NbIteConsecutive=Maximum number of repeating same characters
-NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
-SalariesSetup=Setup of module salaries
-SortOrder=Sort order
-Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
-IncludePath=Include path (defined into variable %s)
-ExpenseReportsSetup=Setup of module Expense Reports
-TemplatePDFExpenseReports=Document templates to generate expense report document
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
-ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
-ExpenseReportNumberingModules=Expense reports numbering module
-NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
-YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of notifications per user*
-ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
-ListOfFixedNotifications=List of fixed notifications
-GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
+AccountingPeriods=會計期間
+AccountingPeriodCard=會計期間
+NewFiscalYear=新會計期間
+OpenFiscalYear=開啟會計期間
+CloseFiscalYear=關閉會計期間
+DeleteFiscalYear=刪除會計期間
+ConfirmDeleteFiscalYear=您確定要刪除會計期間嗎？
+ShowFiscalYear=顯示會計期間
+AlwaysEditable=總是可編輯的嗎
+MAIN_APPLICATION_TITLE=強制顯示應用程式名稱(警告：當使用在手機的 DoliDroid APP 時，設定您自己名稱可能會破壞自動填入的登入功能)
+NbMajMin=大寫字元的最少數量
+NbNumMin=數字字元的最少數量
+NbSpeMin=特定字元的最少數量
+NbIteConsecutive=重覆相同字元的最大數量
+NoAmbiCaracAutoGeneration=自動產生時不要使用會混淆的字元("1","l","i","|","0","O")
+SalariesSetup=薪資模組的設定
+SortOrder=排序訂單
+Format=格式
+TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and vendors payment type
+IncludePath=包含路徑(預先定義的變數 %s)
+ExpenseReportsSetup=費用報表模組的設定
+TemplatePDFExpenseReports=用文件範本產生費用報表文件
+ExpenseReportsIkSetup=費用報表模組的設定 - Milles 指數
+ExpenseReportsRulesSetup=設定費用報表模組 - 規則
+ExpenseReportNumberingModules=費用報表編號模組
+NoModueToManageStockIncrease=當自動增加庫存啟動後沒有模組可以管理。此時增加庫存只能人工輸入。
+YouMayFindNotificationsFeaturesIntoModuleNotification=您可在啟用電子郵件通知中找到選項及偏好設定通知的模組。
+ListOfNotificationsPerUser=每位用戶* 的通知明細表
+ListOfNotificationsPerUserOrContact=每位用戶* 或每位連絡人** 的通知明細表
+ListOfFixedNotifications=固定通知的明細表
+GoOntoUserCardToAddMore=到用戶的 "通知" 分頁增加或刪除用戶的通知
+GoOntoContactCardToAddMore=移到合作方的「通知」分頁以便針對通訊錄/地址等增加或移除通知
 Threshold=Threshold
-BackupDumpWizard=Wizard to build database backup dump file
-SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
-SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
-InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
+BackupDumpWizard=構建資料庫備份轉儲檔案的精靈
+SomethingMakeInstallFromWebNotPossible=由於以下原因，無法從 Web 界面安裝外部模組：
+SomethingMakeInstallFromWebNotPossible2=基於此原因，敘述昇級程序中只能允許最高權限用戶可以使用人工步驟。
+InstallModuleFromWebHasBeenDisabledByFile=您的管理塤 已禁用從應用程式來的外部模組安裝。你必須詢問管理員移除檔案<strong>%s</strong>以達成此功能。
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
-HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
-HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
-TextTitleColor=Color of page title
-LinkColor=Color of links
-PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
-NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
-BackgroundColor=Background color
-TopMenuBackgroundColor=Background color for Top menu
-TopMenuDisableImages=Hide images in Top menu
-LeftMenuBackgroundColor=Background color for Left menu
-BackgroundTableTitleColor=Background color for Table title line
-BackgroundTableLineOddColor=Background color for odd table lines
-BackgroundTableLineEvenColor=Background color for even table lines
-MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
-NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
-UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
-ColorFormat=The RGB color is in HEX format, eg: FF0000
-PositionIntoComboList=Position of line into combo lists
-SellTaxRate=Sale tax rate
-RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
-UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipping, you can enter it here. You can use the key {TRACKID} into URL parameters so the system will replace it with value of tracking number user entered into shipment card.
-OpportunityPercent=When you create an opportunity, you will defined an estimated amount of project/lead. According to status of opportunity, this amount may be multiplicated by this rate to evaluate global amount all your opportunities may generate. Value is percent (between 0 and 100).
-TemplateForElement=This template record is dedicated to which element
-TypeOfTemplate=Type of template
+HighlightLinesOnMouseHover=滑鼠移過時會顯示表格線
+HighlightLinesColor=滑鼠移過時顯示線條的顏色（保持為空白不顯示）
+TextTitleColor=頁面標題的文字顏色
+LinkColor=連線的顏色
+PressF5AfterChangingThis=在鍵盤上按 CTRL+F5 或變更此值後清除您的瀏覽器的快取以使其生效
+NotSupportedByAllThemes=將適用於核心主題，可能不受外部主題支援
+BackgroundColor=背景顏色
+TopMenuBackgroundColor=頂端選單的背景顏色
+TopMenuDisableImages=在頂端選單中隱藏圖片
+LeftMenuBackgroundColor=左側選單的背景顏色
+BackgroundTableTitleColor=表單抬頭行的背景顏色
+BackgroundTableTitleTextColor=表格標題行的文字顏色
+BackgroundTableLineOddColor=表單奇數行的背景顏色
+BackgroundTableLineEvenColor=表單偶數行的背景顏色
+MinimumNoticePeriod=最短通知期限（您的請假必須在前完成）
+NbAddedAutomatically=每月（自動）新增到用戶計數器的天數
+EnterAnyCode=此欄包含定義的參考值。您輸入除特定字元外的任何值。
+UnicodeCurrency=在括號之間輸入代表貨幣符號的字元數列表。例如： $，輸入 [36] - 巴西 R$ [82,36] - €，輸入 [8364]
+ColorFormat=在 HEX 格式中 RGB 顏色，例如： FF0000
+PositionIntoComboList=行的位置放到組合清單中
+SellTaxRate=銷貨稅率
+RecuperableOnly=在法國某些州增值稅是 “Not Perceived but Recoverable”。 在其他情況下，則將該值保持為“否”。
+UrlTrackingDesc=若提供者或運輸服務提供頁面或網站以便確認您的運送，您可在此輸入。您可使用 {TRACKID}值放到 URL 參數中，因此系統將會用戶輸入的追踪碼取代此值放到裝貨單中。
+OpportunityPercent=當您建立一個機會時，您也要評估專案/潛在的金額 。根據機會的狀況，此金額可能是估計全球金額乘上您的機會所產生的。該值是百分比表示(介於 0 ~ 100)
+TemplateForElement=這個範本記錄專用於哪個元件
+TypeOfTemplate=範本類型
 TemplateIsVisibleByOwnerOnly=只有擁有者才可看到範本
-VisibleEverywhere=Visible everywhere
-VisibleNowhere=Visible nowhere
-FixTZ=TimeZone fix
-FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
-ExpectedChecksum=Expected Checksum
-CurrentChecksum=Current Checksum
-ForcedConstants=Required constant values
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToSendContract=To send a contract
-MailToThirdparty=To send email from third party page
-MailToMember=To send email from member page
-MailToUser=To send email from user page
-MailToProject= To send email from project page
-ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the latest stable version
-TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
-TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
-ModelModulesProduct=Templates for product documents
-ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
-SeeSubstitutionVars=See * note for list of possible substitution variables
-SeeChangeLog=See ChangeLog file (english only)
-AllPublishers=All publishers
-UnknownPublishers=Unknown publishers
-AddRemoveTabs=Add or remove tabs
-AddDataTables=Add object tables
-AddDictionaries=Add dictionaries tables
-AddData=Add objects or dictionaries data
-AddBoxes=Add widgets
-AddSheduledJobs=Add scheduled jobs
-AddHooks=Add hooks
-AddTriggers=Add triggers
-AddMenus=Add menus
-AddPermissions=Add permissions
-AddExportProfiles=Add export profiles
-AddImportProfiles=Add import profiles
-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 on database user table and must be provided on each API call)
-ListOfAvailableAPIs=List of available APIs
-activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
-CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
-LandingPage=Landing page
-SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
-ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users or groups manually if necessary.
-UserHasNoPermissions=This user has no permission defined
-TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
-BaseCurrency=Reference currency of the company (go into setup of company to change this)
-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.
+VisibleEverywhere=到處可見
+VisibleNowhere=現在可看見
+FixTZ=修正時區
+FillFixTZOnlyIfRequired=例子：+2 (只有在遇到問題時才填入)
+ExpectedChecksum=預期的校驗和
+CurrentChecksum=目前的校驗和
+ForcedConstants=必需的常數
+MailToSendProposal=Customer proposals
+MailToSendOrder=Customer orders
+MailToSendInvoice=各式客戶發票
+MailToSendShipment=裝貨
+MailToSendIntervention=干預/介入
+MailToSendSupplierRequestForQuotation=要求報價
+MailToSendSupplierOrder=採購訂單
+MailToSendSupplierInvoice=供應商發票
+MailToSendContract=Contracts
+MailToThirdparty=合作方
+MailToMember= 會員
+MailToUser=Users
+MailToProject=專案頁面
+ByDefaultInList=以預設方式顯示檢視明細表
+YouUseLastStableVersion=您可使用最新穩定版本
+TitleExampleForMajorRelease=您可用公佈的主要發行版本做為訊息的例子(隨時可在您網站上使用它)
+TitleExampleForMaintenanceRelease=您可用公佈的維護版本做為訊息的例子(隨時可在您網站上使用它)
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s 可以使用。%s 的版本對用戶及開發者是擁有許多新功能的主要發行。您可從 https://www.dolibarr.org portal 下載區 (是穩定版本的子資料夾) 下載。您可讀取 <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> 有完整變動明細表。
+ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s 可以使用。 %s 的版本是維護版本，所以僅修復程式臭蟲。我們建議使用舊版人們昇級到此。當任何維護發行時沒有新功能，也沒有資料結構變更到此版本。您可從 https://www.dolibarr.org portal 下載區 (是穩定版本的子資料夾) 下載。您可讀取 <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> 有完整變動明細表。
+MultiPriceRuleDesc=當啟用 "每個產品/服務有數個價格" 時，您針對不同產品定義不同價格(每個價格水準)。為節省您的時間，您可輸入根據第一層的價格水準而自動計算的每一層價格水準，所以只要每個產品中輸入第一層的價格即可。此頁面適用於節省您的時間及每一層的價格是相對於第一層的價格。在多數情況您可忽略此頁面。
+ModelModulesProduct=產品文件的範本
+ToGenerateCodeDefineAutomaticRuleFirst=為能自動地產生代號，您必須先定義管理自動定義的條碼數字。
+SeeSubstitutionVars=請參閱 * 註釋以取得可能的替代變數名單
+SeeChangeLog=查看變更日誌檔案(限英文版)
+AllPublishers=全部發佈者
+UnknownPublishers=未知發佈者
+AddRemoveTabs=增加或移除各式分頁
+AddDataTables=新增物件表格
+AddDictionaries=增加詞典表格
+AddData=新增物件或詞典資料
+AddBoxes=新增小工具
+AddSheduledJobs=新增排定工作
+AddHooks=增加鉤子
+AddTriggers=增加發射器
+AddMenus=增加選單
+AddPermissions=增加權限
+AddExportProfiles=增加匯出簡歷
+AddImportProfiles=增加匯入簡歷
+AddOtherPagesOrServices=增加其他頁面或服務
+AddModels=新增文件檔或編號的範例檔
+AddSubstitutions=新增替換值
+DetectionNotPossible=不可能檢測
+UrlToGetKeyToUseAPIs=使用 API 取得 URL (一旦收到就會儲存在資料庫用戶表中，並且必須在每次 API 呼叫中提供)
+ListOfAvailableAPIs=可用 APIs 的明細表
+activateModuleDependNotSatisfied=模組 "%s" 相依於模組 "%s" 已遺失，所以模組 "%1$s" 可能無法正確運作。如果你想避免任何安全意外，請安裝模組 "%2$s" 或是禁用模組 "%1$s"
+CommandIsNotInsideAllowedCommands=您試著執行的命令不是內部可執行的已定義到參數的指令<strong>$dolibarr_main_restrict_os_commands</strong>到<strong>conf.php</strong>檔案。
+LandingPage=登入頁面
+SamePriceAlsoForSharedCompanies=當您使用多公司模組中選擇 “單一價格” 時，若產品為共享環境時，則所有公司的價格也將相同。
+ModuleEnabledAdminMustCheckRights=模組已被啟動。 已啟動模組的權限僅限管理員用戶。 若必要，您可能需要人工方式開授予權限給其他用戶或群組。
+UserHasNoPermissions=此用戶沒有權限
+TypeCdr=使用 "無" 若付款日期條件是發票日期加上增量天 (增量是 "幾天" )<br>使用 "月底"，則在增量天後，日期必須是到月底 ( + 為可偏移的天數) <br>使用 "目前/下次" 則將付款條件日期定為當月的第一個 N 天 ( N 是指 "天數" )
+BaseCurrency=參考的公司貨幣 (可到公司設定去變更)
+WarningNoteModuleInvoiceForFrenchLaw=模組 %s 是符合法國法律(Loi Finance 2016)
+WarningNoteModulePOSForFrenchLaw=該模組 %s 符合法國法律 (Loi Finance 2016)，因為模組 Non Reversible Logs 會自動啟動。
 WarningInstallationMayBecomeNotCompliantWithLaw=You try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal 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
-MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
-SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculcation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
-SeveralLangugeVariatFound=Several language variants found
-WebDavServer=URL of %s server : %s
+MAIN_PDF_MARGIN_LEFT=在 PDF 的左邊邊界
+MAIN_PDF_MARGIN_RIGHT=在 PDF 的右邊邊界
+MAIN_PDF_MARGIN_TOP=在 PDF 的上面邊界
+MAIN_PDF_MARGIN_BOTTOM=在 PDF 下面邊界
+SetToYesIfGroupIsComputationOfOtherGroups=若該群組是其他群組的計算值，則將其設定為 yes
+EnterCalculationRuleIfPreviousFieldIsYes=若先前欄位設為“是”，則輸入計算規則(例如 'CODEGRP1 + CODEGRP2')
+SeveralLangugeVariatFound=發現數個語言變數
+COMPANY_AQUARIUM_REMOVE_SPECIAL=刪除特殊字元
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
+GDPRContact=GDPR contact
+GDPRContactDesc=若您儲存有關歐洲的公司或公民的資料時，您可以在這裡儲存負責“一般資料保護條例”的連絡人
 ##### Resource ####
-ResourceSetup=Configuration du module Resource
-UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disable feature to link a resource to users
-DisabledResourceLinkContact=Disable feature to link a resource to contacts
-ConfirmUnactivation=Confirm module reset
+ResourceSetup=du 模組資源的偏好設定
+UseSearchToSelectResource=使用尋找表單選取資源 (下拉式清單)
+DisabledResourceLinkUser=禁用資源連線到用戶的功能
+DisabledResourceLinkContact=禁用資源連線到通訊錄的功能
+ConfirmUnactivation=確認模組重設
diff --git a/htdocs/langs/zh_TW/agenda.lang b/htdocs/langs/zh_TW/agenda.lang
index 7266a474476..d05cfebd24a 100644
--- a/htdocs/langs/zh_TW/agenda.lang
+++ b/htdocs/langs/zh_TW/agenda.lang
@@ -53,9 +53,9 @@ MemberValidatedInDolibarr=會員 %s 已驗證
 MemberModifiedInDolibarr=會員 %s 已修改
 MemberResiliatedInDolibarr=會員 %s 已停止
 MemberDeletedInDolibarr=會員 %s 已刪除
-MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
-MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
-MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
+MemberSubscriptionAddedInDolibarr=會員 %s 新增 %s 的訂閱
+MemberSubscriptionModifiedInDolibarr=會員 %s 修改 %s 訂閱
+MemberSubscriptionDeletedInDolibarr=會員 %s 刪除 %s 訂閱
 ShipmentValidatedInDolibarr=貨運單 %s 已驗證
 ShipmentClassifyClosedInDolibarr=貨運單 %s 歸類為已結帳
 ShipmentUnClassifyCloseddInDolibarr=貨運單 %s 歸類為再開啓
@@ -112,7 +112,7 @@ ExportCal=匯出日曆
 ExtSites=匯入外部日曆
 ExtSitesEnableThisTool=顯示外部日曆 (已在全域設定中定義) 到行程。不會影響由使用者自行定義的外部日曆。
 ExtSitesNbOfAgenda=日曆數量
-AgendaExtNb=Calendar no. %s
+AgendaExtNb=行事曆編號 %s
 ExtSiteUrlAgenda=用 URL 存取 .iCal 檔案
 ExtSiteNoLabel=無說明
 VisibleTimeRange=顯示時間區間
diff --git a/htdocs/langs/zh_TW/banks.lang b/htdocs/langs/zh_TW/banks.lang
index db3fa13b574..08d4d42de82 100644
--- a/htdocs/langs/zh_TW/banks.lang
+++ b/htdocs/langs/zh_TW/banks.lang
@@ -1,151 +1,152 @@
 # Dolibarr language file - Source file is en_US - banks
-Bank=银行
-MenuBankCash=银行/现金
-MenuVariousPayment=Miscellaneous payments
-MenuNewVariousPayment=New Miscellaneous payment
-BankName=银行名称
-FinancialAccount=帐户/*
+Bank=銀行
+MenuBankCash=銀行/現金
+MenuVariousPayment=雜項付款
+MenuNewVariousPayment=新的雜項付款
+BankName=銀行名稱
+FinancialAccount=帳戶
 BankAccount=銀行帳戶
-BankAccounts=銀行帳戶
-ShowAccount=Show Account
-AccountRef=金融帳號
+BankAccounts=各式銀行帳戶
+BankAccountsAndGateways=Bank accounts | Gateways
+ShowAccount=顯示金額
+AccountRef=金融帳戶參考值
 AccountLabel=金融帳戶標簽
 CashAccount=現金帳戶
-CashAccounts=現金帳戶
-CurrentAccounts=往來帳戶
-SavingAccounts=儲蓄帳戶
+CashAccounts=各式現金帳戶
+CurrentAccounts=目前各式帳戶
+SavingAccounts=各式儲蓄帳戶
 ErrorBankLabelAlreadyExists=金融帳戶標簽已存在
-BankBalance=平衡
+BankBalance=餘額
 BankBalanceBefore=Balance before
 BankBalanceAfter=Balance after
-BalanceMinimalAllowed=允許的最小平衡
-BalanceMinimalDesired=最低所需的平衡
-InitialBankBalance=初步平衡
-EndBankBalance=年末余額
-CurrentBalance=當前余額
-FutureBalance=未來的平衡
-ShowAllTimeBalance=顯示余額開始
+BalanceMinimalAllowed=允許的最小餘額
+BalanceMinimalDesired=所需的最少餘額
+InitialBankBalance=期初餘額
+EndBankBalance=期末餘額
+CurrentBalance=目前餘額
+FutureBalance=未來餘額
+ShowAllTimeBalance=從一開始顯示餘額
 AllTime=From start
-Reconciliation=和解
-RIB=銀行帳號
-IBAN=IBAN號碼
-BIC=的BIC / SWIFT的號碼
+Reconciliation=調節
+RIB=銀行帳戶的號碼
+IBAN=IBAN 號碼
+BIC=BIC/SWIFT 的號碼
 SwiftValid=BIC/SWIFT valid
 SwiftVNotalid=BIC/SWIFT not valid
 IbanValid=BAN valid
 IbanNotValid=BAN not valid
 StandingOrders=Direct Debit orders
 StandingOrder=Direct debit order
-AccountStatement=戶口結單
-AccountStatementShort=聲明
-AccountStatements=戶口結單
+AccountStatement=帳戶報表
+AccountStatementShort=報表
+AccountStatements=各式帳戶報表
 LastAccountStatements=最近帳戶報表
 IOMonthlyReporting=每月報告
 BankAccountDomiciliation=帳戶地址
-BankAccountCountry=到國家
+BankAccountCountry=帳戶的國家
 BankAccountOwner=帳戶持有人姓名
 BankAccountOwnerAddress=帳戶持有人地址
-RIBControlError=值的完整性檢查失敗。這意味著此帳號的信息不完整或錯誤（檢查國家，數字和IBAN）。
-CreateAccount=創建帳戶
+RIBControlError=值的完整性檢查失敗。這意味著此帳戶的資訊不完整或錯誤（檢查國家，號碼和IBAN）。
+CreateAccount=建立帳戶
 NewBankAccount=新帳戶
-NewFinancialAccount=新的金融帳
-MenuNewFinancialAccount=新的金融帳
+NewFinancialAccount=新的金融帳戶
+MenuNewFinancialAccount=新的金融帳戶
 EditFinancialAccount=編輯帳戶
 LabelBankCashAccount=銀行或現金標簽
-AccountType=賬戶類型
+AccountType=帳戶類型
 BankType0=儲蓄賬戶
-BankType1=經常帳
+BankType1=目前或信用卡帳戶
 BankType2=現金帳戶
-AccountsArea=面積占
-AccountCard=戶口卡
+AccountsArea=帳戶區
+AccountCard=帳戶卡
 DeleteAccount=刪除帳戶
-ConfirmDeleteAccount=Are you sure you want to delete this account?
+ConfirmDeleteAccount=您確定要刪除此筆金額？
 Account=帳戶
-BankTransactionByCategories=Bank entries by categories
-BankTransactionForCategory=Bank entries for category <b>%s</b>
-RemoveFromRubrique=刪除連接類
-RemoveFromRubriqueConfirm=Are you sure you want to remove link between the entry and the category?
-ListBankTransactions=List of bank entries
-IdTransaction=事務ID
-BankTransactions=Bank entries
-BankTransaction=Bank entry
-ListTransactions=List entries
-ListTransactionsByCategory=List entries/category
-TransactionsToConciliate=Entries to reconcile
-Conciliable=可以兩全
-Conciliate=調和
-Conciliation=和解
+BankTransactionByCategories=依各式類別製作銀行分錄
+BankTransactionForCategory=依類別製作銀行分錄<b>%s</b>
+RemoveFromRubrique=刪除類別的連線
+RemoveFromRubriqueConfirm=您確定您要移除分錄與類別之間的連線嗎？
+ListBankTransactions=銀行分錄明細表
+IdTransaction=交易ID
+BankTransactions=銀行分錄
+BankTransaction=銀行項目
+ListTransactions=分錄明細表
+ListTransactionsByCategory=分錄/類別明細表
+TransactionsToConciliate=調整分錄
+Conciliable=可以調節的
+Conciliate=調節
+Conciliation=調節
 ReconciliationLate=Reconciliation late
-IncludeClosedAccount=包括關閉賬戶
-OnlyOpenedAccount=僅開立賬戶
+IncludeClosedAccount=包括已結束帳戶
+OnlyOpenedAccount=僅開放的各式帳戶
 AccountToCredit=帳戶信用
 AccountToDebit=帳戶轉帳
-DisableConciliation=此帳戶的禁用和解功能
-ConciliationDisabled=和解功能禁用
+DisableConciliation=此帳戶禁用調節功能
+ConciliationDisabled=調節功能禁用
 LinkedToAConciliatedTransaction=Linked to a conciliated entry
 StatusAccountOpened=開放
-StatusAccountClosed=關閉
-AccountIdShort=數
+StatusAccountClosed=已結束
+AccountIdShort=數字
 LineRecord=交易
-AddBankRecord=Add entry
-AddBankRecordLong=Add entry manually
+AddBankRecord=新增一項
+AddBankRecordLong=人工方式新增一項
 Conciliated=Reconciled
-ConciliatedBy=由調和
-DateConciliating=核對日期
-BankLineConciliated=Entry reconciled
+ConciliatedBy=由調節
+DateConciliating=調節日期
+BankLineConciliated=項目已調節
 Reconciled=Reconciled
 NotReconciled=Not reconciled
 CustomerInvoicePayment=客戶付款
 SupplierInvoicePayment=供應商付款
 SubscriptionPayment=認購款項
 WithdrawalPayment=提款支付
-SocialContributionPayment=Social/fiscal tax payment
-BankTransfer=銀行匯款
+SocialContributionPayment=社會/財務稅負繳款單
+BankTransfer=銀行轉帳
 BankTransfers=銀行轉帳
 MenuBankInternalTransfer=Internal transfer
-TransferDesc=Transfer from one account to another one, Dolibarr will write two record (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
+TransferDesc=從某帳戶轉到另一帳戶，Dolibarr會寫成兩筆(在來源帳戶的貸方及目的地帳戶的借方。此交易將使用相同金額、標籤及日期)
 TransferFrom=從
 TransferTo=至
-TransferFromToDone=一個<b>%</b>轉讓<b>從</b> s到<b>%s</b>的<b>%s%s</b>已被記錄。
+TransferFromToDone=從<b>%s</b>到<b>%s</b>的<b>%s</b>%s轉帳已記錄。
 CheckTransmitter=發射機
-ValidateCheckReceipt=Validate this check receipt?
-ConfirmValidateCheckReceipt=Are you sure you want to validate this check receipt, no change will be possible once this is done?
-DeleteCheckReceipt=Delete this check receipt?
-ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
+ValidateCheckReceipt=驗證此支票收據
+ConfirmValidateCheckReceipt=您確定要驗證這張支票收據嗎？一旦完成，不會有任何改變嗎？
+DeleteCheckReceipt=刪除支票收據？
+ConfirmDeleteCheckReceipt=您確認定您要刪除此張支票收據？
 BankChecks=銀行支票
-BankChecksToReceipt=Checks awaiting deposit
-ShowCheckReceipt=顯示檢查存單
-NumberOfCheques=鈮檢查
-DeleteTransaction=Delete entry
-ConfirmDeleteTransaction=Are you sure you want to delete this entry?
-ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
-BankMovements=運動
-PlannedTransactions=Planned entries
+BankChecksToReceipt=託收票據
+ShowCheckReceipt=顯示支票入存收據
+NumberOfCheques=檢查數量
+DeleteTransaction=刪除項目
+ConfirmDeleteTransaction=您確定要刪除此筆項目
+ThisWillAlsoDeleteBankRecord=也會刪除產生的銀行項目
+BankMovements=移動
+PlannedTransactions=已安排的項目
 Graph=圖像
-ExportDataset_banque_1=Bank entries and account statement
+ExportDataset_banque_1=銀行項目及會計項目描述
 ExportDataset_banque_2=Deposit slip
-TransactionOnTheOtherAccount=交易的其他帳戶
+TransactionOnTheOtherAccount=在其他帳戶的交易
 PaymentNumberUpdateSucceeded=付款號碼更新成功
-PaymentNumberUpdateFailed=付款數目無法更新
+PaymentNumberUpdateFailed=付款號碼無法更新
 PaymentDateUpdateSucceeded=付款日期更新成功
 PaymentDateUpdateFailed=付款日期可能無法更新
 Transactions=交易
-BankTransactionLine=Bank entry
+BankTransactionLine=銀行項目
 AllAccounts=所有銀行/現金帳戶
 BackToAccount=回到帳戶
 ShowAllAccounts=顯示所有帳戶
-FutureTransaction=在FUTUR的交易。調解沒有辦法。
-SelectChequeTransactionAndGenerate=選擇/篩選器檢查納入支票存款收據，並單擊“創建”。
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
+FutureTransaction=未來的交易。沒有其他方式調節。
+SelectChequeTransactionAndGenerate="選擇/篩選器"檢查包含支票存款收據並點擊“建立”。
+InputReceiptNumber=選擇要調節的銀行對帳單。使用可排序的數值： YYYYMM 或 YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
-ToConciliate=To reconcile?
+ToConciliate=調節嗎？
 ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
-DefaultRIB=Default BAN
-AllRIB=All BAN
-LabelRIB=BAN Label
-NoBANRecord=No BAN record
-DeleteARib=Delete BAN record
-ConfirmDeleteRib=Are you sure you want to delete this BAN record?
+DefaultRIB=預設 BAN
+AllRIB=全部 BAN
+LabelRIB=BAN 標籤
+NoBANRecord=沒有 BAN 記錄
+DeleteARib=刪除 BAN 記錄
+ConfirmDeleteRib=您確定要刪除此 BAN 記錄
 RejectCheck=Check returned
 ConfirmRejectCheck=Are you sure you want to mark this check as rejected?
 RejectCheckDate=Date the check was returned
@@ -154,10 +155,10 @@ CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
 BankAccountModelModule=Document templates for bank accounts
 DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
 DocumentModelBan=Template to print a page with BAN information.
-NewVariousPayment=New miscellaneous payments
-VariousPayment=Miscellaneous payments
-VariousPayments=Miscellaneous payments
-ShowVariousPayment=Show miscellaneous payments
-AddVariousPayment=Add miscellaneous payments
+NewVariousPayment=新的雜項付款
+VariousPayment=雜項付款
+VariousPayments=雜項付款
+ShowVariousPayment=顯示雜項付款
+AddVariousPayment=新增雜項付款
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to
diff --git a/htdocs/langs/zh_TW/bills.lang b/htdocs/langs/zh_TW/bills.lang
index bc4936144aa..d7142ffc79c 100644
--- a/htdocs/langs/zh_TW/bills.lang
+++ b/htdocs/langs/zh_TW/bills.lang
@@ -95,7 +95,7 @@ HelpPaymentHigherThanReminderToPay=註意，一個或更多的票據付款金額
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess paid for each overpaid invoice.
 ClassifyPaid=分類'有償'
 ClassifyPaidPartially=分類薪部分'
-ClassifyCanceled=分類'遺棄'
+ClassifyCanceled=分類'已放棄'
 ClassifyClosed=分類'關閉'
 ClassifyUnBilled=Classify 'Unbilled'
 CreateBill=建立發票
@@ -109,7 +109,7 @@ CancelBill=取消發票
 SendRemindByMail=通過電子郵件發送提醒
 DoPayment=Enter payment
 DoPaymentBack=Enter refund
-ConvertToReduc=轉換到未來的折扣
+ConvertToReduc=Mark as credit available
 ConvertExcessReceivedToReduc=Convert excess received into future discount
 ConvertExcessPaidToReduc=Convert excess paid into future discount
 EnterPaymentReceivedFromCustomer=輸入從客戶收到付款
@@ -120,9 +120,9 @@ BillStatus=發票狀態
 StatusOfGeneratedInvoices=Status of generated invoices
 BillStatusDraft=草案（等待驗證）
 BillStatusPaid=支付
-BillStatusPaidBackOrConverted=Credit note refund or converted into discount
+BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
 BillStatusConverted=Paid (ready for consumption in final invoice)
-BillStatusCanceled=棄
+BillStatusCanceled=已放棄
 BillStatusValidated=驗證（需要付費）
 BillStatusStarted=開始
 BillStatusNotPaid=尚未支付
@@ -133,7 +133,7 @@ BillShortStatusDraft=草案
 BillShortStatusPaid=支付
 BillShortStatusPaidBackOrConverted=Refund or converted
 BillShortStatusConverted=已支付
-BillShortStatusCanceled=棄
+BillShortStatusCanceled=已放棄
 BillShortStatusValidated=驗證
 BillShortStatusStarted=開始
 BillShortStatusNotPaid=尚未支付
@@ -186,7 +186,7 @@ ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b>
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=壞顧客
 ConfirmClassifyPaidPartiallyReasonProductReturned=產品部分退貨
-ConfirmClassifyPaidPartiallyReasonOther=其他原因而放棄額
+ConfirmClassifyPaidPartiallyReasonOther=其他原因而放棄金額
 ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=這個選擇是可能的，如果您的發票已提供適當的評論。 （例«只有相應的稅收已實際支付給權利扣除價格»）
 ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=在一些國家，這種選擇是可能的，如果您的發票上只包含正確的說明。
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=使用這個選擇，如果所有其他不適合
@@ -215,7 +215,7 @@ ShowPayment=顯示支付
 AlreadyPaid=已支付
 AlreadyPaidBack=Already paid back
 AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
-Abandoned=棄
+Abandoned=已放棄
 RemainderToPay=Remaining unpaid
 RemainderToTake=Remaining amount to take
 RemainderToPayBack=Remaining amount to refund
@@ -296,13 +296,13 @@ DiscountType=Discount type
 NoteReason=備註/原因
 ReasonDiscount=原因
 DiscountOfferedBy=獲
-DiscountStillRemaining=Discounts available
-DiscountAlreadyCounted=Discounts already consumed
+DiscountStillRemaining=Discounts or credits available
+DiscountAlreadyCounted=Discounts or credits already consumed
 CustomerDiscounts=Customer discounts
-SupplierDiscounts=Supplier discounts
+SupplierDiscounts=Vendors discounts
 BillAddress=條例草案的報告
 HelpEscompte=這是給予客戶優惠折扣，因為它的任期作出之前付款。
-HelpAbandonBadCustomer=這一數額已被放棄（客戶說是一個壞的客戶），並作為一個特殊的松散考慮。
+HelpAbandonBadCustomer=此金額已放棄（客戶說是一個壞的客戶），並作為一個特殊的松散考慮。
 HelpAbandonOther=這一數額已被放棄，因為這是一個錯誤（錯誤的顧客或由其他替代例如發票）
 IdSocialContribution=Social/fiscal tax payment id
 PaymentId=付款編號
@@ -339,6 +339,12 @@ PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but
 PaymentNote=Payment note
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
+ListOfSituationInvoices=List of situation invoices
+CurrentSituationTotal=Total current situation
+DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
+RemoveSituationFromCycle=Remove this invoice from cycle
+ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
+ConfirmOuting=Confirm outing
 FrequencyPer_d=Every %s days
 FrequencyPer_m=Every %s months
 FrequencyPer_y=Every %s years
@@ -440,7 +446,7 @@ LawApplicationPart2=貨物仍然是財產
 LawApplicationPart3=賣方直到完全兌現
 LawApplicationPart4=他們的價格。
 LimitedLiabilityCompanyCapital=SARL公司與資本
-UseLine=Apply
+UseLine=套用
 UseDiscount=使用折扣
 UseCredit=使用信用卡
 UseCreditNoteInInvoicePayment=減少金額與本信用證支付
@@ -505,9 +511,14 @@ SituationAmount=Situation invoice amount(net)
 SituationDeduction=Situation subtraction
 ModifyAllLines=Modify all lines
 CreateNextSituationInvoice=Create next situation
+ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
+ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
+ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
 NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=Su
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
 NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice
@@ -532,3 +543,4 @@ AutoFillDateFrom=Set start date for service line with invoice date
 AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
+MaxNumberOfGenerationReached=Max number of gen. reached
diff --git a/htdocs/langs/zh_TW/categories.lang b/htdocs/langs/zh_TW/categories.lang
index 78fe0fbf756..52b77c6376f 100644
--- a/htdocs/langs/zh_TW/categories.lang
+++ b/htdocs/langs/zh_TW/categories.lang
@@ -1,55 +1,55 @@
 # Dolibarr language file - Source file is en_US - categories
-Rubrique=Tag/Category
+Rubrique=標籤/類別
 Rubriques=標籤/分類
 RubriquesTransactions=Tags/Categories of transactions
-categories=tags/categories
-NoCategoryYet=No tag/category of this type created
+categories=標籤/各式類別
+NoCategoryYet=此類型沒有已建立標籤/類別
 In=在
 AddIn=加入
 modify=修改
 Classify=分類
-CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Products/Services tags/categories area
-SuppliersCategoriesArea=Suppliers tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-MembersCategoriesArea=Members tags/categories area
+CategoriesArea=標籤/各式類別區
+ProductsCategoriesArea=產品/服務的標籤/各式類別區
+SuppliersCategoriesArea=供應商的標籤/各式類別區
+CustomersCategoriesArea=客戶的標籤/各式類別區
+MembersCategoriesArea=會員的標籤/各式類別區
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
 ProjectsCategoriesArea=Projects tags/categories area
-SubCats=Sub-categories
-CatList=List of tags/categories
-NewCategory=New tag/category
-ModifCat=Modify tag/category
-CatCreated=Tag/category created
-CreateCat=Create tag/category
-CreateThisCat=Create this tag/category
+SubCats=子各式類別
+CatList=標籤/各式類別的明細表
+NewCategory=新的標籤/類別
+ModifCat=修改標籤/類別
+CatCreated=標籤/類別已建立
+CreateCat=建立標籤/類別
+CreateThisCat=建立此標籤/類別
 NoSubCat=無子類別
 SubCatOf=子類別
-FoundCats=Found tags/categories
-ImpossibleAddCat=Impossible to add the tag/category %s
+FoundCats=已尋找標籤/各式類別
+ImpossibleAddCat=不可能增加標籤/類別%s
 WasAddedSuccessfully=<b>%s</b>是添加成功。
-ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-ProductIsInCategories=Product/service is linked to following tags/categories
-CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
-MemberIsInCategories=This member is linked to following members tags/categories
+ObjectAlreadyLinkedToCategory=元件已連上此標籤/類別
+ProductIsInCategories=產品/服務已連上接下來的標籤/各式類別
+CompanyIsInCustomersCategories=合作方已連上接下來的客戶/願景的標籤/各式類別
+CompanyIsInSuppliersCategories=此合作方已連上接下來的供應商標籤/各式類別
+MemberIsInCategories=此會員已連上接下來的會員標籤/各式類別
 ContactIsInCategories=This contact is linked to following contacts tags/categories
-ProductHasNoCategory=This product/service is not in any tags/categories
-CompanyHasNoCategory=This third party is not in any tags/categories
-MemberHasNoCategory=This member is not in any tags/categories
+ProductHasNoCategory=此產品/服務已無任何標籤/各式類別
+CompanyHasNoCategory=在標籤/各式類別中沒有此合作方
+MemberHasNoCategory=在標籤/各式類別中沒有此會員
 ContactHasNoCategory=This contact is not in any tags/categories
 ProjectHasNoCategory=This project is not in any tags/categories
-ClassifyInCategory=Add to tag/category
-NotCategorized=Without tag/category
+ClassifyInCategory=增加到標籤/類別
+NotCategorized=沒有標籤/類別
 CategoryExistsAtSameLevel=此類別已存在此號
 ContentsVisibleByAllShort=所有內容可見
 ContentsNotVisibleByAllShort=所有內容不可見
-DeleteCategory=Delete tag/category
-ConfirmDeleteCategory=Are you sure you want to delete this tag/category?
-NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tag/category
-CustomersCategoryShort=Customers tag/category
-ProductsCategoryShort=Products tag/category
+DeleteCategory=刪除標籤/類別
+ConfirmDeleteCategory=您確定要刪除此標籤/類別嗎？
+NoCategoriesDefined=沒有已定義的標籤/類別
+SuppliersCategoryShort=供應商標籤/類別
+CustomersCategoryShort=客戶標籤/類別
+ProductsCategoryShort=產品標籤/類別
 MembersCategoryShort=Members tag/category
 SuppliersCategoriesShort=Suppliers tags/categories
 CustomersCategoriesShort=Customers tags/categories
@@ -85,3 +85,4 @@ CategorieRecursivHelp=If activated, product will also linked to parent category
 AddProductServiceIntoCategory=Add the following product/service
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
+ChooseCategory=Choose category
diff --git a/htdocs/langs/zh_TW/commercial.lang b/htdocs/langs/zh_TW/commercial.lang
index 65f38974f3a..e9191263a38 100644
--- a/htdocs/langs/zh_TW/commercial.lang
+++ b/htdocs/langs/zh_TW/commercial.lang
@@ -45,9 +45,9 @@ LastProspectDoNotContact=無須聯絡
 LastProspectNeverContacted=從未聯絡過
 LastProspectToContact=待聯絡
 LastProspectContactInProcess=聯絡中
-LastProspectContactDone=聯絡完成
+LastProspectContactDone=完成連絡
 ActionAffectedTo=Event assigned to
-ActionDoneBy=行動方面所做的
+ActionDoneBy=由誰完成事件
 ActionAC_TEL=電話
 ActionAC_FAX=發送傳真
 ActionAC_PROP=通過郵件發送建議
@@ -60,8 +60,8 @@ ActionAC_CLO=關閉
 ActionAC_EMAILING=發送大量的電子郵件
 ActionAC_COM=通過郵件發送客戶訂單
 ActionAC_SHIP=發送郵件運輸
-ActionAC_SUP_ORD=郵寄供應商的訂單
-ActionAC_SUP_INV=郵寄發票的供應商
+ActionAC_SUP_ORD=Send purchase order by mail
+ActionAC_SUP_INV=Send vendor invoice by mail
 ActionAC_OTH=其他
 ActionAC_OTH_AUTO=Automatically inserted events
 ActionAC_MANUAL=Manually inserted events
diff --git a/htdocs/langs/zh_TW/companies.lang b/htdocs/langs/zh_TW/companies.lang
index 17e728ef738..4d9c1870c70 100644
--- a/htdocs/langs/zh_TW/companies.lang
+++ b/htdocs/langs/zh_TW/companies.lang
@@ -8,11 +8,11 @@ ConfirmDeleteContact=Are you sure you want to delete this contact and all inheri
 MenuNewThirdParty=建立新客戶/供應商
 MenuNewCustomer=建立新客戶
 MenuNewProspect=建立新潛在名單
-MenuNewSupplier=建立新供應商
+MenuNewSupplier=New vendor
 MenuNewPrivateIndividual=新的私營個體
-NewCompany=新客戶/供應商（潛在、客戶、供應商）
-NewThirdParty=新客戶/供應商（潛在、客戶、供應商）
-CreateDolibarrThirdPartySupplier=建立一個合作廠商(供應商)
+NewCompany=New company (prospect, customer, vendor)
+NewThirdParty=New third party (prospect, customer, vendor)
+CreateDolibarrThirdPartySupplier=Create a third party (vendor)
 CreateThirdPartyOnly=新增客戶/供應商
 CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=勘察區
@@ -37,20 +37,20 @@ ThirdPartyProspectsStats=潛在
 ThirdPartyCustomers=客戶
 ThirdPartyCustomersStats=客戶
 ThirdPartyCustomersWithIdProf12=與%s或%客戶s
-ThirdPartySuppliers=供應商
+ThirdPartySuppliers=Vendors
 ThirdPartyType=客戶/供應商類型
 Individual=私營個體
 ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=母公司
 Subsidiaries=附屬公司
 ReportByMonth=Report by month
-ReportByCustomers=Report by customer
+ReportByCustomers=依客戶排序的報表
 ReportByQuarter=報告率
 CivilityCode=文明守則
 RegisteredOffice=註冊辦事處
 Lastname=姓氏
 Firstname=名字
-PostOrFunction=Job position
+PostOrFunction=職稱
 UserTitle=稱呼
 NatureOfThirdParty=Nature of Third party
 Address=地址
@@ -76,12 +76,12 @@ Town=城市
 Web=網站
 Poste= 位置
 DefaultLang=預設語系
-VATIsUsed=Sales tax is used
-VATIsUsedWhenSelling=This define if this thirdparty includes a sale tax or not when it makes an invoice to its own customers
-VATIsNotUsed=Sales tax is not used
-CopyAddressFromSoc=Fill address with third party address
-ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Thirdparty neither customer nor supplier, discounts are not available
+VATIsUsed=使用中的銷售稅
+VATIsUsedWhenSelling=This define if this third party includes a sale tax or not when it makes an invoice to its own customers
+VATIsNotUsed=不使用的銷售稅
+CopyAddressFromSoc=填上合作方的地址
+ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available refering objects
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor supplier, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=建議
 OverAllOrders=訂單
@@ -99,9 +99,9 @@ LocalTax2ES=IRPF
 TypeLocaltax1ES=RE種類
 TypeLocaltax2ES=IRPF種類
 WrongCustomerCode=客戶代碼無效
-WrongSupplierCode=供應商代號無效
+WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=客戶編碼模組
-SupplierCodeModel=供應商編碼模組
+SupplierCodeModel=Vendor code model
 Gencod=條碼
 ##### Professional ID #####
 ProfId1Short=ProfID1
@@ -258,8 +258,8 @@ ProfId1DZ=鋼筋混凝土
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=Sales tax ID
-VATIntraShort=Tax ID
+VATIntra=銷售稅 ID
+VATIntraShort=稅務 ID
 VATIntraSyntaxIsValid=語法是有效的
 VATReturn=VAT return
 ProspectCustomer=潛在/客戶
@@ -267,7 +267,7 @@ Prospect=潛在
 CustomerCard=客戶卡
 Customer=客戶
 CustomerRelativeDiscount=相對客戶折扣
-SupplierRelativeDiscount=Relative supplier discount
+SupplierRelativeDiscount=Relative vendor discount
 CustomerRelativeDiscountShort=相對折扣
 CustomerAbsoluteDiscountShort=無條件折扣
 CompanyHasRelativeDiscount=這個客戶有一個<b>%s%%</b>的折扣
@@ -284,8 +284,8 @@ HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this suppl
 CompanyHasNoAbsoluteDiscount=此客戶沒有無條件折扣條件
 CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
 CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
-SupplierAbsoluteDiscountAllUsers=Absolute supplier discounts (granted by all users)
-SupplierAbsoluteDiscountMy=Absolute supplier discounts (granted by yourself)
+SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
+SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=無
 Supplier=供應商
 AddContact=建立聯絡人資訊
@@ -304,13 +304,13 @@ DeleteACompany=刪除公司
 PersonalInformations=個人資料
 AccountancyCode=Accounting account
 CustomerCode=客戶代碼
-SupplierCode=供應商代號
+SupplierCode=Vendor code
 CustomerCodeShort=Customer code
-SupplierCodeShort=Supplier code
+SupplierCodeShort=Vendor code
 CustomerCodeDesc=客戶代碼(唯一碼，不同客戶有不同代碼)
-SupplierCodeDesc=供應商代碼(唯一碼，不同供應商有不同代碼)
+SupplierCodeDesc=Vendor code, unique for all vendors
 RequiredIfCustomer=必需填入(如果是客戶或潛在)
-RequiredIfSupplier=必需填入(如果是供應商)
+RequiredIfSupplier=Required if third party is a vendor
 ValidityControledByModule=正確性是由此模組控制
 ThisIsModuleRules=這是此模組的規則
 ProspectToContact=展望接觸
@@ -318,7 +318,7 @@ CompanyDeleted=公司“%S”已從資料庫中刪除。
 ListOfContacts=聯絡人名單
 ListOfContactsAddresses=聯絡人及地址清單
 ListOfThirdParties=客戶/供應商清單
-ShowCompany=Show third party
+ShowCompany=顯示合作方
 ShowContact=顯示聯絡
 ContactsAllShort=全部（不過濾）
 ContactType=聯絡型式
@@ -338,7 +338,7 @@ MyContacts=我的聯絡人
 Capital=資本
 CapitalOf=資本 %s
 EditCompany=編輯公司
-ThisUserIsNot=這個用戶不是一個潛在客戶、客戶或供應商
+ThisUserIsNot=This user is not a prospect, customer nor vendor
 VATIntraCheck=查詢
 VATIntraCheckDesc=<b>%s</b>連結允許連上"歐盟營業稅檢查服務"網頁。連上此網頁需具有外部網際網路連線能力。
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
@@ -375,12 +375,12 @@ StatusProspect-1=無需聯絡
 StatusProspect0=從未聯絡過
 StatusProspect1=To be contacted
 StatusProspect2=聯絡中
-StatusProspect3=聯絡完成
+StatusProspect3=完成連絡
 ChangeDoNotContact=禁止聯絡
 ChangeNeverContacted=未曾接觸
 ChangeToContact=Change status to 'To be contacted'
 ChangeContactInProcess=聯絡中
-ChangeContactDone=已連絡
+ChangeContactDone=改變狀態為 " 完成連絡 "
 ProspectsByStatus=潛在狀態
 NoParentCompany=無
 ExportCardToFormat=匯出格式
@@ -396,7 +396,7 @@ ImportDataset_company_4=Third parties/Sales representatives (Assign sales repres
 PriceLevel=價格水平
 DeliveryAddress=送貨地址
 AddAddress=添加地址
-SupplierCategory=供應商類別
+SupplierCategory=Vendor category
 JuridicalStatus200=Independent
 DeleteFile=刪除文件
 ConfirmDeleteFile=你確定要刪除這個文件？
@@ -406,7 +406,7 @@ FiscalYearInformation=信息財政年度
 FiscalMonthStart=本財年開始一個月
 YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
 YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
-ListSuppliersShort=供應商名單
+ListSuppliersShort=List of vendors
 ListProspectsShort=潛在名單
 ListCustomersShort=客戶名單
 ThirdPartiesArea=客戶/供應商資料區
@@ -420,7 +420,7 @@ CurrentOutstandingBill=目前未兌現票據
 OutstandingBill=最高數量的未兌現票據
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=用以下固定的方式回傳編號:<br> %syymm-nnnn 為客戶編號生成格式。<br> %syymm-nnnn 為供應商編號生成格式。<br>   yy 是年、mm是月、nnnn是一個不為0的序號。
+MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for vendor code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
 LeopardNumRefModelDesc=客戶/供應商編號規則不受限制，此編碼可以隨時修改。(可開啟Elephant or Monkey模組來設定編碼規則)
 ManagingDirectors=主管(們)姓名 (執行長, 部門主管, 總裁...)
 MergeOriginThirdparty=重複的客戶/供應商 (你想刪除的客戶/供應商)
@@ -431,4 +431,4 @@ SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=First name of sales representative
 SaleRepresentativeLastname=Last name of sales representative
 ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
+NewCustomerSupplierCodeProposed=New customer or vendor code suggested on duplicate code
diff --git a/htdocs/langs/zh_TW/compta.lang b/htdocs/langs/zh_TW/compta.lang
index a48ffd3e084..05971ae2538 100644
--- a/htdocs/langs/zh_TW/compta.lang
+++ b/htdocs/langs/zh_TW/compta.lang
@@ -34,7 +34,8 @@ AmountHTVATRealPaid=凈支付
 VATToPay=Tax sales
 VATReceived=Tax received
 VATToCollect=Tax purchases
-VATSummary=Tax Balance
+VATSummary=Tax monthly
+VATBalance=Tax Balance
 VATPaid=Tax paid
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
@@ -80,12 +81,12 @@ AccountancyTreasuryArea=財務/會計區
 NewPayment=新的支付
 Payments=付款
 PaymentCustomerInvoice=客戶付款發票
-PaymentSupplierInvoice=供應商發票付款
-PaymentSocialContribution=Social/fiscal tax payment
+PaymentSupplierInvoice=Vendor invoice payment
+PaymentSocialContribution=社會/財務稅負繳款單
 PaymentVat=增值稅納稅
 ListPayment=金名單
 ListOfCustomerPayments=客戶已付款名單
-ListOfSupplierPayments=供應商已付款的名單
+ListOfSupplierPayments=List of vendor payments
 DateStartPeriod=Date start period
 DateEndPeriod=Date end period
 newLT1Payment=New tax 2 payment
@@ -110,7 +111,7 @@ ShowVatPayment=顯示增值稅納稅
 TotalToPay=共支付
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
 CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Supplier accounting code
+SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. account. code
 SupplierAccountancyCodeShort=Sup. account. code
 AccountNumber=帳號
@@ -171,6 +172,8 @@ LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=報告由第三方IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByRates=Sale tax report by rates
+VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
 VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
 VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
@@ -207,7 +210,7 @@ Pcg_version=Chart of accounts models
 Pcg_type=Pcg type
 Pcg_subtype=Pcg subtype
 InvoiceLinesToDispatch=Invoice lines to dispatch
-ByProductsAndServices=By products and services
+ByProductsAndServices=By product and service
 RefExt=External ref
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
 LinkedOrder=Link to order
@@ -215,7 +218,8 @@ Mode1=Method 1
 Mode2=Method 2
 CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
 CalculationRuleDescSupplier=According to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
+TurnoverPerProductInCommitmentAccountingNotRelevant=The Turnover report per product, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The Turnover report per sale tax rate, when using a <b>cash accounting</b> mode is not relevant. This report is only available when using <b>commitment accounting</b> mode (see setup of accountancy module).
 CalculationMode=Calculation mode
 AccountancyJournal=Accounting code journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
@@ -223,7 +227,7 @@ ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (u
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for supplier third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined.
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
@@ -238,7 +242,14 @@ LinkedFichinter=Link to an intervention
 ImportDataset_tax_contrib=Social/fiscal taxes
 ImportDataset_tax_vat=Vat payments
 ErrorBankAccountNotFound=Error: Bank account not found
-FiscalPeriod=Accounting period
+FiscalPeriod=會計期間
 ListSocialContributionAssociatedProject=List of social contributions associated with the project
 DeleteFromCat=Remove from accounting group
 AccountingAffectation=Accounting assignement
+LastDayTaxIsRelatedTo=Last day of period the tax is related to
+VATDue=Sale tax claimed
+ClaimedForThisPeriod=Claimed for the period
+PaidDuringThisPeriod=Paid during this period
+ByVatRate=By sale tax rate
+TurnoverbyVatrate=Turnover by sale tax rate
+PurchasebyVatrate=Purchase by sale tax rate
diff --git a/htdocs/langs/zh_TW/dict.lang b/htdocs/langs/zh_TW/dict.lang
index fbdb7876965..85310a761c9 100644
--- a/htdocs/langs/zh_TW/dict.lang
+++ b/htdocs/langs/zh_TW/dict.lang
@@ -5,7 +5,8 @@ CountryIT=意大利
 CountryES=西班牙
 CountryDE=德國
 CountryCH=瑞士
-CountryGB=大不列顛
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=United Kingdom
 CountryUK=United Kingdom
 CountryIE=愛爾蘭
 CountryCN=中國
@@ -138,7 +139,7 @@ CountryLS=萊索托
 CountryLR=利比裏亞
 CountryLY=利比亞
 CountryLI=列支敦士登
-CountryLT=Lithuania
+CountryLT=立陶宛
 CountryLU=盧森堡
 CountryMO=澳門
 CountryMK=馬其頓，前南斯拉夫的
@@ -252,7 +253,7 @@ CivilityMME=夫人
 CivilityMR=先生
 CivilityMLE=女士
 CivilityMTRE=主
-CivilityDR=Doctor
+CivilityDR=醫生
 ##### Currencies #####
 Currencyeuros=歐元
 CurrencyAUD=澳元
@@ -289,10 +290,10 @@ CurrencyXOF=非洲法郎西非國家中央銀行
 CurrencySingXOF=郎西非國家中央銀行
 CurrencyXPF=CFP法郎
 CurrencySingXPF=太平洋法郎
-CurrencyCentSingEUR=cent
+CurrencyCentSingEUR=一分錢
 CurrencyCentINR=paisa
 CurrencyCentSingINR=paise
-CurrencyThousandthSingTND=thousandth
+CurrencyThousandthSingTND=千分之一
 #### Input reasons #####
 DemandReasonTypeSRC_INTE=因特網
 DemandReasonTypeSRC_CAMP_MAIL=郵寄活動
@@ -301,24 +302,24 @@ DemandReasonTypeSRC_CAMP_PHO=電話運動
 DemandReasonTypeSRC_CAMP_FAX=傳真運動
 DemandReasonTypeSRC_COMM=商業聯系
 DemandReasonTypeSRC_SHOP=商店聯系
-DemandReasonTypeSRC_WOM=Word of mouth
-DemandReasonTypeSRC_PARTNER=Partner
-DemandReasonTypeSRC_EMPLOYEE=Employee
-DemandReasonTypeSRC_SPONSORING=Sponsorship
+DemandReasonTypeSRC_WOM=口碑
+DemandReasonTypeSRC_PARTNER=夥伴
+DemandReasonTypeSRC_EMPLOYEE=員工
+DemandReasonTypeSRC_SPONSORING=贊助
 #### Paper formats ####
-PaperFormatEU4A0=Format 4A0
-PaperFormatEU2A0=Format 2A0
-PaperFormatEUA0=Format A0
-PaperFormatEUA1=Format A1
-PaperFormatEUA2=Format A2
-PaperFormatEUA3=Format A3
-PaperFormatEUA4=Format A4
-PaperFormatEUA5=Format A5
-PaperFormatEUA6=Format A6
-PaperFormatUSLETTER=Format Letter US
-PaperFormatUSLEGAL=Format Legal US
-PaperFormatUSEXECUTIVE=Format Executive US
-PaperFormatUSLEDGER=Format Ledger/Tabloid
+PaperFormatEU4A0=4A0 格式
+PaperFormatEU2A0=2A0 格式
+PaperFormatEUA0=A0 格式
+PaperFormatEUA1=A1 格式
+PaperFormatEUA2=A2 格式
+PaperFormatEUA3=A3 格式
+PaperFormatEUA4=A4 格式
+PaperFormatEUA5=A5 格式
+PaperFormatEUA6=A6 格式
+PaperFormatUSLETTER=美式信件格式
+PaperFormatUSLEGAL=美式法定格式
+PaperFormatUSEXECUTIVE=美式執行格式
+PaperFormatUSLEDGER=總帳/小報格式
 PaperFormatCAP1=Format P1 Canada
 PaperFormatCAP2=Format P2 Canada
 PaperFormatCAP3=Format P3 Canada
diff --git a/htdocs/langs/zh_TW/ecm.lang b/htdocs/langs/zh_TW/ecm.lang
index e2bdf32b7f9..4f512e479cd 100644
--- a/htdocs/langs/zh_TW/ecm.lang
+++ b/htdocs/langs/zh_TW/ecm.lang
@@ -39,9 +39,10 @@ ShowECMSection=顯示目錄
 DeleteSection=刪除目錄
 ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
 ECMDirectoryForFiles=相對目錄的文件
-CannotRemoveDirectoryContainsFiles=刪除不可能的，因為它包含了一些文件
+CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
+CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
 ECMFileManager=檔案管理員
-ECMSelectASection=左樹中選擇一個目錄...
+ECMSelectASection=Select a directory in the tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
 ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
diff --git a/htdocs/langs/zh_TW/errors.lang b/htdocs/langs/zh_TW/errors.lang
index d32cec1cfda..ca3ed90786b 100644
--- a/htdocs/langs/zh_TW/errors.lang
+++ b/htdocs/langs/zh_TW/errors.lang
@@ -32,9 +32,9 @@ ErrorBarCodeRequired=Bar code required
 ErrorCustomerCodeAlreadyUsed=客戶代碼已被使用
 ErrorBarCodeAlreadyUsed=Bar code already used
 ErrorPrefixRequired=前綴要求
-ErrorBadSupplierCodeSyntax=錯誤!錯誤的供應商代碼語法
-ErrorSupplierCodeRequired=錯誤!需要提供供應商代號
-ErrorSupplierCodeAlreadyUsed=錯誤!供應商代號已被使用
+ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
+ErrorSupplierCodeRequired=Vendor code required
+ErrorSupplierCodeAlreadyUsed=Vendor code already used
 ErrorBadParameters=錯誤的參數
 ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
 ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
@@ -71,7 +71,7 @@ ErrorNoAccountancyModuleLoaded=沒有一個會計模塊激活
 ErrorExportDuplicateProfil=This profile name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr - LDAP的匹配是不完整的。
 ErrorLDAPMakeManualTest=甲。LDIF文件已經生成在目錄%s的嘗試加載命令行手動有更多的錯誤信息。
-ErrorCantSaveADoneUserWithZeroPercentage=無法儲存與行動“規約未啟動”如果領域“做的”，也是填補。
+ErrorCantSaveADoneUserWithZeroPercentage=若欄位也填上 "由誰完成" 則不能將行動存成 "未開始的狀態"
 ErrorRefAlreadyExists=號的創作已經存在。
 ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
 ErrorRecordHasChildren=Failed to delete record since it has some childs.
@@ -87,7 +87,7 @@ ErrorsOnXLines=<b>%</b>誤差<b>的</b>源上線
 ErrorFileIsInfectedWithAVirus=防病毒程序無法驗證文件（文件可能被病毒感染）
 ErrorSpecialCharNotAllowedForField=特殊字符不為外地允許“%s的”
 ErrorNumRefModel=存在一個引用（%s）和編號是不符合本規則兼容到數據庫。記錄中刪除或重命名參考激活此模塊。
-ErrorQtyTooLowForThisSupplier=數量過低，供應商或供應商在這此產品沒有價格定義
+ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this supplier
 ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=錯誤的遮罩參數值
 ErrorBadMaskFailedToLocatePosOfSequence=沒有序列號錯誤，面具
@@ -177,7 +177,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
 ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
-ErrorSupplierCountryIsNotDefined=未定義此供應商國別
+ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
diff --git a/htdocs/langs/zh_TW/exports.lang b/htdocs/langs/zh_TW/exports.lang
index 44730adae30..05e78fe0f5b 100644
--- a/htdocs/langs/zh_TW/exports.lang
+++ b/htdocs/langs/zh_TW/exports.lang
@@ -120,7 +120,7 @@ SelectPrimaryColumnsForUpdateAttempt=Select column(s) to use as primary key for
 UpdateNotYetSupportedForThisImport=Update is not supported for this type of import (only insert)
 NoUpdateAttempt=No update attempt was performed, only insert
 ImportDataset_user_1=Users (employees or not) and properties
-ComputedField=Computed field
+ComputedField=計算欄位
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
 FilteredFields=Filtered fields
diff --git a/htdocs/langs/zh_TW/ftp.lang b/htdocs/langs/zh_TW/ftp.lang
index e8962f85922..caf5fc3f19c 100644
--- a/htdocs/langs/zh_TW/ftp.lang
+++ b/htdocs/langs/zh_TW/ftp.lang
@@ -9,6 +9,6 @@ FailedToConnectToFTPServer=無法連接到FTP服務器（服務器%s，港口%s
 FailedToConnectToFTPServerWithCredentials=無法登錄到FTP服務器的定義登錄/密碼
 FTPFailedToRemoveFile=無法刪除文件<b>%s。</b>
 FTPFailedToRemoveDir=無法刪除目錄<b>%s（</b>檢查權限和目錄是空的）。
-FTPPassiveMode=Passive mode
-ChooseAFTPEntryIntoMenu=Choose a FTP entry into menu...
-FailedToGetFile=Failed to get files %s
+FTPPassiveMode=被動模式
+ChooseAFTPEntryIntoMenu=選擇 FTP 選項放入選單中...
+FailedToGetFile=無法獲取檔案 %s
diff --git a/htdocs/langs/zh_TW/help.lang b/htdocs/langs/zh_TW/help.lang
index f6822f5e4fc..ac22c7a46a7 100644
--- a/htdocs/langs/zh_TW/help.lang
+++ b/htdocs/langs/zh_TW/help.lang
@@ -11,7 +11,7 @@ TypeOfSupport=源支持
 TypeSupportCommunauty=社區（免費）
 TypeSupportCommercial=商業
 TypeOfHelp=說明類型
-NeedHelpCenter=Need help or support?
+NeedHelpCenter=需要幫助或支援嗎？
 Efficiency=效率
 TypeHelpOnly=只需要說明
 TypeHelpDev=說明+開發
@@ -22,5 +22,5 @@ ToGetHelpGoOnSparkAngels2=有時，是目前公司沒有可供您進行搜尋，
 BackToHelpCenter=否則，請點擊這裏進入<a href="%s">返回幫助中心主頁</a> 。
 LinkToGoldMember=你可以調用由Dolibarr預選您的語言（%s的按一下他的小工具（狀態和最高價格自動更新））的教練之一：
 PossibleLanguages=支持的語言
-SubscribeToFoundation=Help Dolibarr project, subscribe to the foundation
-SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>
+SubscribeToFoundation=幫助 Dolibarr 專案，訂閱基金會
+SeeOfficalSupport=用您的語言給 Dolibarr 官方支持：<br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/zh_TW/holiday.lang b/htdocs/langs/zh_TW/holiday.lang
index 86d92dab855..3df277ecc7e 100644
--- a/htdocs/langs/zh_TW/holiday.lang
+++ b/htdocs/langs/zh_TW/holiday.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - holiday
-HRM=HRM
+HRM=人資
 Holidays=休假
 CPTitreMenu=休假
 MenuReportMonth=Monthly statement
@@ -16,7 +16,12 @@ CancelCP=取消
 RefuseCP=拒絕
 ValidatorCP=Approbator
 ListeCP=List of leaves
+LeaveId=Leave ID
 ReviewedByCP=Will be approved by
+UserForApprovalID=User for approval ID
+UserForApprovalFirstname=Firstname of approval user
+UserForApprovalLastname=Lastname of approval user
+UserForApprovalLogin=Login of approval user
 DescCP=描述
 SendRequestCP=Create leave request
 DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
@@ -30,7 +35,14 @@ ErrorUserViewCP=You are not authorized to read this leave request.
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
 TitreRequestCP=Leave request
+TypeOfLeaveId=Type of leave ID
+TypeOfLeaveCode=Type of leave code
+TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=Number of days of vacation consumed
+NbUseDaysCPShort=Days consumed
+NbUseDaysCPShortInMonth=Days consumed in month
+DateStartInMonth=Start date in month
+DateEndInMonth=End date in month
 EditCP=編輯
 DeleteCP=刪除
 ActionRefuseCP=Refuse
@@ -59,6 +71,7 @@ DateRefusCP=Date of refusal
 DateCancelCP=Date of cancellation
 DefineEventUserCP=Assign an exceptional leave for a user
 addEventToUserCP=Assign leave
+NotTheAssignedApprover=You are not the assigned approver
 MotifCP=雷森
 UserCP=用戶
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
@@ -69,7 +82,7 @@ ActionByCP=Performed by
 UserUpdateCP=For the user
 PrevSoldeCP=Previous Balance
 NewSoldeCP=New Balance
-alreadyCPexist=A leave request has already been done on this period.
+alreadyCPexist=在這段期間離職請求已完成。
 FirstDayOfHoliday=First day of vacation
 LastDayOfHoliday=Last day of vacation
 BoxTitleLastLeaveRequests=Latest %s modified leave requests
@@ -81,7 +94,12 @@ EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 LastHolidays=Latest %s leave requests
 AllHolidays=All leave requests
-
+HalfDay=Half day
+NotTheAssignedApprover=You are not the assigned approver
+LEAVE_PAID=Paid vacation
+LEAVE_SICK=Sick leave
+LEAVE_OTHER=Other leave
+LEAVE_PAID_FR=Paid vacation
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
 MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
@@ -89,7 +107,7 @@ UpdateConfCPOK=Updated successfully.
 Module27130Name= Management of leave requests
 Module27130Desc= Management of leave requests
 ErrorMailNotSend=An error occurred while sending email:
-NoticePeriod=Notice period
+NoticePeriod=通知期
 #Messages
 HolidaysToValidate=Validate leave requests
 HolidaysToValidateBody=Below is a leave request to validate
diff --git a/htdocs/langs/zh_TW/hrm.lang b/htdocs/langs/zh_TW/hrm.lang
index 3889c73dbbb..485c466269a 100644
--- a/htdocs/langs/zh_TW/hrm.lang
+++ b/htdocs/langs/zh_TW/hrm.lang
@@ -13,5 +13,5 @@ DictionaryDepartment=HRM - Department list
 DictionaryFunction=HRM - Function list
 # Module
 Employees=Employees
-Employee=Employee
+Employee=員工
 NewEmployee=New employee
diff --git a/htdocs/langs/zh_TW/install.lang b/htdocs/langs/zh_TW/install.lang
index f247e900847..69900586073 100644
--- a/htdocs/langs/zh_TW/install.lang
+++ b/htdocs/langs/zh_TW/install.lang
@@ -6,6 +6,7 @@ ConfFileDoesNotExistsAndCouldNotBeCreated=配置文件<b>%s</b>不存在，無
 ConfFileCouldBeCreated=<b>%s的</b>配置文件可以被創建。
 ConfFileIsNotWritable=配置文件<b>%s</b>不是寫。檢查權限。對於第一次安裝，您的Web服務器必須被授予能夠進入這個文件寫在配置過程中（“文件模式，例如666”在一個像Unix的作業系統）。
 ConfFileIsWritable=配置文件<b>%s</b>是可寫的。
+ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=重新載入配置文件的所有信息。
 PHPSupportSessions=這個PHP支持會議。
 PHPSupportPOSTGETOk=這個PHP支持的變量的POST和GET。
@@ -91,8 +92,8 @@ FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
 WarningRemoveInstallDir=警告，出於安全原因，一旦安裝或升級完成後，你應該刪除<b>安裝目錄或重命名為install.lock，以避免其惡意使用。</b>
 FunctionNotAvailableInThisPHP=不是可以用這個PHP
 ChoosedMigrateScript=選擇遷移腳本
-DataMigration=數據遷移
-DatabaseMigration=結構數據庫遷移
+DataMigration=Database migration (data)
+DatabaseMigration=Database migration (structure + some data)
 ProcessMigrateScript=腳本處理
 ChooseYourSetupMode=選擇你的安裝模式，然後點擊“開始”...
 FreshInstall=全新安裝
@@ -146,7 +147,7 @@ NothingToDo=Nothing to do
 # upgrade
 MigrationFixData=修正了非規範化數據
 MigrationOrder=數據遷移的客戶的訂單
-MigrationSupplierOrder=數據遷移對供應商的訂單
+MigrationSupplierOrder=Data migration for vendor's orders
 MigrationProposal=數據遷移的商業建議
 MigrationInvoice=數據遷移的客戶的發票
 MigrationContract=數據遷移合同
@@ -164,7 +165,7 @@ MigrationContractsLineCreation=創建合同號線中1%的合同
 MigrationContractsNothingToUpdate=沒有更多的事情要做
 MigrationContractsFieldDontExist=場fk_facture不存在了。無事可做。
 MigrationContractsEmptyDatesUpdate=合同空日期更正
-MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=合約空白日期成功地更正完成
 MigrationContractsEmptyDatesNothingToUpdate=沒有合同的日期，以正確的空
 MigrationContractsEmptyCreationDatesNothingToUpdate=沒有合同，以正確的創建日期
 MigrationContractsInvalidDatesUpdate=合同日期更正錯誤的價值
diff --git a/htdocs/langs/zh_TW/interventions.lang b/htdocs/langs/zh_TW/interventions.lang
index d4c78e5184f..ae954f2257c 100644
--- a/htdocs/langs/zh_TW/interventions.lang
+++ b/htdocs/langs/zh_TW/interventions.lang
@@ -26,7 +26,7 @@ DocumentModelStandard=標準文檔模型的幹預
 InterventionCardsAndInterventionLines=Interventions and lines of interventions
 InterventionClassifyBilled=分類“帳單”
 InterventionClassifyUnBilled=Classify "Unbilled"
-InterventionClassifyDone=Classify "Done"
+InterventionClassifyDone=分類“完成”
 StatusInterInvoiced=帳單
 SendInterventionRef=Submission of intervention %s
 SendInterventionByMail=Send intervention by Email
diff --git a/htdocs/langs/zh_TW/ldap.lang b/htdocs/langs/zh_TW/ldap.lang
index e4e0fb848cb..f8bf73736c5 100644
--- a/htdocs/langs/zh_TW/ldap.lang
+++ b/htdocs/langs/zh_TW/ldap.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=密碼域
 YouMustChangePassNextLogon=<b>%</b>用戶密碼<b>%之S</b>必須改變對域。
 UserMustChangePassNextLogon=用戶必須更改密碼的域%s
 LDAPInformationsForThisContact=在此LDAP數據庫信息聯系
@@ -25,3 +24,4 @@ MemberTypeSynchronized=Member type synchronized
 ContactSynchronized=聯系同步
 ForceSynchronize=力同步Dolibarr - &gt;的LDAP
 ErrorFailedToReadLDAP=無法讀取LDAP數據庫。檢查的LDAP模塊設置和數據庫獲取。
+PasswordOfUserInLDAP=Password of user in LDAP
diff --git a/htdocs/langs/zh_TW/loan.lang b/htdocs/langs/zh_TW/loan.lang
index a62e22dca79..51051ef8b08 100644
--- a/htdocs/langs/zh_TW/loan.lang
+++ b/htdocs/langs/zh_TW/loan.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - loan
-Loan=Loan
+Loan=借款
 Loans=Loans
 NewLoan=New Loan
 ShowLoan=Show Loan
@@ -10,6 +10,7 @@ LoanCapital=資本
 Insurance=Insurance
 Interest=Interest
 Nbterms=Number of terms
+Term=Term
 LoanAccountancyCapitalCode=Accounting account capital
 LoanAccountancyInsuranceCode=Accounting account insurance
 LoanAccountancyInterestCode=Accounting account interest
@@ -17,39 +18,14 @@ ConfirmDeleteLoan=Confirm deleting this loan
 LoanDeleted=Loan Deleted Successfully
 ConfirmPayLoan=Confirm classify paid this loan
 LoanPaid=Loan Paid
-# Calc
-LoanCalc=Bank Loans Calculator
-PurchaseFinanceInfo=Purchase & Financing Information
-SalePriceOfAsset=Sale Price of Asset
-PercentageDown=Percentage Down
-LengthOfMortgage=Duration of loan
-AnnualInterestRate=Annual Interest Rate
-ExplainCalculations=Explain Calculations
-ShowMeCalculationsAndAmortization=Show me the calculations and amortization
-MortgagePaymentInformation=Mortgage Payment Information
-DownPayment=Down Payment
-DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
-InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
-MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
-MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
-MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
-MonthlyPaymentDesc=The montly payment is figured out using the following formula
-AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
-AmountFinanced=Amount Financed
-AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
-Totalsforyear=Totals for year
-MonthlyPayment=Monthly Payment
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
-GoToInterest=%s will go towards INTEREST
-GoToPrincipal=%s will go towards PRINCIPAL
-YouWillSpend=You will spend %s in year %s
 ListLoanAssociatedProject=List of loan associated with the project
 AddLoan=Create loan
+FinancialCommitment=Financial commitment
+InterestAmount=Interest
+CapitalRemain=Capital remain
 # Admin
 ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-FinancialCommitment=Financial commitment
 CreateCalcSchedule=Edit financial commitment
-InterestAmount=Interest amount
diff --git a/htdocs/langs/zh_TW/mails.lang b/htdocs/langs/zh_TW/mails.lang
index 66d20ed1267..fcb22f20bdf 100644
--- a/htdocs/langs/zh_TW/mails.lang
+++ b/htdocs/langs/zh_TW/mails.lang
@@ -11,7 +11,9 @@ MailFrom=寄件人
 MailErrorsTo=誤差的
 MailReply=回復
 MailTo=收件人
+MailToUsers=To user(s)
 MailCC=副本
+MailToCCUsers=Copy to users(s)
 MailCCC=緩存副本
 MailTopic=電子郵件的標題
 MailText=郵件內容
@@ -164,4 +166,4 @@ InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
-
+ContactsWithThirdpartyFilter=Contacts avec filtre client
diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang
index 58036e26e9d..d45cd3da7fd 100644
--- a/htdocs/langs/zh_TW/main.lang
+++ b/htdocs/langs/zh_TW/main.lang
@@ -14,7 +14,7 @@ FormatDateShortJava=MM/dd/yyyy
 FormatDateShortJavaInput=MM/dd/yyyy
 FormatDateShortJQuery=mm/dd/yy
 FormatDateShortJQueryInput=mm/dd/yy
-FormatHourShortJQuery=%H:%M
+FormatHourShortJQuery=HH:MI
 FormatHourShort=%I:%M %p
 FormatHourShortDuration=%H:%M
 FormatDateTextShort=%b %d, %Y
@@ -24,13 +24,13 @@ FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
 DatabaseConnection=資料庫連線
-NoTemplateDefined=No template available for this email type
-AvailableVariables=Available substitution variables
+NoTemplateDefined=此電子郵件類別沒有可用的範本
+AvailableVariables=可用的替代變數
 NoTranslation=無交易
-Translation=產品描述翻譯
+Translation=翻譯
 NoRecordFound=沒有找到任何紀錄
-NoRecordDeleted=No record deleted
-NotEnoughDataYet=Not enough data
+NoRecordDeleted=沒有刪除記錄
+NotEnoughDataYet=沒有足夠資料
 NoError=沒有發生錯誤
 Error=錯誤
 Errors=錯誤
@@ -43,80 +43,81 @@ ErrorCanNotReadDir=不能讀取檔案目錄%s
 ErrorConstantNotDefined=參數%s沒定義
 ErrorUnknown=未知錯誤
 ErrorSQL=SQL錯誤
-ErrorLogoFileNotFound=徽標文件'%s'沒有找到
-ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
-ErrorGoToModuleSetup=前往模塊設置來解決此
-ErrorFailedToSendMail=錯誤!無法傳送郵件（寄件人=%s、收件人=%s）。
-ErrorFileNotUploaded=文件沒有上傳。檢查大小不超過允許的最大值，即在磁盤上的可用空間是可用和有沒有這已經與in這個目錄同名文件。
+ErrorLogoFileNotFound=標誌檔案 '%s' 沒有找到
+ErrorGoToGlobalSetup=到 '公司/組織' 設定修正
+ErrorGoToModuleSetup=前往模組設定修正
+ErrorFailedToSendMail=無法傳送郵件 (寄件人=%s、收件人=%s)
+ErrorFileNotUploaded=檔案沒有上傳。檢查檔案大小沒有超過可允許的最大值，即磁碟上的可用空間以及在此資料夾中有沒有相同檔案。
 ErrorInternalErrorDetected=錯誤檢測
 ErrorWrongHostParameter=錯誤的主機參數
-ErrorYourCountryIsNotDefined=你的國家是沒有定義。回到首頁安裝程序，編輯和後再次形成。
-ErrorRecordIsUsedByChild=無法刪除此記錄。此記錄至少使用子記錄。
+ErrorYourCountryIsNotDefined=您的國家是沒有定義。到首頁-設定-編輯和後再次填寫表單。
+ErrorRecordIsUsedByChild=無法刪除此記錄。此記錄至少已使用到一個子記錄。
 ErrorWrongValue=錯誤的值
-ErrorWrongValueForParameterX=錯誤的參數值之%
+ErrorWrongValueForParameterX=參數%s的錯誤值
 ErrorNoRequestInError=在錯誤狀況下，沒有要求
 ErrorServiceUnavailableTryLater=服務暫時無法使用。請稍後再試。
-ErrorDuplicateField=重復的值在一個獨特的領域
-ErrorSomeErrorWereFoundRollbackIsDone=有些發現錯誤。我們回滾更改。
-ErrorConfigParameterNotDefined=參數<b>%s</b>是沒有定義的配置文件裏面Dolibarr <b>conf.php。</b>
-ErrorCantLoadUserFromDolibarrDatabase=無法找到用戶<b>%s</b>在Dolibarr數據庫。
-ErrorNoVATRateDefinedForSellerCountry=錯誤!沒有定義 '%s' 幣別的營業稅率。
-ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
-ErrorFailedToSaveFile=錯誤，無法保存文件。
-ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one
-MaxNbOfRecordPerPage=Max number of record per page
-NotAuthorized=You are not authorized to do that.
+ErrorDuplicateField=在唯一的欄位有重覆的值
+ErrorSomeErrorWereFoundRollbackIsDone=發現某些錯誤。我們會滾動式修改。
+ErrorConfigParameterNotDefined=參數<b>%s</b>沒有定義在 Dolibarr 配置檔案 <b>conf.php</b>裡。
+ErrorCantLoadUserFromDolibarrDatabase=在 Dolibarr 資料庫中無法找到用戶<b>%s</b>。
+ErrorNoVATRateDefinedForSellerCountry=錯誤，沒有定義 '%s' 國家的營業稅率。
+ErrorNoSocialContributionForSellerCountry=錯誤，在 '%s' 國家中沒有定義社會/財務稅務類別。
+ErrorFailedToSaveFile=錯誤，無法儲存檔案。
+ErrorCannotAddThisParentWarehouse=您正在試著新增目前已經是子倉庫的父倉庫
+MaxNbOfRecordPerPage=每頁記錄的最大數
+NotAuthorized=您無權這樣做。
 SetDate=設定日期
 SelectDate=選擇日期
 SeeAlso=請參考 %s
-SeeHere=See here
+SeeHere=看這裡
 ClickHere=點擊這裏
-Here=Here
-Apply=Apply
-BackgroundColorByDefault=默認的背景顏色
-FileRenamed=The file was successfully renamed
-FileGenerated=The file was successfully generated
-FileSaved=The file was successfully saved
-FileUploaded=檔案已上傳
-FileTransferComplete=File(s) was uploaded successfully
-FilesDeleted=File(s) successfully deleted
-FileWasNotUploaded=附件尚未上傳
-NbOfEntries=鈮條目
-GoToWikiHelpPage=Read online help (Internet access needed)
-GoToHelpPage=閱讀幫助
+Here=這裡
+Apply=套用
+BackgroundColorByDefault=預設的背景顏色
+FileRenamed=檔案已成功地變更名稱
+FileGenerated=檔案已成功地產生
+FileSaved=檔案已成功地儲存
+FileUploaded=檔案已成功地上傳
+FileTransferComplete=檔案成功地已上傳
+FilesDeleted=檔案已成功地刪除
+FileWasNotUploaded=夾檔所選定的檔案尚未上傳。點選 "附加檔案"。
+NbOfEntries=條目的數量
+GoToWikiHelpPage=讀取線上求助 (需要連上網路)
+GoToHelpPage=讀取求助
 RecordSaved=記錄保存
 RecordDeleted=紀錄已刪除
 LevelOfFeature=特色等級
 NotDefined=未定義
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
+DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr 認證模式是在編好設定檔案<b> conf.php </b> 中設定成 <b>%s</b>。<br>即密碼資料庫是外部到 Dolibarr，所以變更此欄位是沒有效果的。
 Administrator=管理員
 Undefined=未定義
-PasswordForgotten=Password forgotten?
+PasswordForgotten=忘記密碼？
+NoAccount=No account?
 SeeAbove=見上文
 HomeArea=首頁區
-LastConnexion=Latest connection
+LastConnexion=最新一次連線
 PreviousConnexion=上次連線時間
-PreviousValue=Previous value
-ConnectedOnMultiCompany=對實體連接
-ConnectedSince=自連接
-AuthenticationMode=Authentication mode
-RequestedUrl=Requested URL
-DatabaseTypeManager=資料庫管理器
-RequestLastAccessInError=Latest database access request error
-ReturnCodeLastAccessInError=Return code for latest database access request error
-InformationLastAccessInError=Information for latest database access request error
+PreviousValue=之前值
+ConnectedOnMultiCompany=連接的環境
+ConnectedSince=連接自
+AuthenticationMode=認證模式
+RequestedUrl=被請求的 URL
+DatabaseTypeManager=資料庫類別管理器
+RequestLastAccessInError=最新錯誤的請求資料庫存取
+ReturnCodeLastAccessInError=最新錯誤的請求資料庫存取返回值
+InformationLastAccessInError=最新錯誤的請求資料庫存取的資訊
 DolibarrHasDetectedError=Dolibarr 偵測到一個技術性的錯誤
-YouCanSetOptionDolibarrMainProdToZero=You can read log file or set option $dolibarr_main_prod to '0' in your config file to get more information.
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to remove such notices)
+YouCanSetOptionDolibarrMainProdToZero=您可以讀取 log 檔案或是在編好設定檔案中設定  $dolibarr_main_prod 選項的值為 0，以取得更多資訊。
+InformationToHelpDiagnose=以診斷目的而言此資訊很有用 ( 您可以在 $dolibarr_main_prod 選項中設定為 1  移除類似的警告)
 MoreInformation=更多資訊
 TechnicalInformation=技術資訊
 TechnicalID=Technical ID
-NotePublic=備註（會顯示在單據上）
-NotePrivate=備註（私人）
-PrecisionUnitIsLimitedToXDecimals=小數位數可到 <b>%s</b> 位。
+NotePublic=備註（公開）
+NotePrivate=備註（不公開）
+PrecisionUnitIsLimitedToXDecimals=Dolibarr 已設定每單位價格的小數位數可到 <b>%s</b> 位。
 DoTest=測試
 ToFilter=篩選器
-NoFilter=No filter
+NoFilter=沒有篩選器
 WarningYouHaveAtLeastOneTaskLate=至少有一個欄位輸入錯誤
 yes=Yes
 Yes=Yes
@@ -127,42 +128,42 @@ Home=首頁
 Help=幫助
 OnlineHelp=線上說明
 PageWiki=維基頁面
-MediaBrowser=Media browser
+MediaBrowser=多媒體瀏覽器
 Always=總是
 Never=從來沒有
 Under=下
 Period=期間
 PeriodEndDate=結束日期
-SelectedPeriod=Selected period
-PreviousPeriod=Previous period
-Activate=啟用
-Activated=已啟用
-Closed=已關閉
-Closed2=已關閉
-NotClosed=Not closed
+SelectedPeriod=選擇期間
+PreviousPeriod=前期
+Activate=啟動
+Activated=已啟動
+Closed=結案
+Closed2=結案
+NotClosed=尚未結案
 Enabled=啟用
-Deprecated=Deprecated
+Deprecated=放棄
 Disable=禁用
 Disabled=已禁用
 Add=新增
 AddLink=新增連結
 RemoveLink=移除連結
-AddToDraft=Add to draft
+AddToDraft=新增草稿
 Update=更新
-Close=關閉
-CloseBox=Remove widget from your dashboard
+Close=結案
+CloseBox=從儀表表中移除小工具
 Confirm=確認
-ConfirmSendCardByMail=Do you really want to send content of this card by mail to <b>%s</b>?
+ConfirmSendCardByMail=您真要透過電子郵件發送給 <b>%s</b> 此卡片的內容？
 Delete=刪除
 Remove=移除
-Resiliate=Terminate
+Resiliate=終止
 Cancel=取消
 Modify=修改
 Edit=編輯
-Validate=確認
-ValidateAndApprove=確認核准
+Validate=驗證
+ValidateAndApprove=驗證與核准
 ToValidate=為了驗證
-NotValidated=Not validated
+NotValidated=沒有驗證
 Save=儲存
 SaveAs=另存為
 TestConnection=測試連接
@@ -174,84 +175,84 @@ Go=Go
 Run=執行
 CopyOf=複製
 Show=顯示
-Hide=Hide
-ShowCardHere=廣告單
+Hide=隱藏
+ShowCardHere=顯示卡片
 Search=搜尋
 SearchOf=搜尋
 Valid=有效
-Approve=批準
-Disapprove=Disapprove
-ReOpen=重新開放
-Upload=上傳文件
-ToLink=Link
+Approve=核准
+Disapprove=不核准
+ReOpen=重新公開
+Upload=傳送檔案
+ToLink=連線
 Select=選擇
 Choose=選擇
 Resize=調整大小
 ResizeOrCrop=Resize or Crop
 Recenter=Recenter
-Author=發起者
+Author=作者
 User=用戶
-Users=用戶
+Users=各用戶
 Group=群組
-Groups=群組
+Groups=各群組
 NoUserGroupDefined=無定義群組
 Password=密碼
 PasswordRetype=重新輸入您的密碼
-NoteSomeFeaturesAreDisabled=請注意，多模組已禁用。
+NoteSomeFeaturesAreDisabled=請注意在這個示範中多項功能/模組已禁用。
 Name=名稱
-Person=人
-Parameter=參數名稱
-Parameters=參數清單
+Person=人員
+Parameter=參數
+Parameters=各參數
 Value=值
 PersonalValue=個人設定值
-NewObject=New %s
+NewObject=新 %s
 NewValue=新值
 CurrentValue=當前值
-Code=碼
+Code=代碼
 Type=類型
 Language=語系
-MultiLanguage=多語言
-Note=註解
+MultiLanguage=多國語言
+Note=注意/筆記
 Title=標題
-Label=品號
-RefOrLabel=參考號或品名
+Label=標籤
+RefOrLabel=參考值或標籤
 Info=日誌
 Family=家庭
-Description=品名
-Designation=廠商品號/品名/商品描述
-Model=Doc template
-DefaultModel=Default doc template
-Action=行動
+Description=詳細描述
+Designation=描述
+Model=文件範本
+DefaultModel=預設文件範本
+Action=事件
 About=關於
 Number=數量
-NumberByMonth=按月份數
+NumberByMonth=每月數量
 AmountByMonth=每月金額
-Numero=數
+Numero=數量
 Limit=限制
 Limits=範圍
 Logout=登出
-NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=連接
+NoLogoutProcessWithAuthMode=驗證模式<b>%s</b>沒有應用程序可中斷的功能
+Connection=登入
 Setup=設定
-Alert=提示
-MenuWarnings=其他快訊資訊
+Alert=警告
+MenuWarnings=各式警告
 Previous=前一筆
 Next=下一筆
-Cards=資訊卡
+Cards=各式資訊卡
 Card=資訊卡
 Now=現在
 HourStart=開始(時)
 Date=日期
-DateAndHour=日期時間
-DateToday=Today's date
-DateReference=Reference date
+DateAndHour=日期及小時
+DateToday=今日日期
+DateReference=參考日期
 DateStart=開始日期
 DateEnd=結束日期
 DateCreation=建立日期
-DateCreationShort=Creat. date
+DateCreationShort=建立日期
 DateModification=修改日期
 DateModificationShort=修改日期
-DateLastModification=Latest modification date
+DateLastModification=最新修改日期
 DateValidation=驗證日期
 DateClosing=截止日期
 DateDue=截止日期
@@ -262,22 +263,22 @@ DateOperationShort=操作日期
 DateLimit=期限
 DateRequest=申請日期
 DateProcess=處理日期
-DateBuild=報告生成日期
+DateBuild=報表產生日期
 DatePayment=付款日期
 DateApprove=核准日期
-DateApprove2=核准日期(主管)
-RegistrationDate=Registration date
-UserCreation=Creation user
-UserModification=Modification user
-UserValidation=Validation user
-UserCreationShort=Creat. user
-UserModificationShort=Modif. user
-UserValidationShort=Valid. user
+DateApprove2=核准日期(第二次核准)
+RegistrationDate=註冊日期
+UserCreation=建立的用戶
+UserModification=修改的用戶
+UserValidation=驗證的用戶
+UserCreationShort=建立的用戶
+UserModificationShort=修改的用戶
+UserValidationShort=驗證的用戶
 DurationYear=年
 DurationMonth=月
 DurationWeek=周
 DurationDay=天
-DurationYears=歲
+DurationYears=年
 DurationMonths=個月
 DurationWeeks=周
 DurationDays=天
@@ -288,7 +289,7 @@ WeekShort=周
 Day=天
 Hour=小時
 Minute=分鐘
-Second=第二
+Second=秒
 Years=歲
 Months=個月
 Days=天
@@ -303,105 +304,106 @@ Tomorrow=明天
 Morning=上午
 Afternoon=下午
 Quadri=季
-MonthOfDay=日
+MonthOfDay=當天的月份
 HourShort=時
 MinuteShort=分
 Rate=稅率
-CurrencyRate=Currency conversion rate
-UseLocalTax=營業稅
+CurrencyRate=目前轉換匯率
+UseLocalTax=含稅
 Bytes=Bytes
 KiloBytes=KB
 MegaBytes=MB
 GigaBytes=GB
 TeraBytes=TB
-UserAuthor=User of creation
-UserModif=User of last update
+UserAuthor=建立的用戶
+UserModif=最後一次更新的用戶
 b=b
 Kb=Kb
 Mb=Mb
 Gb=Gb
 Tb=Tb
-Cut=切
+Cut=剪下
 Copy=複製
 Paste=貼上
 Default=預設
 DefaultValue=預設值
-DefaultValues=Default values
+DefaultValues=預設值
 Price=價格
-PriceCurrency=Price (currency)
-UnitPrice=單價
-UnitPriceHT=單位價格（凈值）
-UnitPriceHTCurrency=Unit price (net) (currency)
-UnitPriceTTC=單價
-PriceU=向上
-PriceUHT=單價
-PriceUHTCurrency=U.P (currency)
-PriceUTTC=U.P. (inc. tax)
-Amount=總額
+PriceCurrency=價格(目前)
+UnitPrice=單位價格
+UnitPriceHT=單位價格(凈值)
+UnitPriceHTCurrency=單位價格(淨值)(目前)
+UnitPriceTTC=單位價格
+PriceU=單價
+PriceUHT=單價(淨)
+PriceUHTCurrency=單價(目前)
+PriceUTTC=單價(含稅)
+Amount=金額
 AmountInvoice=發票金額
-AmountInvoiced=Amount invoiced
+AmountInvoiced=發票金額
 AmountPayment=付款金額
-AmountHTShort=金額
-AmountTTCShort=金額（含稅）
-AmountHT=銷售金額
-AmountTTC=金額（含稅）
-AmountVAT=營業稅金額
-MulticurrencyAlreadyPaid=Already payed, original currency
-MulticurrencyRemainderToPay=Remain to pay, original currency
-MulticurrencyPaymentAmount=Payment amount, original currency
-MulticurrencyAmountHT=Amount (net of tax), original currency
-MulticurrencyAmountTTC=Amount (inc. of tax), original currency
-MulticurrencyAmountVAT=Amount tax, original currency
-AmountLT1=Amount tax 2
-AmountLT2=Amount tax 3
-AmountLT1ES=稀土額
-AmountLT2ES=數額IRPF
+AmountHTShort=金額(淨值)
+AmountTTCShort=金額(含稅)
+AmountHT=金額(稅後)
+AmountTTC=金額(含稅)
+AmountVAT=稅金
+MulticurrencyAlreadyPaid=已支付, 原來幣別
+MulticurrencyRemainderToPay=保持付款, 原來幣別
+MulticurrencyPaymentAmount=付款金額, 原來幣別
+MulticurrencyAmountHT=金額(稅後), 原來幣別
+MulticurrencyAmountTTC=金額(含稅), 原來幣別
+MulticurrencyAmountVAT=稅金, 原來幣別
+AmountLT1=稅金 2
+AmountLT2=稅金 3
+AmountLT1ES=RE 金額
+AmountLT2ES=IRPF 金額
 AmountTotal=總金額
 AmountAverage=平均金額
-PriceQtyMinHT=最低採購價格 （稅後）
-PriceQtyMinHTCurrency=Price quantity min. (net of tax) (currency)
+PriceQtyMinHT=最低價格數量(稅後)
+PriceQtyMinHTCurrency=最低價格數量(稅後)(目前)
 Percentage=百分比
 Total=總計
 SubTotal=銷售額合計
 TotalHTShort=金額
-TotalHTShortCurrency=Total (net in currency)
+TotalHTShortCurrency=總計 (目前的淨值)
 TotalTTCShort=總計（含稅）
-TotalHT=金額合計
-TotalHTforthispage=Total (net of tax) for this page
-Totalforthispage=Total for this page
-TotalTTC=金額總計
+TotalHT=金額合計(稅後)
+TotalHTforthispage=此頁總計(稅後)
+Totalforthispage=此頁總計
+TotalTTC=金額總計(含稅)
 TotalTTCToYourCredit=信用額度（含稅)
 TotalVAT=營業稅
-TotalVATIN=Total IGST
-TotalLT1=Total tax 2
-TotalLT2=Total tax 3
-TotalLT1ES=共有再生能源
-TotalLT2ES=共有IRPF
-TotalLT1IN=Total CGST
-TotalLT2IN=Total SGST
-HT=不含稅
+TotalVATIN=IGST 總計
+TotalLT1=總稅金 2
+TotalLT2=總稅金 3
+TotalLT1ES=RE 總計
+TotalLT2ES=IRPF 總計
+TotalLT1IN=CGST 總計
+TotalLT2IN=SGST 總計
+HT=稅後
 TTC=含稅
-INCVATONLY=Inc. VAT
-INCT=Inc. all taxes
-VAT=營業稅
+INCVATONLY=含營業稅
+INCT=包含各式稅金
+VAT=銷售稅金
 VATIN=IGST
-VATs=營業稅
-VATINs=IGST taxes
-LT1=Sales tax 2
-LT1Type=Sales tax 2 type
-LT2=Sales tax 3
-LT2Type=Sales tax 3 type
-LT1ES=稀土
+VATs=銷售稅
+VATINs=IGST 稅金
+LT1=銷售稅 2
+LT1Type=銷售稅 2 類別
+LT2=銷售稅 3
+LT2Type=銷售稅 3 類別
+LT1ES=RE
 LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
-VATRate=營業稅率
-VATCode=Tax Rate code
+VATRate=稅率
+VATCode=稅率代碼
 VATNPR=Tax Rate NPR
 DefaultTaxRate=Default tax rate
 Average=平均
 Sum=總和
 Delta=三角洲
+RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=選項
@@ -414,7 +416,7 @@ Favorite=Favorite
 ShortInfo=Info.
 Ref=編號
 ExternalRef=Ref. extern
-RefSupplier=供應商編號
+RefSupplier=Ref. vendor
 RefPayment=付款號
 CommercialProposalsShort=報價單
 Comment=註解
@@ -493,7 +495,7 @@ Received=已收到
 Paid=已支付
 Topic=Subject
 ByCompanies=由第三方
-ByUsers=通過用戶
+ByUsers=By user
 Links=鏈接
 Link=鏈接
 Rejects=拒絕
@@ -619,9 +621,9 @@ BuildDoc=建立督
 Entity=實體
 Entities=實體
 CustomerPreview=客戶預覽資訊
-SupplierPreview=供應商預覽資訊
+SupplierPreview=Vendor preview
 ShowCustomerPreview=顯示客戶預覽資訊
-ShowSupplierPreview=顯示供應商預覽資訊
+ShowSupplierPreview=Show vendor preview
 RefCustomer=客戶的訂單號
 Currency=貨幣
 InfoAdmin=資訊管理員
@@ -679,7 +681,7 @@ Color=彩色
 Documents=附加檔案
 Documents2=文件
 UploadDisabled=上傳禁用
-MenuAccountancy=會計
+MenuAccountancy=Accounting
 MenuECM=文件
 MenuAWStats=awstats的
 MenuMembers=成員
@@ -861,7 +863,7 @@ TitleSetToDraft=Go back to draft
 ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
 ImportId=Import id
 Events=活動
-EMailTemplates=Emails templates
+EMailTemplates=Email 的範本
 FileNotShared=File not shared to exernal public
 Project=項目
 Projects=Projects
@@ -915,11 +917,11 @@ SearchIntoProductsOrServices=Products or services
 SearchIntoProjects=Projects
 SearchIntoTasks=任務
 SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
+SearchIntoSupplierInvoices=供應商發票
 SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
+SearchIntoSupplierOrders=採購訂單
 SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
+SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Interventions
 SearchIntoContracts=Contracts
 SearchIntoCustomerShipments=Customer shipments
@@ -941,3 +943,5 @@ Remote=Remote
 LocalAndRemote=Local and Remote
 KeyboardShortcut=Keyboard shortcut
 AssignedTo=指定給
+Deletedraft=Delete draft
+ConfirmMassDraftDeletion=Draft Bulk delete confirmation
diff --git a/htdocs/langs/zh_TW/margins.lang b/htdocs/langs/zh_TW/margins.lang
index 7bf5f801891..caefd807f91 100644
--- a/htdocs/langs/zh_TW/margins.lang
+++ b/htdocs/langs/zh_TW/margins.lang
@@ -28,10 +28,10 @@ UseDiscountAsService=As a service
 UseDiscountOnTotal=On subtotal
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
 MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best supplier price
+MargeType1=Margin on Best vendor price
 MargeType2=Margin on Weighted Average Price (WAP)
 MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
 CostPrice=Cost price
 UnitCharges=Unit charges
 Charges=Charges
diff --git a/htdocs/langs/zh_TW/members.lang b/htdocs/langs/zh_TW/members.lang
index 5f78a76f421..4547ea00687 100644
--- a/htdocs/langs/zh_TW/members.lang
+++ b/htdocs/langs/zh_TW/members.lang
@@ -111,7 +111,7 @@ SendingAnEMailToMember=Sending information email to member
 SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscription
+SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
diff --git a/htdocs/langs/zh_TW/opensurvey.lang b/htdocs/langs/zh_TW/opensurvey.lang
index c67241d4315..bd17d41f04d 100644
--- a/htdocs/langs/zh_TW/opensurvey.lang
+++ b/htdocs/langs/zh_TW/opensurvey.lang
@@ -58,3 +58,4 @@ MoreChoices=Enter more choices for the voters
 SurveyExpiredInfo=The poll has been closed or voting delay has expired.
 EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
 ShowSurvey=Show survey
+UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
diff --git a/htdocs/langs/zh_TW/orders.lang b/htdocs/langs/zh_TW/orders.lang
index ae1c9fe6b01..fd57138b803 100644
--- a/htdocs/langs/zh_TW/orders.lang
+++ b/htdocs/langs/zh_TW/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=客戶訂單面積
-SuppliersOrdersArea=供應商的訂單面積
+SuppliersOrdersArea=Purchase orders area
 OrderCard=訂單資訊
 OrderId=訂單編號
 Order=訂單
@@ -13,18 +13,18 @@ OrderToProcess=Order to process
 NewOrder=建立新訂單
 ToOrder=製作訂單
 MakeOrder=製作訂單
-SupplierOrder=供應商訂單
-SuppliersOrders=供應商訂單
-SuppliersOrdersRunning=當前供應商的訂單
+SupplierOrder=Purchase order
+SuppliersOrders=採購訂單
+SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=客戶訂單
-CustomersOrders=Customer orders
+CustomersOrders=客戶訂單
 CustomersOrdersRunning=當前客戶訂單
 CustomersOrdersAndOrdersLines=Customer orders and order lines
 OrdersDeliveredToBill=Customer orders delivered to bill
 OrdersToBill=Customer orders delivered
 OrdersInProcess=Customer orders in process
 OrdersToProcess=Customer orders to process
-SuppliersOrdersToProcess=Supplier orders to process
+SuppliersOrdersToProcess=Purchase orders to process
 StatusOrderCanceledShort=已取消
 StatusOrderDraftShort=草案階段
 StatusOrderValidatedShort=驗證階段
@@ -75,15 +75,15 @@ ShowOrder=顯示訂單
 OrdersOpened=Orders to process
 NoDraftOrders=No draft orders
 NoOrder=No order
-NoSupplierOrder=No supplier order
+NoSupplierOrder=No purchase order
 LastOrders=最新%s個客戶訂單
 LastCustomerOrders=最新%s個客戶訂單
-LastSupplierOrders=Latest %s supplier orders
+LastSupplierOrders=Latest %s purchase orders
 LastModifiedOrders=Latest %s modified orders
 AllOrders=所有的訂單
 NbOfOrders=訂單號碼
 OrdersStatistics=訂單統計
-OrdersStatisticsSuppliers=供應商的訂單統計
+OrdersStatisticsSuppliers=Purchase order statistics
 NumberOfOrdersByMonth=按月份訂單數
 AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
 ListOfOrders=訂單列表
@@ -97,12 +97,12 @@ ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</
 GenerateBill=生成發票
 ClassifyShipped=已發貨
 DraftOrders=草案訂單
-DraftSuppliersOrders=Draft suppliers orders
+DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=處理中的訂單
 RefOrder=訂單號碼
 RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for supplier
-RefOrderSupplierShort=Ref. order supplier
+RefOrderSupplier=Ref. order for vendor
+RefOrderSupplierShort=Ref. order vendor
 SendOrderByMail=為了通過郵件發送
 ActionsOnOrder=採購過程中的事件記錄
 NoArticleOfTypeProduct=任何類型的產品文章'，以便對這一秩序shippable文章
@@ -115,9 +115,9 @@ ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
 DispatchSupplierOrder=接收供應商的訂單%s
 FirstApprovalAlreadyDone=First approval already done
 SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=Supplier order %s received %s
-SupplierOrderSubmitedInDolibarr=Supplier order %s submited
-SupplierOrderClassifiedBilled=Supplier order %s set billed
+SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
+SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
+SupplierOrderClassifiedBilled=Purchase Order %s set billed
 OtherOrders=其他命令
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=代替客戶下單
@@ -125,11 +125,11 @@ TypeContact_commande_internal_SHIPPING=代替客戶寄送
 TypeContact_commande_external_BILLING=客戶 Invoice 聯絡人
 TypeContact_commande_external_SHIPPING=客戶 Shipping 聯絡人
 TypeContact_commande_external_CUSTOMER=客戶訂單聯絡人
-TypeContact_order_supplier_internal_SALESREPFOLL=直接拜訪客戶的方式
+TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
 TypeContact_order_supplier_internal_SHIPPING=利用貨運方式
-TypeContact_order_supplier_external_BILLING=供應商利用發票(invoice)方式
-TypeContact_order_supplier_external_SHIPPING=供應商利用貨運方式
-TypeContact_order_supplier_external_CUSTOMER=供應商來訪的方式
+TypeContact_order_supplier_external_BILLING=Vendor invoice contact
+TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=常COMMANDE_SUPPLIER_ADDON沒有定義
 Error_COMMANDE_ADDON_NotDefined=常COMMANDE_ADDON沒有定義
 Error_OrderNotChecked=No orders to invoice selected
diff --git a/htdocs/langs/zh_TW/other.lang b/htdocs/langs/zh_TW/other.lang
index b9e2693c5a9..b0c94e2f44a 100644
--- a/htdocs/langs/zh_TW/other.lang
+++ b/htdocs/langs/zh_TW/other.lang
@@ -82,7 +82,7 @@ PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two
 PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\nThis is the link to make your online payment if this invoice is not already payed:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\nThis is the link to make your online payment:\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -218,7 +218,7 @@ FileIsTooBig=文件過大
 PleaseBePatient=請耐心等待...
 NewPassword=New password
 ResetPassword=Reset password
-RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
+RequestToResetPasswordReceived=A request to change your password has been received
 NewKeyIs=This is your new keys to login
 NewKeyWillBe=Your new key to login to software will be
 ClickHereToGoTo=Click here to go to %s
@@ -233,6 +233,8 @@ PermissionsDelete=Permissions removed
 YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
+SMSSentTo=SMS sent to %s
+
 ##### Export #####
 ExportsArea=出口地區
 AvailableFormats=可用的格式
diff --git a/htdocs/langs/zh_TW/productbatch.lang b/htdocs/langs/zh_TW/productbatch.lang
index 3dacb865df7..d5df2a6b893 100644
--- a/htdocs/langs/zh_TW/productbatch.lang
+++ b/htdocs/langs/zh_TW/productbatch.lang
@@ -16,7 +16,7 @@ printEatby=有效日: %s
 printSellby=銷售日: %s
 printQty=數量: %d
 AddDispatchBatchLine=增加一行的保存期限
-WhenProductBatchModuleOnOptionAreForced=當批次/序號模組啟動，庫存的自動增/減模式會依已驗證的發出及人工調度強制增減且無法修改。其他的選項則依您的需求定義。
+WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=此產品不能使用批次/序號數字
 ProductLotSetup=批次/序號模組的設定
 ShowCurrentStockOfLot=顯示產品/批次的目前庫存
diff --git a/htdocs/langs/zh_TW/products.lang b/htdocs/langs/zh_TW/products.lang
index c1550dc445d..fb4db10f38d 100644
--- a/htdocs/langs/zh_TW/products.lang
+++ b/htdocs/langs/zh_TW/products.lang
@@ -70,6 +70,7 @@ SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=新價格
 MinPrice=Min. selling price
+EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=售價不能低於該產品的最低售價(%s 不含稅)。如果你輸入的折扣過高也會出現此訊息。
 ContractStatusClosed=關閉
 ErrorProductAlreadyExists=一個產品的參考%s已經存在。
@@ -155,7 +156,7 @@ BuyingPrices=採購價格
 CustomerPrices=客戶價格
 SuppliersPrices=供應商價格
 SuppliersPricesOfProductsOrServices=供應商價格
-CustomCode=Customs/Commodity/HS code
+CustomCode=Customs / Commodity / HS code
 CountryOrigin=原產地
 Nature=類型
 ShortLabel=簡短標籤
diff --git a/htdocs/langs/zh_TW/projects.lang b/htdocs/langs/zh_TW/projects.lang
index 97c7f572012..08edc71ae91 100644
--- a/htdocs/langs/zh_TW/projects.lang
+++ b/htdocs/langs/zh_TW/projects.lang
@@ -77,6 +77,7 @@ Time=時間
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GoToGanttView=Go to Gantt view
 GanttView=Gantt View
 ListProposalsAssociatedProject=指定給專案的商業報價/提案列表清單
 ListOrdersAssociatedProject=List of customer orders associated with the project
@@ -226,4 +227,4 @@ AllowCommentOnProject=Allow user comments on projects
 DontHavePermissionForCloseProject=You do not have permissions to close the project %s
 DontHaveTheValidateStatus=The project %s must be open to be closed
 RecordsClosed=%s project(s) closed
-SendProjectRef=About project %s
+SendProjectRef=Information project %s
diff --git a/htdocs/langs/zh_TW/stocks.lang b/htdocs/langs/zh_TW/stocks.lang
index 2df0946c2aa..81b945f5068 100644
--- a/htdocs/langs/zh_TW/stocks.lang
+++ b/htdocs/langs/zh_TW/stocks.lang
@@ -161,7 +161,7 @@ inventoryCreatePermission=Create new inventory
 inventoryReadPermission=View inventories
 inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
-inventoryTitle=Inventory
+inventoryTitle=庫存
 inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
 inventoryCreateDelete=Create/Delete inventory
@@ -177,7 +177,7 @@ inventoryMvtStock=By inventory
 inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=分類篩選器
 SelectFournisseur=Supplier filter
-inventoryOnDate=Inventory
+inventoryOnDate=庫存
 INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
 INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement have date of inventory
@@ -203,3 +203,4 @@ RegulateStock=Regulate Stock
 ListInventory=清單列表
 StockSupportServices=Stock management support services
 StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service"
+ReceiveProducts=Receive products
diff --git a/htdocs/langs/zh_TW/stripe.lang b/htdocs/langs/zh_TW/stripe.lang
index 1830b2aa5e2..ca989766167 100644
--- a/htdocs/langs/zh_TW/stripe.lang
+++ b/htdocs/langs/zh_TW/stripe.lang
@@ -58,8 +58,8 @@ NameOnCard=Name on card
 CardNumber=Card Number
 ExpiryDate=Expiry Date
 CVN=CVN
-DeleteACard=Delete Card record
-ConfirmDeleteCard=Are you sure you want to delete this Card record?
+DeleteACard=Delete Card
+ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
 CreateCustomerOnStripe=Create customer on Stripe
 CreateCardOnStripe=Create card on Stripe
 ShowInStripe=Show in Stripe
diff --git a/htdocs/langs/zh_TW/supplier_proposal.lang b/htdocs/langs/zh_TW/supplier_proposal.lang
index 97f269d6a7e..d9716c13907 100644
--- a/htdocs/langs/zh_TW/supplier_proposal.lang
+++ b/htdocs/langs/zh_TW/supplier_proposal.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Supplier commercial proposals
-supplier_proposalDESC=Manage price requests to suppliers
+SupplierProposal=Vendor commercial proposals
+supplier_proposalDESC=Manage price requests to vendors
 SupplierProposalNew=New price request
 CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
-SupplierProposalsDraft=Draft supplier proposals
+SupplierProposalsDraft=Draft vendor proposals
 LastModifiedRequests=Latest %s modified price requests
 RequestsOpened=Open price requests
-SupplierProposalArea=Supplier proposals area
-SupplierProposalShort=Supplier proposal
-SupplierProposals=Supplier proposals
-SupplierProposalsShort=Supplier proposals
+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=Supplier ref
+SupplierProposalRefFourn=Vendor ref
 SupplierProposalDate=交貨日期
 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>?
@@ -47,9 +47,9 @@ CommercialAsk=Price request
 DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposals=List of supplier proposal requests
-ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
-SupplierProposalsToClose=Supplier proposals to close
-SupplierProposalsToProcess=Supplier proposals to process
+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
diff --git a/htdocs/langs/zh_TW/suppliers.lang b/htdocs/langs/zh_TW/suppliers.lang
index 6821ee870dd..48d10616fa4 100644
--- a/htdocs/langs/zh_TW/suppliers.lang
+++ b/htdocs/langs/zh_TW/suppliers.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=供應商
-SuppliersInvoice=供應商的發票
-ShowSupplierInvoice=Show Supplier Invoice
-NewSupplier=新供應商
+Suppliers=Vendors
+SuppliersInvoice=Vendor invoice
+ShowSupplierInvoice=Show Vendor Invoice
+NewSupplier=New vendor
 History=歷史紀錄
-ListOfSuppliers=供應商名單
-ShowSupplier=查看供應商
+ListOfSuppliers=List of vendors
+ShowSupplier=Show vendor
 OrderDate=訂購日期
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
-SupplierPrices=供應商價格
+SupplierPrices=Vendor prices
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=該參考供應商已經與一參考：%s的
-NoRecordedSuppliers=沒有供應商記錄
-SupplierPayment=供應商付款
-SuppliersArea=供應商區
-RefSupplierShort=供應商訂單號
+NoRecordedSuppliers=No vendor recorded
+SupplierPayment=Vendor payment
+SuppliersArea=Vendor area
+RefSupplierShort=Ref. vendor
 Availability=可用性
-ExportDataset_fournisseur_1=供應商發票清單和發票的路線
-ExportDataset_fournisseur_2=供應商發票和付款
-ExportDataset_fournisseur_3=Supplier orders and order lines
+ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_2=Vendor invoices and payments
+ExportDataset_fournisseur_3=Purchase orders and order lines
 ApproveThisOrder=批準這個訂單
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=拒絕此訂單
 ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
 ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
-AddSupplierOrder=新增供應商的訂單
-AddSupplierInvoice=新增供應商發票
-ListOfSupplierProductForSupplier=<b>供應商 %s 的產品及價格清單</b>
-SentToSuppliers=已確認採購
-ListOfSupplierOrders=採購單列表
-MenuOrdersSupplierToBill=待付款採購
+AddSupplierOrder=Create Purchase Order
+AddSupplierInvoice=Create vendor invoice
+ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
+SentToSuppliers=Sent to vendors
+ListOfSupplierOrders=List of purchase orders
+MenuOrdersSupplierToBill=Purchase orders to invoice
 NbDaysToDelivery=延遲交貨天數
 DescNbDaysToDelivery=此訂單中最長延遲時間
-SupplierReputation=Supplier reputation
+SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
 AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=供應商價格
+BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/zh_TW/users.lang b/htdocs/langs/zh_TW/users.lang
index 2fe1c29c80c..8140db17e9f 100644
--- a/htdocs/langs/zh_TW/users.lang
+++ b/htdocs/langs/zh_TW/users.lang
@@ -9,7 +9,7 @@ SendNewPassword=重新產生並發送密碼
 SendNewPasswordLink=Send link to reset password
 ReinitPassword=重設密碼
 PasswordChangedTo=密碼更改為：%s
-SubjectNewPassword=Your new password for %s
+SubjectNewPassword=您新的密碼是 %s
 GroupRights=組權限
 UserRights=帳戶權限
 UserGUISetup=設置使用者介面
@@ -20,12 +20,12 @@ DeleteAUser=刪除一個用戶
 EnableAUser=使用戶
 DeleteGroup=刪除
 DeleteAGroup=刪除一組
-ConfirmDisableUser=Are you sure you want to disable user <b>%s</b>?
-ConfirmDeleteUser=Are you sure you want to delete user <b>%s</b>?
-ConfirmDeleteGroup=Are you sure you want to delete group <b>%s</b>?
-ConfirmEnableUser=Are you sure you want to enable user <b>%s</b>?
-ConfirmReinitPassword=Are you sure you want to generate a new password for user <b>%s</b>?
-ConfirmSendNewPassword=Are you sure you want to generate and send new password for user <b>%s</b>?
+ConfirmDisableUser=您確定要禁用用戶 <b>%s</b> ?
+ConfirmDeleteUser=您確定要刪除用戶 <b>%s</b> ?
+ConfirmDeleteGroup=您確定要刪除群組 <b>%s</b>?
+ConfirmEnableUser=您確定要啟用用戶 <b>%s</b>?
+ConfirmReinitPassword=您確定要產生新密碼給用戶 <b>%s</b>?
+ConfirmSendNewPassword=您確定要產生及傳送新密碼給用戶 <b>%s</b>?
 NewUser=新增用戶
 CreateUser=創建用戶
 LoginNotDefined=登錄沒有定義。
@@ -48,8 +48,8 @@ PasswordChangeRequest=Request to change password for <b>%s</b>
 PasswordChangeRequestSent=要求更改密碼<b>的S%</b>發送到<b>%s。</b>
 ConfirmPasswordReset=Confirm password reset
 MenuUsersAndGroups=用戶和群組
-LastGroupsCreated=Latest %s created groups
-LastUsersCreated=Latest %s users created
+LastGroupsCreated=最新建立的群組 %s
+LastUsersCreated=最新建立的用戶 %s
 ShowGroup=顯示群組
 ShowUser=顯示用戶
 NonAffectedUsers=非受影響的用戶
@@ -83,7 +83,7 @@ UserDisabled=用戶%s禁用
 UserEnabled=用戶%s啟動
 UserDeleted=使用者%s刪除
 NewGroupCreated=集團創建%s的
-GroupModified=Group %s modified
+GroupModified=群組 %s 已修改
 GroupDeleted=群組%s刪除
 ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact?
 ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member?
diff --git a/htdocs/langs/zh_TW/website.lang b/htdocs/langs/zh_TW/website.lang
index 25796dda9f1..7bbcf5348b2 100644
--- a/htdocs/langs/zh_TW/website.lang
+++ b/htdocs/langs/zh_TW/website.lang
@@ -73,7 +73,7 @@ AnotherContainer=Another container
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
+OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initiliazed by grabbing it from an external page (WYSIWYG editor will not be available)
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
diff --git a/htdocs/langs/zh_TW/workflow.lang b/htdocs/langs/zh_TW/workflow.lang
index bc6ef25913c..affebb4ed2a 100644
--- a/htdocs/langs/zh_TW/workflow.lang
+++ b/htdocs/langs/zh_TW/workflow.lang
@@ -14,7 +14,7 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source custome
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
 AutomaticCreation=自動建立
 AutomaticClassification=自動分類