diff --git a/htdocs/langs/ar_SA/accountancy.lang b/htdocs/langs/ar_SA/accountancy.lang
index 4a81e94e4f8..738d9106e6f 100644
--- a/htdocs/langs/ar_SA/accountancy.lang
+++ b/htdocs/langs/ar_SA/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Consult here the list of third-party customers and vendors
 ListAccounts=قائمة الحسابات المحاسبية
 UnknownAccountForThirdparty=Unknown third-party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export Configurable
-Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Without valid dedicated account
 WithValidAccount=With valid dedicated account
 ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
 AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Range of accounting account
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Autodection not possible, use menu <a href="%s">%s</a
 
 ## Import
 ImportAccountingEntries=Accounting entries
-
+DateExport=Date export
 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 89b929493dd..8a5ed0b5304 100644
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=أحذف
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=إحذف الآن
@@ -804,6 +804,7 @@ Permission401=قراءة خصومات
 Permission402=إنشاء / تعديل الخصومات
 Permission403=تحقق من الخصومات
 Permission404=حذف خصومات
+Permission430=Use Debug Bar
 Permission511=Read payments of salaries
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
@@ -818,6 +819,9 @@ Permission532=إنشاء / تعديل الخدمات
 Permission534=حذف خدمات
 Permission536=انظر / إدارة الخدمات الخفية
 Permission538=تصدير الخدمات
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=قراءة التبرعات
 Permission702=إنشاء / تعديل والهبات
 Permission703=حذف التبرعات
@@ -837,6 +841,12 @@ Permission1101=قراءة تسليم أوامر
 Permission1102=إنشاء / تعديل أوامر التسليم
 Permission1104=تحقق من توصيل الأوامر
 Permission1109=حذف تسليم أوامر
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=قراءة الموردين
 Permission1182=Read purchase orders
 Permission1183=Create/modify purchase orders
@@ -859,16 +869,6 @@ Permission1251=ادارة الدمار الواردات الخارجية الب
 Permission1321=تصدير العملاء والفواتير والمدفوعات والصفات
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
-Permission20003=حذف طلبات الإجازة
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=طلبات الإجازة المشرف (إعداد وتحديث التوازن)
-Permission23001=قراءة مهمة مجدولة
-Permission23002=إنشاء / تحديث المجدولة وظيفة
-Permission23003=حذف مهمة مجدولة
-Permission23004=تنفيذ مهمة مجدولة
 Permission2401=قراءة الأعمال (أو أحداث المهام) مرتبطة حسابه
 Permission2402=إنشاء / تعديل أو حذف الإجراءات (الأحداث أو المهام) مرتبطة حسابه
 Permission2403=قراءة الأعمال (أو أحداث المهام) آخرين
@@ -882,9 +882,41 @@ Permission2503=تقديم وثائق أو حذف
 Permission2515=إعداد وثائق وأدلة
 Permission2801=استخدام عميل FTP في وضع القراءة (تصفح وتحميل فقط)
 Permission2802=العميل استخدام بروتوكول نقل الملفات في وضع الكتابة (حذف أو تحميل الملفات)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
+Permission20003=حذف طلبات الإجازة
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
+Permission20006=طلبات الإجازة المشرف (إعداد وتحديث التوازن)
+Permission23001=قراءة مهمة مجدولة
+Permission23002=إنشاء / تحديث المجدولة وظيفة
+Permission23003=حذف مهمة مجدولة
+Permission23004=تنفيذ مهمة مجدولة
 Permission50101=Use Point of Sale
 Permission50201=قراءة المعاملات
 Permission50202=استيراد المعاملات
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=طباعة
 Permission55001=قراءة استطلاعات الرأي
 Permission55002=إنشاء / تعديل استطلاعات الرأي
@@ -1078,7 +1110,7 @@ AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=نظام المعلومات المتنوعة المعلومات التقنية تحصل في قراءة فقط وواضحة للمشرفين فقط.
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
-AccountantDesc=Edit the details of your accountant/bookkeeper
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
@@ -1891,3 +1923,5 @@ IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute s
 UrlForIFTTT=URL endpoint for IFTTT
 YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/ar_SA/banks.lang b/htdocs/langs/ar_SA/banks.lang
index f4a67cc42dd..d561fc38442 100644
--- a/htdocs/langs/ar_SA/banks.lang
+++ b/htdocs/langs/ar_SA/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=لم يتم تسويتة
 CustomerInvoicePayment=مدفوعات العميل
 SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=دفع الاشتراك
-WithdrawalPayment=سحب المدفوعات
+WithdrawalPayment=Debit payment order
 SocialContributionPayment=مدفوعات الضرائب الاجتماعية / المالية
 BankTransfer=حوالة مصرفية
 BankTransfers=حوالات المصرفية
diff --git a/htdocs/langs/ar_SA/cashdesk.lang b/htdocs/langs/ar_SA/cashdesk.lang
index 49f4cab2cc5..1ce449cabc3 100644
--- a/htdocs/langs/ar_SA/cashdesk.lang
+++ b/htdocs/langs/ar_SA/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/ar_SA/mails.lang b/htdocs/langs/ar_SA/mails.lang
index ba703e153b9..66d53f91fb3 100644
--- a/htdocs/langs/ar_SA/mails.lang
+++ b/htdocs/langs/ar_SA/mails.lang
@@ -19,6 +19,8 @@ MailTopic=Email topic
 MailText=رسالة
 MailFile=الملفات المرفقة
 MailMessage=هيئة البريد الإلكتروني
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
 ShowEMailing=وتظهر مراسلة
 ListOfEMailings=قائمة emailings
 NewMailing=مراسلة جديدة
@@ -76,9 +78,9 @@ GroupEmails=Group emails
 OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
 WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
 ResultOfMailSending=Result of mass Email sending
-NbSelected=No. selected
-NbIgnored=No. ignored
-NbSent=No. sent
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
diff --git a/htdocs/langs/ar_SA/members.lang b/htdocs/langs/ar_SA/members.lang
index 9ca7d011016..be18bfd6f62 100644
--- a/htdocs/langs/ar_SA/members.lang
+++ b/htdocs/langs/ar_SA/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=اختيار الإحصاءات التي ترغب في ق
 MenuMembersStats=إحصائيات
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
-Nature=طبيعة
+MemberNature=Nature of member
 Public=معلومات علنية
 NewMemberbyWeb=وأضاف عضو جديد. تنتظر الموافقة
 NewMemberForm=الأعضاء الجدد في شكل
diff --git a/htdocs/langs/ar_SA/products.lang b/htdocs/langs/ar_SA/products.lang
index e5051d4aae4..c7830aa9639 100644
--- a/htdocs/langs/ar_SA/products.lang
+++ b/htdocs/langs/ar_SA/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=بلد المنشأ
-Nature=Product Type (material/finished)
+Nature=Nature of produt (material/finished)
 ShortLabel=التسمية قصيرة
 Unit=وحدة
 p=ش.
diff --git a/htdocs/langs/ar_SA/salaries.lang b/htdocs/langs/ar_SA/salaries.lang
index 0dfa991f0a0..5a0fcdda6bd 100644
--- a/htdocs/langs/ar_SA/salaries.lang
+++ b/htdocs/langs/ar_SA/salaries.lang
@@ -1,18 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger 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_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
 Salary=الراتب
 Salaries=الرواتب
 NewSalaryPayment=دفع الرواتب جديد
+AddSalaryPayment=Add salary payment
 SalaryPayment=دفع الرواتب
 SalariesPayments=مدفوعات الرواتب
 ShowSalaryPayment=مشاهدة دفع الرواتب
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=الراتب الحالي
-THMDescription=يمكن استخدام هذه القيمة لحساب تكلفة الوقت المستهلك في المشروع المدخل من قبل المستخدمين إذا تم استخدام وحدة مشروع 
-TJMDescription=هذه القيمة هي حاليا فقط كمعلومات وليس لاستخدامها في أي حساب
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
-SalariesStatistics=Statistiques salaires
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/ar_SA/stocks.lang b/htdocs/langs/ar_SA/stocks.lang
index 360c5de5164..f04e4ac1a81 100644
--- a/htdocs/langs/ar_SA/stocks.lang
+++ b/htdocs/langs/ar_SA/stocks.lang
@@ -3,7 +3,7 @@ WarehouseCard=بطاقة مخزن
 Warehouse=مخزن
 Warehouses=المستودعات
 ParentWarehouse=Parent warehouse
-NewWarehouse=المستودع الجديد / بورصة المنطقة
+NewWarehouse=New warehouse / Stock Location
 WarehouseEdit=تعديل مستودع
 MenuNewWarehouse=مستودع جديد
 WarehouseSource=مصدر مخزن
@@ -29,6 +29,8 @@ MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=منطقة المستودعات
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
 Location=عوضا عن
 LocationSummary=باختصار اسم الموقع
 NumberOfDifferentProducts=عدد من المنتجات المختلفة
@@ -53,7 +55,7 @@ PMPValue=المتوسط المرجح لسعر
 PMPValueShort=الواب
 EnhancedValueOfWarehouses=قيمة المستودعات
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Allow to add limit and desired stock per couple (product, warehouse) instead of per product
+AllowAddLimitStockByWarehouse=Manage also values for minimum and desired stock per pairing (product-warehouse) in addition to values per product
 IndependantSubProductStock=Product stock and subproduct stock are independent
 QtyDispatched=ارسال كمية
 QtyDispatchedShort=أرسل الكمية
@@ -62,12 +64,14 @@ OrderDispatch=Item receipts
 RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
 RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
 DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
-DeStockOnValidateOrder=Decrease real stocks on validation of customer order
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
 DeStockOnShipment=انخفاض أسهم حقيقي على التحقق من صحة الشحن
-DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification closed
-ReStockOnBill=Increase real stocks on validation of supplier invoice/credit note
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
 ReStockOnValidateOrder=Increase real stocks on purchase order approval
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after supplier order receipt of goods
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=أمر لم يتم بعد أو لا أكثر من ذلك الوضع الذي يسمح بإرسال من المنتجات في مخازن المخزون.
 StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
 NoPredefinedProductToDispatch=لا توجد منتجات محددة سلفا لهذا الكائن. لذلك لا إرسال في المخزون المطلوب.
@@ -75,12 +79,12 @@ DispatchVerb=إيفاد
 StockLimitShort=الحد الأقصى لتنبيه
 StockLimit=حد الأسهم للتنبيه
 StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
-PhysicalStock=المخزون المادي
+PhysicalStock=Physical Stock
 RealStock=الحقيقية للاسهم
-RealStockDesc=Physical or real stock is the stock you currently have into your internal warehouses/emplacements.
-RealStockWillAutomaticallyWhen=The real stock will automatically change according to this rules (see stock module setup to change this):
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=الأسهم الافتراضية
-VirtualStockDesc=Virtual stock is the stock you will get once all open pending actions that affect stocks will be closed (supplier order received, customer order shipped, ...)
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
 IdWarehouse=معرف مخزن
 DescWareHouse=وصف المخزن
 LieuWareHouse=المكان مخزن
@@ -100,7 +104,7 @@ ThisWarehouseIsPersonalStock=هذا يمثل مستودع للطبيعة الش
 SelectWarehouseForStockDecrease=اختيار مستودع لاستخدامها لانخفاض الأسهم
 SelectWarehouseForStockIncrease=اختيار مستودع لاستخدامها لزيادة المخزون
 NoStockAction=أي إجراء الأسهم
-DesiredStock=Desired optimal stock
+DesiredStock=Desired Stock
 DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
 StockToBuy=أن تأمر
 Replenishment=التجديد
@@ -113,13 +117,13 @@ CurentSelectionMode=وضع التحديد الحالي
 CurentlyUsingVirtualStock=الأسهم الظاهري
 CurentlyUsingPhysicalStock=المخزون المادي
 RuleForStockReplenishment=حكم شراء أسهم التجديد
-SelectProductWithNotNullQty=اختيار منتج واحد على الأقل مع الكمية غير فارغة ومورد
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
 AlertOnly= التنبيهات فقط
 WarehouseForStockDecrease=سيتم استخدام <b>مستودع٪ الصورة</b> لانخفاض الأسهم
 WarehouseForStockIncrease=سيتم استخدام <b>مستودع٪ s للزيادة</b> المخزون
 ForThisWarehouse=لهذا المستودع
-ReplenishmentStatusDesc=هذه هي قائمة من جميع المنتجات مع مخزون أقل من الأسهم المطلوب (أو أقل من قيمة التنبيه إذا مربع "التنبيه فقط" يتم التحقق). باستخدام مربع، يمكنك إنشاء أوامر المورد لملء الفرق.
-ReplenishmentOrdersDesc=This is a list of all open supplier orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=التجديد
 NbOfProductBeforePeriod=كمية من الناتج٪ الصورة في الأوراق المالية قبل الفترة المختارة (<٪ ق)
 NbOfProductAfterPeriod=كمية من الناتج٪ الصورة في الأوراق المالية بعد الفترة المختارة (>٪ ق)
@@ -143,11 +147,11 @@ ShowWarehouse=مشاهدة مستودع
 MovementCorrectStock=تصحيح الأسهم للمنتج٪ الصورة
 MovementTransferStock=نقل الأسهم من الناتج٪ الصورة إلى مستودع آخر
 InventoryCodeShort=الجرد. / وسائل التحقق. رمز
-NoPendingReceptionOnSupplierOrder=لا استقبال في انتظار المقرر أن يفتتح المورد أجل
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
 ThisSerialAlreadyExistWithDifferentDate=هذا الكثير / الرقم التسلسلي <strong>(٪ ق)</strong> موجودة بالفعل ولكن مع eatby مختلفة أو تاريخ sellby <strong>(وجدت٪ الصورة</strong> ولكن قمت <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
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
 OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
 ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
 ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
@@ -171,16 +175,16 @@ inventoryValidate=التحقق من صحة
 inventoryDraft=على التوالي
 inventorySelectWarehouse=Warehouse choice
 inventoryConfirmCreate=إنشاء
-inventoryOfWarehouse=Inventory for warehouse : %s
-inventoryErrorQtyAdd=Error : one quantity is less than zero
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
 inventoryMvtStock=By inventory
 inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=فئة فلتر
-SelectFournisseur=Supplier filter
+SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
 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
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement has date of inventory
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
@@ -202,7 +206,7 @@ inventoryDeleteLine=حذف الخط
 RegulateStock=Regulate Stock
 ListInventory=قائمة
 StockSupportServices=Stock management supports 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"
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
 ReceiveProducts=Receive items
 StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
 StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
diff --git a/htdocs/langs/ar_SA/website.lang b/htdocs/langs/ar_SA/website.lang
index ca432fd69ac..1cf5f878abd 100644
--- a/htdocs/langs/ar_SA/website.lang
+++ b/htdocs/langs/ar_SA/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/ar_SA/withdrawals.lang b/htdocs/langs/ar_SA/withdrawals.lang
index 95a32e010e3..da24cce0722 100644
--- a/htdocs/langs/ar_SA/withdrawals.lang
+++ b/htdocs/langs/ar_SA/withdrawals.lang
@@ -12,21 +12,21 @@ WithdrawalsLines=Direct debit order lines
 RequestStandingOrderToTreat=Request for direct debit payment order to process
 RequestStandingOrderTreated=Request for direct debit payment order processed
 NotPossibleForThisStatusOfWithdrawReceiptORLine=لم يكن ممكنا حتى الآن. سحب يجب أن يتم تعيين الحالة إلى "الفضل" قبل أن يعلن رفض على خطوط محددة.
-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
+NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=سحب المبلغ
 WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
-ResponsibleUser=مسؤولة المستخدم
+ResponsibleUser=User Responsible
 WithdrawalsSetup=Direct debit payment setup
 WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
-ThirdPartyBankCode=طرف ثالث بنك مدونة
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=تصنيف حساب
 ClassCreditedConfirm=هل أنت متأكد من أن يصنف هذا الانسحاب كما تلقي على حساب حسابك المصرفي؟
 TransData=تاريخ الإرسال
@@ -50,7 +50,7 @@ StatusMotif0=غير محدد
 StatusMotif1=توفير insuffisante
 StatusMotif2=Tirage conteste
 StatusMotif3=No direct debit payment order
-StatusMotif4=طلب العملاء
+StatusMotif4=Sales Order
 StatusMotif5=الضلع inexploitable
 StatusMotif6=حساب بدون رصيد
 StatusMotif7=قرار قضائي
@@ -66,11 +66,11 @@ NotifyCredit=انسحاب الائتمان
 NumeroNationalEmetter=رقم المرسل وطنية
 WithBankUsingRIB=عن الحسابات المصرفية باستخدام RIB
 WithBankUsingBANBIC=عن الحسابات المصرفية باستخدام IBAN / BIC / SWIFT
-BankToReceiveWithdraw=Bank account to receive direct debit
+BankToReceiveWithdraw=Receiving Bank Account
 CreditDate=الائتمان على
 WithdrawalFileNotCapable=غير قادر على توليد ملف استلام الانسحاب لبلدكم٪ الصورة (لا يتم اعتماد البلد)
-ShowWithdraw=وتظهر سحب
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=ومع ذلك، إذا فاتورة واحدة على الأقل دفع انسحاب لا تتم معالجتها حتى الآن، فإنه لن يكون كما سيولي للسماح لإدارة الانسحاب قبل.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=ملف الانسحاب
 SetToStatusSent=تعيين إلى حالة "المرسلة ملف"
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=إحصاءات عن طريق وضع خطوط
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -87,13 +87,13 @@ 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
+CreditorName=Creditor 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
+ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
@@ -102,6 +102,10 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/bg_BG/accountancy.lang b/htdocs/langs/bg_BG/accountancy.lang
index 047b5e94524..09f1de20348 100644
--- a/htdocs/langs/bg_BG/accountancy.lang
+++ b/htdocs/langs/bg_BG/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Консултирайте се тук със списък
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Неизвестен профил на контрагента. Ще използваме %s
 UnknownAccountForThirdpartyBlocking=Неизвестен профил на контрагента. Блокираща грешка
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Неизвестен профил на контрагента и чакаща сметка не са определени. Блокираща грешка
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
-Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Without valid dedicated account
 WithValidAccount=With valid dedicated account
 ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
 AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Range of accounting account
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
-
+DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang
index 0f44140eea4..5d092654c17 100644
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/htdocs/langs/bg_BG/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=Тази секция осигурява администр
 Purge=Изчистване
 PurgeAreaDesc=Тази страница ви позволява да изтриете всички файлове, генерирани или съхранени от Dolibarr (временни файлове или всички файлове в директорията <b>%s</b>). Използването на тази функция обикновено не е необходимо. Той се предоставя като решение за потребители, чиито Dolibarr се хоства от доставчик, който не предлага разрешения за изтриване на файлове, генерирани от уеб сървъра.
 PurgeDeleteLogFile=Изтриване на лог файлове, включително <b>%s</b> генериран от Debug Logs модула (няма риск от загуба на данни)
-PurgeDeleteTemporaryFiles=Изтриване на всички временни файлове (няма риск от загуба на данни)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Изтриване на временни файлове
 PurgeDeleteAllFilesInDocumentsDir=Изтриване на  всички файлове в директорията: <b>%s</b>.<br>Това ще изтрие всички генерирани документи, свързани с елементи (контрагенти, фактури и т.н.), файлове, качени чрез ECM модула, архиви на базата данни и временни файлове.
 PurgeRunNow=Изчистване сега
@@ -804,6 +804,7 @@ Permission401=Прочети отстъпки
 Permission402=Създаване / промяна на отстъпки
 Permission403=Проверка на отстъпки
 Permission404=Изтриване на отстъпки
+Permission430=Use Debug Bar
 Permission511=Преглед на плащания на заплати
 Permission512=Създаване / редактиране на плащания на заплати
 Permission514=Изтриване на плащания на заплати
@@ -818,6 +819,9 @@ Permission532=Създаване / промяна услуги
 Permission534=Изтриване на услуги
 Permission536=Вижте / управление скрити услуги
 Permission538=Износ услуги
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Прочети дарения
 Permission702=Създаване / промяна на дарения
 Permission703=Изтриване на дарения
@@ -837,6 +841,12 @@ Permission1101=Поръчките за доставка
 Permission1102=Създаване / промяна на поръчките за доставка
 Permission1104=Проверка на поръчките за доставка
 Permission1109=Изтриване на поръчките за доставка
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Прочети доставчици
 Permission1182=Преглед на поръчки за покупка
 Permission1183=Създаване / редактиране на поръчки за покупка
@@ -859,16 +869,6 @@ Permission1251=Пусни масов внос на външни данни в б
 Permission1321=Износ на клиентите фактури, атрибути и плащания
 Permission1322=Повторно отваряне на платена фактура
 Permission1421=Експортиране на поръчки за продажба и атрибути
-Permission20001=Преглед на молби за отпуск (на служителя и неговите подчинени)
-Permission20002=Създаване / редактиране на молби за отпуск (на служителя и неговите подчинени)
-Permission20003=Delete leave requests
-Permission20004=Преглед на всички молби за отпуск (дори на служители които не са подчинени на служителя)
-Permission20005=Създаване / редактиране на всички молби за отпуск (дори на служители, които не са подчинени на служителя)
-Permission20006=Admin leave requests (setup and update balance)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
 Permission2401=Прочетете действия (събития или задачи), свързани с неговата сметка
 Permission2402=Създаване/промяна действия (събития или задачи), свързани с неговата сметка
 Permission2403=Изтрий действия (събития или задачи), свързани с неговата сметка
@@ -882,9 +882,41 @@ Permission2503=Изпращане или изтриване на докумен
 Permission2515=Setup документи директории
 Permission2801=Използвайте FTP клиент в режим на четене (да преглеждате и сваляте само)
 Permission2802=Използвайте FTP клиент в режим на запис (изтриване или качване на файлове)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Преглед на молби за отпуск (на служителя и неговите подчинени)
+Permission20002=Създаване / редактиране на молби за отпуск (на служителя и неговите подчинени)
+Permission20003=Delete leave requests
+Permission20004=Преглед на всички молби за отпуск (дори на служители които не са подчинени на служителя)
+Permission20005=Създаване / редактиране на всички молби за отпуск (дори на служители, които не са подчинени на служителя)
+Permission20006=Admin leave requests (setup and update balance)
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission50101=Използване на точка на продажба
 Permission50201=Прочети сделки
 Permission50202=Сделки на внос
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Print
 Permission55001=Read polls
 Permission55002=Create/modify polls
@@ -1078,7 +1110,7 @@ AreaForAdminOnly=Параметрите за настройка могат да
 SystemInfoDesc=Информационна система Разни техническа информация можете да получите в режим само за четене и видими само за администратори.
 SystemAreaForAdminOnly=Тази секция е достъпна само за администратори. Потребителските права в Dolibarr не могат да променят това ограничение.
 CompanyFundationDesc=Редактирайте информацията за фирма / организация като кликнете върху бутона '%s' или '%s' в долната част на страницата.
-AccountantDesc=Редактирайте данните на вашия счетоводител / одитор
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Счетоводен код
 DisplayDesc=Тук могат да се променят параметрите, които влияят на външния вид и поведението на Dolibarr.
 AvailableModules=Налични приложения / модули
@@ -1891,3 +1923,5 @@ IFTTTDesc=Този модул е предназначен да задейств
 UrlForIFTTT=URL адрес за IFTTT
 YouWillFindItOnYourIFTTTAccount=Ще го намерите във вашият IFTTT акаунт
 EndPointFor=Крайна точка за %s: %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/bg_BG/banks.lang b/htdocs/langs/bg_BG/banks.lang
index 6652d0e65d1..2197dda55ff 100644
--- a/htdocs/langs/bg_BG/banks.lang
+++ b/htdocs/langs/bg_BG/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=Не е съгласувано
 CustomerInvoicePayment=Клиентско плащане
 SupplierInvoicePayment=Плащане на доставчик
 SubscriptionPayment=Плащане на членски внос
-WithdrawalPayment=Оттегляне плащане
+WithdrawalPayment=Платежно нареждане за дебит
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Банков превод
 BankTransfers=Банкови преводи
diff --git a/htdocs/langs/bg_BG/cashdesk.lang b/htdocs/langs/bg_BG/cashdesk.lang
index 5c5740cc6f7..6ed0a2faeb3 100644
--- a/htdocs/langs/bg_BG/cashdesk.lang
+++ b/htdocs/langs/bg_BG/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Терминал
 NumberOfTerminals=Брой терминали
 TerminalSelect=Изберете терминал, който искате да използвате:
 POSTicket=POS тикет
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/bg_BG/mails.lang b/htdocs/langs/bg_BG/mails.lang
index 3e0699cfba3..a86d997442c 100644
--- a/htdocs/langs/bg_BG/mails.lang
+++ b/htdocs/langs/bg_BG/mails.lang
@@ -78,9 +78,9 @@ GroupEmails=Групови имейли
 OneEmailPerRecipient=Един имейл за получател (по подразбиране е избран един имейл за всеки запис)
 WarningIfYouCheckOneRecipientPerEmail=Внимание, ако поставите отметка в това квадратче, това означава, че само един имейл ще бъде изпратен за няколко различни избрани записа, така че, ако съобщението ви съдържа заместващи променливи, които се отнасят до данни от даден запис, няма да е възможно да ги замените.
 ResultOfMailSending=Резултат от масовото изпращане на имейл
-NbSelected=Брой избрани
-NbIgnored=Брой игнорирани
-NbSent=Брой изпратени
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s изпратен(о)(и) съобщени(е)(я).
 ConfirmUnvalidateEmailing=Сигурни ли сте, че искате да превърнете имейла <b>%s</b> в чернова?
 MailingModuleDescContactsWithThirdpartyFilter=Контакт с клиентски филтри
diff --git a/htdocs/langs/bg_BG/members.lang b/htdocs/langs/bg_BG/members.lang
index c2856d00f53..b847148cb92 100644
--- a/htdocs/langs/bg_BG/members.lang
+++ b/htdocs/langs/bg_BG/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=Изберете статистически данни, к
 MenuMembersStats=Статистика
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
-Nature=Същност
+MemberNature=Nature of member
 Public=Информацията е публичнна
 NewMemberbyWeb=Новия член е добавен. Очаква се одобрение
 NewMemberForm=Форма за нов член
diff --git a/htdocs/langs/bg_BG/products.lang b/htdocs/langs/bg_BG/products.lang
index fcfb8ca0605..eaa2a6e5fef 100644
--- a/htdocs/langs/bg_BG/products.lang
+++ b/htdocs/langs/bg_BG/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Доставни цени
 SuppliersPricesOfProductsOrServices=Доставни цени (на продукти/услуги)
 CustomCode=Митнически / Стоков / ХС код
 CountryOrigin=Държава на произход
-Nature=Вид на продукта (материал/завършен)
+Nature=Nature of produt (material/finished)
 ShortLabel=Кратък етикет
 Unit=Мярка
 p=е.
diff --git a/htdocs/langs/bg_BG/salaries.lang b/htdocs/langs/bg_BG/salaries.lang
index 4f4a9b403c7..e69d8b20a81 100644
--- a/htdocs/langs/bg_BG/salaries.lang
+++ b/htdocs/langs/bg_BG/salaries.lang
@@ -1,18 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger 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=Счетоводна сметка, използвана за контрагенти
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Специализираната счетоводна сметка, дефинирана в картата на потребителя, ще се използва само за вторично счетоводно отчитане. Тя ще бъде използвана в регистъра на главната книга и като стойност по подразбиране за вторично счетоводно отчитане, ако не е дефинирана специализирана потребителска счетоводна сметка за потребителя.
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Счетоводна сметка по подразбиране за плащане на заплати
 Salary=Заплата
 Salaries=Заплати
-NewSalaryPayment=Ново заплащане на заплата
+NewSalaryPayment=Ново плащане на заплата
+AddSalaryPayment=Добавяне на плащане на заплата
 SalaryPayment=Плащане на заплата
-SalariesPayments=Заплащания заплати
-ShowSalaryPayment=Показване заплащане на заплата
-THM=Average hourly rate
-TJM=Average daily rate
-CurrentSalary=Сегашна заплата
-THMDescription=Тази стойност може да използва за изчисляване на отнето време по проект отделено от потребителите ако модул проект се използва
-TJMDescription=Тази стойност е само сега като информация и не се използва за никакво изчисление
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
-SalariesStatistics=Statistiques salaires
+SalariesPayments=Плащания на заплати
+ShowSalaryPayment=Показване на плащане на заплата
+THM=Средна почасова ставка
+TJM=Средна дневна ставка
+CurrentSalary=Текуща заплата
+THMDescription=Тази стойност може да се използва за изчисляване на разходите за времето, изразходвано по проект, ако модула проекти се използва.
+TJMDescription=Тази стойност понастоящем е информативна и  не се използва за изчисления
+LastSalaries=Плащания на заплати: %s последни
+AllSalaries=Всички плащания на заплати
+SalariesStatistics=Статистика на заплатите
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/bg_BG/stocks.lang b/htdocs/langs/bg_BG/stocks.lang
index 7e82f0ac2a9..3d1e9f84720 100644
--- a/htdocs/langs/bg_BG/stocks.lang
+++ b/htdocs/langs/bg_BG/stocks.lang
@@ -66,10 +66,12 @@ RuleForStockManagementIncrease=Избиране на правило за авт
 DeStockOnBill=Намаляване на реални наличности при валидиране на фактура за продажба / кредитно известие
 DeStockOnValidateOrder=Намаляване на реални наличности при валидиране на клиентска поръчка
 DeStockOnShipment=Намаляване на реални наличности при валидиране на доставка
-DeStockOnShipmentOnClosing=Намаляване на реални наличности при класифициране на доставка като затворена
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
 ReStockOnBill=Увеличаване на реални наличности при валидиране на фактура за покупка / кредитно известие
 ReStockOnValidateOrder=Увеличаване на реални наличности при одобряване на поръчка за покупка
 ReStockOnDispatchOrder=Увеличаване на реални наличности при ръчно изпращане в склад, след получаване на поръчка за покупка на стоки
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=Поръчка все още не е или не повече статут, който позволява изпращането на продукти на склад складове.
 StockDiffPhysicTeoric=Обясняване за разликата между физическа и виртуална наличност
 NoPredefinedProductToDispatch=Няма предварително определени продукти за този обект, така че не се изисква изпращане на наличност.
diff --git a/htdocs/langs/bg_BG/website.lang b/htdocs/langs/bg_BG/website.lang
index e228c6be1d5..18dc11e057d 100644
--- a/htdocs/langs/bg_BG/website.lang
+++ b/htdocs/langs/bg_BG/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/bg_BG/withdrawals.lang b/htdocs/langs/bg_BG/withdrawals.lang
index e54750bcf2d..149fec6aa7c 100644
--- a/htdocs/langs/bg_BG/withdrawals.lang
+++ b/htdocs/langs/bg_BG/withdrawals.lang
@@ -69,8 +69,8 @@ WithBankUsingBANBIC=За банкови сметки с IBAN / BIC / SWIFT
 BankToReceiveWithdraw=Receiving Bank Account
 CreditDate=Кредит за
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
-ShowWithdraw=Покажи Теглене
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Въпреки това, ако фактурата не е все още най-малко една оттегляне плащане обработват, не се определя като плаща, за да се даде възможност да управляват оттеглянето им преди.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=Този раздел ви позволява да заявите плащане с директен дебит. След като направите това, отидете в меню Банка-> плащане с директен дебит, за да управлявате платежното нареждане за директен дебит. Когато платежното нареждане е затворено, плащането по фактура ще бъде автоматично записано и фактурата ще бъде затворена, ако няма остатък за плащане.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Зададен към статус "Файл Изпратен"
diff --git a/htdocs/langs/bn_BD/accountancy.lang b/htdocs/langs/bn_BD/accountancy.lang
index daa5b4ef413..bb141cb9eb0 100644
--- a/htdocs/langs/bn_BD/accountancy.lang
+++ b/htdocs/langs/bn_BD/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Consult here the list of third-party customers and vendors
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third-party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
-Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Without valid dedicated account
 WithValidAccount=With valid dedicated account
 ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
 AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Range of accounting account
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
-
+DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/bn_BD/admin.lang b/htdocs/langs/bn_BD/admin.lang
index e8a5dda7efb..9eaa12ec9be 100644
--- a/htdocs/langs/bn_BD/admin.lang
+++ b/htdocs/langs/bn_BD/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
@@ -804,6 +804,7 @@ Permission401=Read discounts
 Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
+Permission430=Use Debug Bar
 Permission511=Read payments of salaries
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
@@ -818,6 +819,9 @@ Permission532=Create/modify services
 Permission534=Delete services
 Permission536=See/manage hidden services
 Permission538=Export services
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
@@ -837,6 +841,12 @@ Permission1101=Read delivery orders
 Permission1102=Create/modify delivery orders
 Permission1104=Validate delivery orders
 Permission1109=Delete delivery orders
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Read suppliers
 Permission1182=Read purchase orders
 Permission1183=Create/modify purchase orders
@@ -859,16 +869,6 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those 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)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
 Permission2401=Read actions (events or tasks) linked to his account
 Permission2402=Create/modify actions (events or tasks) linked to his account
 Permission2403=Delete actions (events or tasks) linked to his account
@@ -882,9 +882,41 @@ Permission2503=Submit or delete documents
 Permission2515=Setup documents directories
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those 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)
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale
 Permission50201=Read transactions
 Permission50202=Import transactions
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Print
 Permission55001=Read polls
 Permission55002=Create/modify polls
@@ -1078,7 +1110,7 @@ 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 to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
-AccountantDesc=Edit the details of your accountant/bookkeeper
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
@@ -1891,3 +1923,5 @@ IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute s
 UrlForIFTTT=URL endpoint for IFTTT
 YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/bn_BD/banks.lang b/htdocs/langs/bn_BD/banks.lang
index 05225b58ed7..1022bb99a3f 100644
--- a/htdocs/langs/bn_BD/banks.lang
+++ b/htdocs/langs/bn_BD/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
 SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Subscription payment
-WithdrawalPayment=Withdrawal payment
+WithdrawalPayment=Debit payment order
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
diff --git a/htdocs/langs/bn_BD/cashdesk.lang b/htdocs/langs/bn_BD/cashdesk.lang
index 006097b7e82..ea0e660ed2d 100644
--- a/htdocs/langs/bn_BD/cashdesk.lang
+++ b/htdocs/langs/bn_BD/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/bn_BD/mails.lang b/htdocs/langs/bn_BD/mails.lang
index b50faffe2fa..8b92cef3103 100644
--- a/htdocs/langs/bn_BD/mails.lang
+++ b/htdocs/langs/bn_BD/mails.lang
@@ -19,6 +19,8 @@ MailTopic=Email topic
 MailText=Message
 MailFile=Attached files
 MailMessage=Email body
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
 ShowEMailing=Show emailing
 ListOfEMailings=List of emailings
 NewMailing=New emailing
@@ -76,9 +78,9 @@ GroupEmails=Group emails
 OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
 WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
 ResultOfMailSending=Result of mass Email sending
-NbSelected=No. selected
-NbIgnored=No. ignored
-NbSent=No. sent
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
diff --git a/htdocs/langs/bn_BD/members.lang b/htdocs/langs/bn_BD/members.lang
index 9517568846c..9993e05428f 100644
--- a/htdocs/langs/bn_BD/members.lang
+++ b/htdocs/langs/bn_BD/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
-Nature=Nature
+MemberNature=Nature of member
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
diff --git a/htdocs/langs/bn_BD/products.lang b/htdocs/langs/bn_BD/products.lang
index 402779cb00f..7b68f5b3ebd 100644
--- a/htdocs/langs/bn_BD/products.lang
+++ b/htdocs/langs/bn_BD/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
-Nature=Product Type (material/finished)
+Nature=Nature of produt (material/finished)
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/bn_BD/salaries.lang b/htdocs/langs/bn_BD/salaries.lang
index 6a82354edae..7c3c08a65bd 100644
--- a/htdocs/langs/bn_BD/salaries.lang
+++ b/htdocs/langs/bn_BD/salaries.lang
@@ -1,18 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger 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_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
 Salary=Salary
 Salaries=Salaries
 NewSalaryPayment=New salary payment
+AddSalaryPayment=Add salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
 ShowSalaryPayment=Show salary payment
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
-THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
-TJMDescription=This value is currently as information only and is not used for any calculation
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
-SalariesStatistics=Statistiques salaires
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/bn_BD/stocks.lang b/htdocs/langs/bn_BD/stocks.lang
index 8178a8918b7..d42f1a82243 100644
--- a/htdocs/langs/bn_BD/stocks.lang
+++ b/htdocs/langs/bn_BD/stocks.lang
@@ -3,7 +3,7 @@ WarehouseCard=Warehouse card
 Warehouse=Warehouse
 Warehouses=Warehouses
 ParentWarehouse=Parent warehouse
-NewWarehouse=New warehouse / Stock area
+NewWarehouse=New warehouse / Stock Location
 WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
 WarehouseSource=Source warehouse
@@ -29,6 +29,8 @@ MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
 LocationSummary=Short name location
 NumberOfDifferentProducts=Number of different products
@@ -44,7 +46,6 @@ TransferStock=Transfer stock
 MassStockTransferShort=Mass stock transfer
 StockMovement=Stock movement
 StockMovements=Stock movements
-LabelMovement=Movement label
 NumberOfUnit=Number of units
 UnitPurchaseValue=Unit purchase price
 StockTooLow=Stock too low
@@ -54,21 +55,23 @@ PMPValue=Weighted average price
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Allow to add limit and desired stock per couple (product, warehouse) instead of per product
-IndependantSubProductStock=Product stock and subproduct stock are independant
+AllowAddLimitStockByWarehouse=Manage also values for minimum and desired stock per pairing (product-warehouse) in addition to values per product
+IndependantSubProductStock=Product stock and subproduct stock are independent
 QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
-RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
-DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
-DeStockOnValidateOrder=Decrease real stocks on customers orders validation
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
 DeStockOnShipment=Decrease real stocks on shipping validation
-DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification closed
-ReStockOnBill=Increase real stocks on suppliers invoices/credit notes validation
-ReStockOnValidateOrder=Increase real stocks on purchase orders approbation
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows dispatching of products in stock warehouses.
 StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
 NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required.
@@ -76,12 +79,12 @@ DispatchVerb=Dispatch
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
 StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
-PhysicalStock=Physical stock
+PhysicalStock=Physical Stock
 RealStock=Real Stock
-RealStockDesc=Physical or real stock is the stock you currently have into your internal warehouses/emplacements.
-RealStockWillAutomaticallyWhen=The real stock will automatically change according to this rules (see stock module setup to change this):
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
-VirtualStockDesc=Virtual stock is the stock you will get once all open pending actions that affect stocks will be closed (supplier order received, customer order shipped, ...)
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
@@ -101,7 +104,7 @@ ThisWarehouseIsPersonalStock=This warehouse represents personal stock of %s %s
 SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
 SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
 NoStockAction=No stock action
-DesiredStock=Desired optimal stock
+DesiredStock=Desired Stock
 DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
 StockToBuy=To order
 Replenishment=Replenishment
@@ -114,13 +117,13 @@ CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtual stock
 CurentlyUsingPhysicalStock=Physical stock
 RuleForStockReplenishment=Rule for stocks replenishment
-SelectProductWithNotNullQty=Select at least one product with a qty not null and a supplier
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
 AlertOnly= Alerts only
 WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is a list of all open supplier orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,10 +133,11 @@ RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever is rule for automatic stock change)
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
+TypeMovement=Type of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -143,11 +147,11 @@ ShowWarehouse=Show warehouse
 MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
 OpenAll=Open for all actions
 OpenInternal=Open only for internal actions
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on supplier order reception
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
 OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
 ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
 ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
@@ -171,16 +175,16 @@ inventoryValidate=Validated
 inventoryDraft=Running
 inventorySelectWarehouse=Warehouse choice
 inventoryConfirmCreate=Create
-inventoryOfWarehouse=Inventory for warehouse : %s
-inventoryErrorQtyAdd=Error : one quantity is leaser than zero
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
 inventoryMvtStock=By inventory
 inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
-SelectFournisseur=Supplier filter
+SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
 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
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement has date of inventory
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
@@ -195,12 +199,16 @@ AddInventoryProduct=Add product to inventory
 AddProduct=Add
 ApplyPMP=Apply PMP
 FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action ?
+ConfirmFlushInventory=Do you confirm this action?
 InventoryFlushed=Inventory flushed
 ExitEditMode=Exit edition
 inventoryDeleteLine=Delete line
 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"
+StockSupportServices=Stock management supports Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
 ReceiveProducts=Receive items
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
diff --git a/htdocs/langs/bn_BD/website.lang b/htdocs/langs/bn_BD/website.lang
index b4d894f55d7..534756ac932 100644
--- a/htdocs/langs/bn_BD/website.lang
+++ b/htdocs/langs/bn_BD/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/bn_BD/withdrawals.lang b/htdocs/langs/bn_BD/withdrawals.lang
index 3defcec975a..cbca2b2f103 100644
--- a/htdocs/langs/bn_BD/withdrawals.lang
+++ b/htdocs/langs/bn_BD/withdrawals.lang
@@ -12,21 +12,21 @@ 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
+NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Amount to withdraw
 WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
-ResponsibleUser=Responsible user
+ResponsibleUser=User Responsible
 WithdrawalsSetup=Direct debit payment setup
 WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
-ThirdPartyBankCode=Third party bank code
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Classify credited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
@@ -50,7 +50,7 @@ StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
 StatusMotif2=Request contested
 StatusMotif3=No direct debit payment order
-StatusMotif4=Customer Order
+StatusMotif4=Sales Order
 StatusMotif5=RIB unusable
 StatusMotif6=Account without balance
 StatusMotif7=Judicial Decision
@@ -66,11 +66,11 @@ NotifyCredit=Withdrawal Credit
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=For bank accounts using RIB
 WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
-BankToReceiveWithdraw=Bank account to receive direct debit
+BankToReceiveWithdraw=Receiving Bank Account
 CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
-ShowWithdraw=Show Withdraw
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -87,13 +87,13 @@ 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
+CreditorName=Creditor 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
+ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
@@ -102,6 +102,10 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/bs_BA/accountancy.lang b/htdocs/langs/bs_BA/accountancy.lang
index 38c19fb68da..427995e88d0 100644
--- a/htdocs/langs/bs_BA/accountancy.lang
+++ b/htdocs/langs/bs_BA/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Consult here the list of third-party customers and vendors
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third-party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
-Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Without valid dedicated account
 WithValidAccount=With valid dedicated account
 ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
 AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Range of accounting account
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
-
+DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang
index a24caf6d762..06471c6fe6b 100644
--- a/htdocs/langs/bs_BA/admin.lang
+++ b/htdocs/langs/bs_BA/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
@@ -804,6 +804,7 @@ Permission401=Read discounts
 Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
+Permission430=Use Debug Bar
 Permission511=Read payments of salaries
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
@@ -818,6 +819,9 @@ Permission532=Create/modify services
 Permission534=Delete services
 Permission536=See/manage hidden services
 Permission538=Export services
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
@@ -837,6 +841,12 @@ Permission1101=Read delivery orders
 Permission1102=Create/modify delivery orders
 Permission1104=Validate delivery orders
 Permission1109=Delete delivery orders
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Read suppliers
 Permission1182=Read purchase orders
 Permission1183=Create/modify purchase orders
@@ -859,16 +869,6 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those 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)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
 Permission2401=Read actions (events or tasks) linked to his account
 Permission2402=Create/modify actions (events or tasks) linked to his account
 Permission2403=Delete actions (events or tasks) linked to his account
@@ -882,9 +882,41 @@ Permission2503=Submit or delete documents
 Permission2515=Postavke direktorija za dokumente
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those 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)
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale
 Permission50201=Read transactions
 Permission50202=Import transactions
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Print
 Permission55001=Read polls
 Permission55002=Create/modify polls
@@ -1078,7 +1110,7 @@ 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 to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
-AccountantDesc=Edit the details of your accountant/bookkeeper
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
@@ -1891,3 +1923,5 @@ IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute s
 UrlForIFTTT=URL endpoint for IFTTT
 YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/bs_BA/banks.lang b/htdocs/langs/bs_BA/banks.lang
index b8c984c0ff3..c61e6a2e969 100644
--- a/htdocs/langs/bs_BA/banks.lang
+++ b/htdocs/langs/bs_BA/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=Nije izmireno
 CustomerInvoicePayment=Uplata kupca
 SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Plaćanje preplate
-WithdrawalPayment=Povlačenje uplate
+WithdrawalPayment=Nalog za plaćanje
 SocialContributionPayment=Plaćanje socijalnog/fiskalnog poreza
 BankTransfer=Prenos između banaka
 BankTransfers=Prenosi između banaka
diff --git a/htdocs/langs/bs_BA/cashdesk.lang b/htdocs/langs/bs_BA/cashdesk.lang
index c69d158efaf..b267d0af300 100644
--- a/htdocs/langs/bs_BA/cashdesk.lang
+++ b/htdocs/langs/bs_BA/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/bs_BA/mails.lang b/htdocs/langs/bs_BA/mails.lang
index b15e2230931..386a1f9a367 100644
--- a/htdocs/langs/bs_BA/mails.lang
+++ b/htdocs/langs/bs_BA/mails.lang
@@ -19,6 +19,8 @@ MailTopic=Email topic
 MailText=Poruka
 MailFile=Priloženi fajlovi
 MailMessage=Tekst emaila
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
 ShowEMailing=Prikažu e-poštu
 ListOfEMailings=Lista e-pošta
 NewMailing=Nova e-pošta
@@ -76,9 +78,9 @@ GroupEmails=Group emails
 OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
 WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
 ResultOfMailSending=Result of mass Email sending
-NbSelected=No. selected
-NbIgnored=No. ignored
-NbSent=No. sent
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
diff --git a/htdocs/langs/bs_BA/members.lang b/htdocs/langs/bs_BA/members.lang
index 8542f3cb28e..cb7bda24617 100644
--- a/htdocs/langs/bs_BA/members.lang
+++ b/htdocs/langs/bs_BA/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistika
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
-Nature=Nature
+MemberNature=Nature of member
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
diff --git a/htdocs/langs/bs_BA/products.lang b/htdocs/langs/bs_BA/products.lang
index 862b203c33a..552db428cf4 100644
--- a/htdocs/langs/bs_BA/products.lang
+++ b/htdocs/langs/bs_BA/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
-Nature=Product Type (material/finished)
+Nature=Nature of produt (material/finished)
 ShortLabel=Short label
 Unit=Jedinica
 p=u.
diff --git a/htdocs/langs/bs_BA/salaries.lang b/htdocs/langs/bs_BA/salaries.lang
index 6a82354edae..7c3c08a65bd 100644
--- a/htdocs/langs/bs_BA/salaries.lang
+++ b/htdocs/langs/bs_BA/salaries.lang
@@ -1,18 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger 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_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
 Salary=Salary
 Salaries=Salaries
 NewSalaryPayment=New salary payment
+AddSalaryPayment=Add salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
 ShowSalaryPayment=Show salary payment
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
-THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
-TJMDescription=This value is currently as information only and is not used for any calculation
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
-SalariesStatistics=Statistiques salaires
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/bs_BA/stocks.lang b/htdocs/langs/bs_BA/stocks.lang
index d91246de8e5..f92286972b8 100644
--- a/htdocs/langs/bs_BA/stocks.lang
+++ b/htdocs/langs/bs_BA/stocks.lang
@@ -3,7 +3,7 @@ WarehouseCard=Kartica skladišta
 Warehouse=Skladište
 Warehouses=Skladišta
 ParentWarehouse=Parent warehouse
-NewWarehouse=Dio za novo skladište/zalihu
+NewWarehouse=New warehouse / Stock Location
 WarehouseEdit=Modifikovanje skladišta
 MenuNewWarehouse=Novo skladište
 WarehouseSource=Izvorno skladište
@@ -29,6 +29,8 @@ MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
 Location=Lokacija
 LocationSummary=Skraćeni naziv lokacije
 NumberOfDifferentProducts=Broj različitih proizvoda
@@ -44,7 +46,6 @@ TransferStock=Transfer stock
 MassStockTransferShort=Mass stock transfer
 StockMovement=Stock movement
 StockMovements=Stock movements
-LabelMovement=Oznaka za kretanje
 NumberOfUnit=Broj jedinica
 UnitPurchaseValue=Kupovna cijena jedinice
 StockTooLow=Zaliha preniska
@@ -54,21 +55,23 @@ PMPValue=Ponderirana/vagana aritmetička sredina - PAS
 PMPValueShort=PAS
 EnhancedValueOfWarehouses=Skladišna vrijednost
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Allow to add limit and desired stock per couple (product, warehouse) instead of per product
-IndependantSubProductStock=Product stock and subproduct stock are independant
+AllowAddLimitStockByWarehouse=Manage also values for minimum and desired stock per pairing (product-warehouse) in addition to values per product
+IndependantSubProductStock=Product stock and subproduct stock are independent
 QtyDispatched=Otpremljena količina
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
-RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
-DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
-DeStockOnValidateOrder=Smanji stvarne zalihe nakon potvrđivanja narudžbe kupca
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
 DeStockOnShipment=Decrease real stocks on shipping validation
-DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification closed
-ReStockOnBill=Increase real stocks on suppliers invoices/credit notes validation
-ReStockOnValidateOrder=Increase real stocks on purchase orders approbation
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=Narudžna jos uvijek nema ili nema više status koji dozvoljava otpremanje proizvoda u zalihu skladišta
 StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
 NoPredefinedProductToDispatch=Nema predefinisanih proizvoda za ovaj objekat. Dakle, nema potrebe za otpremanje na zalihu.
@@ -76,12 +79,12 @@ DispatchVerb=Otpremiti
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
 StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
-PhysicalStock=Fizička zaliha
+PhysicalStock=Physical Stock
 RealStock=Stvarna zaliha
-RealStockDesc=Physical or real stock is the stock you currently have into your internal warehouses/emplacements.
-RealStockWillAutomaticallyWhen=The real stock will automatically change according to this rules (see stock module setup to change this):
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Viruelna zaliha
-VirtualStockDesc=Virtual stock is the stock you will get once all open pending actions that affect stocks will be closed (supplier order received, customer order shipped, ...)
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
 IdWarehouse=ID skladišta
 DescWareHouse=Opis skladišta
 LieuWareHouse=Lokalizacija skladišta
@@ -101,7 +104,7 @@ ThisWarehouseIsPersonalStock=Ovo skladište predstavlja ličnu zalihu od %s %s
 SelectWarehouseForStockDecrease=Odaberi skladište za smanjenje zalihe
 SelectWarehouseForStockIncrease=Odaberi skladište za povećanje zalihe
 NoStockAction=Nema akcija zaliha
-DesiredStock=Desired optimal stock
+DesiredStock=Desired Stock
 DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
 StockToBuy=Za narudžbu
 Replenishment=Nadopuna
@@ -114,13 +117,13 @@ CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Viruelna zaliha
 CurentlyUsingPhysicalStock=Fizička zaliha
 RuleForStockReplenishment=Pravila za nadopunjenje zaliha
-SelectProductWithNotNullQty=Odaberi bar jedan proizvod sa količinom većom od nule i dobavljača
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
 AlertOnly= Samo uzbune
 WarehouseForStockDecrease=Skladište <b>%s</b> će biti korišteno za smanjenje zalihe
 WarehouseForStockIncrease=Skladište <b>%s</b> će biti korišteno za povećanje zalihe
 ForThisWarehouse=Za ovo skladište
-ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is a list of all open supplier orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Nadopune
 NbOfProductBeforePeriod=Količina proizvoda %s u zalihi prije odabranog perioda (%s)
 NbOfProductAfterPeriod=Količina proizvoda %s u zalihi poslije odabranog perioda (> %s)
@@ -130,10 +133,11 @@ RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Kretanja zalihe zapisana
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever is rule for automatic stock change)
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
+TypeMovement=Type of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -143,11 +147,11 @@ ShowWarehouse=Prikaži skladište
 MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
 OpenAll=Open for all actions
 OpenInternal=Open only for internal actions
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on supplier order reception
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
 OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
 ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
 ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
@@ -171,16 +175,16 @@ inventoryValidate=Potvrđeno
 inventoryDraft=Aktivan
 inventorySelectWarehouse=Warehouse choice
 inventoryConfirmCreate=Create
-inventoryOfWarehouse=Inventory for warehouse : %s
-inventoryErrorQtyAdd=Error : one quantity is leaser than zero
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
 inventoryMvtStock=By inventory
 inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
-SelectFournisseur=Supplier filter
+SelectFournisseur=Vendor filter
 inventoryOnDate=Inventar
-INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
 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
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement has date of inventory
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
@@ -195,12 +199,16 @@ AddInventoryProduct=Add product to inventory
 AddProduct=Dodaj
 ApplyPMP=Apply PMP
 FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action ?
+ConfirmFlushInventory=Do you confirm this action?
 InventoryFlushed=Inventory flushed
 ExitEditMode=Exit edition
 inventoryDeleteLine=Obriši red
 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"
+StockSupportServices=Stock management supports Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
 ReceiveProducts=Receive items
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
diff --git a/htdocs/langs/bs_BA/website.lang b/htdocs/langs/bs_BA/website.lang
index aa367a744ab..978ed485cd6 100644
--- a/htdocs/langs/bs_BA/website.lang
+++ b/htdocs/langs/bs_BA/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/bs_BA/withdrawals.lang b/htdocs/langs/bs_BA/withdrawals.lang
index 7c60c9af042..1d21628ded7 100644
--- a/htdocs/langs/bs_BA/withdrawals.lang
+++ b/htdocs/langs/bs_BA/withdrawals.lang
@@ -12,21 +12,21 @@ 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
+NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Iznos za podizanje
 WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
-ResponsibleUser=Odgovorni korisnik
+ResponsibleUser=User Responsible
 WithdrawalsSetup=Direct debit payment setup
 WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
-ThirdPartyBankCode=Third party bank code
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Označi na potraživanja
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
@@ -50,7 +50,7 @@ StatusMotif0=Neodređeno
 StatusMotif1=Insufficient funds
 StatusMotif2=Request contested
 StatusMotif3=No direct debit payment order
-StatusMotif4=Narudžba za kupca
+StatusMotif4=Sales Order
 StatusMotif5=RIB unusable
 StatusMotif6=Račun bez stanja
 StatusMotif7=Sudske odluke
@@ -66,11 +66,11 @@ NotifyCredit=Withdrawal Credit
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=For bank accounts using RIB
 WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
-BankToReceiveWithdraw=Bank account to receive direct debit
+BankToReceiveWithdraw=Receiving Bank Account
 CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
-ShowWithdraw=Show Withdraw
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -87,25 +87,25 @@ 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
+CreditorName=Creditor 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
+ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
 SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
-<<<<<<< HEAD
-ExecutionDate=Execution date
-=======
 ExecutionDate=Datum izvršenja
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
 CreateForSepa=Create direct debit file
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/ca_ES/accountancy.lang b/htdocs/langs/ca_ES/accountancy.lang
index 73fa80f097f..529605e4a5f 100644
--- a/htdocs/langs/ca_ES/accountancy.lang
+++ b/htdocs/langs/ca_ES/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Consulteu aquí la llista dels clients i proveïdors de ter
 ListAccounts=Llistat dels comptes comptables
 UnknownAccountForThirdparty=Compte comptable de tercer desconeguda, utilitzarem %s
 UnknownAccountForThirdpartyBlocking=Compte comptable de tercer desconegut. Error de bloqueig
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Compte de tercers no definit o tercer desconegut. Error de bloqueig.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Compte de tercers desconegut i compte d'espera no definit. Error de bloqueig
 PaymentsNotLinkedToProduct=Pagament no vinculat a cap producte / servei
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Exporta a Cogilog
 Modelcsv_agiris=Exporta a Agiris
 Modelcsv_openconcerto=Exporta per a OpenConcerto (Test)
 Modelcsv_configurable=Exporta CSV configurable
-Modelcsv_FEC=Exporta FEC (art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Exportació per Sage 50 Switzerland
 ChartofaccountsId=Id pla comptable
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Sense compte dedicada vàlida
 WithValidAccount=Amb compte dedicada vàlida
 ValueNotIntoChartOfAccount=Aquest compte comptable no existeix al pla comptable
 AccountRemovedFromGroup=S'ha eliminat el compte del grup
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Rang de compte comptable
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Línies encara no enllaçades, utilitzeu el menú <a
 
 ## Import
 ImportAccountingEntries=Entrades de comptabilitat
-
+DateExport=Date export
 WarningReportNotReliable=Avís, aquest informe no està basat en el Llibre Major, de manera que no conté assentaments modificats manualment en el Llibre Major. Si el registre diari està actualitzat, la vista de comptes és més precisa.
 ExpenseReportJournal=Diari d'informe de despeses
 InventoryJournal=Diari d'inventari
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index 331373ab394..c96a65bc831 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=Aquesta àrea proporciona funcions d'administració. Utilitz
 Purge=Purga
 PurgeAreaDesc=Aquesta pàgina permet eliminar tots els fitxers generats o guardats per Dolibarr (fitxers temporals o tots els fitxers de la carpeta <b>%s</b>). L'ús d'aquesta funció no és necessària. Es dóna per als usuaris que alberguen Dolibarr en un servidor que no ofereix els permisos d'eliminació de fitxers generats pel servidor web.
 PurgeDeleteLogFile=Suprimeix els fitxers de registre, incloent <b>%s</b> definit per al mòdul Syslog (sense risc de perdre dades)
-PurgeDeleteTemporaryFiles=Elimina tots els fitxers temporals (sense risc de perdre dades)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Elimina els fitxers temporals
 PurgeDeleteAllFilesInDocumentsDir=Elimineu tots els arxius del directori: <b> %s </b>. <br> Això esborrarà tots documents generats i relacionats amb els elements (Tercers, factures etc ...), arxius carregats al mòdul ECM, còpies de seguretat de la Base de Dades, paperera i arxius temporals.
 PurgeRunNow=Purgar
@@ -804,6 +804,7 @@ Permission401=Consultar havers
 Permission402=Crear/modificar havers
 Permission403=Validar havers
 Permission404=Eliminar havers
+Permission430=Use Debug Bar
 Permission511=Consulta el pagament dels salaris
 Permission512=Crea/modifica el pagament dels salaris
 Permission514=Elimina pagament de salaris
@@ -818,6 +819,9 @@ Permission532=Crear/modificar serveis
 Permission534=Eliminar serveis
 Permission536=Veure / gestionar els serveis ocults
 Permission538=Exportar serveis
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Consultar donacions
 Permission702=Crear/modificar donacions
 Permission703=Eliminar donacions
@@ -837,6 +841,12 @@ Permission1101=Consultar ordres d'enviament
 Permission1102=Crear/modificar ordres d'enviament
 Permission1104=Validar ordre d'enviament
 Permission1109=Eliminar ordre d'enviament
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Consultar proveïdors
 Permission1182=Consulta les comandes de compra
 Permission1183=Crea/modifica les comandes de compra
@@ -859,16 +869,6 @@ 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 ordres de vendes i atributs
-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)
-Permission20003=Elimina les peticions de dies lliures retribuïts
-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)
-Permission20006=Administra els dies de lliure disposició (configura i actualitza el balanç)
-Permission23001=Consulta les tasques programades
-Permission23002=Crear/Modificar les tasques programades
-Permission23003=Eliminar tasques programades
-Permission23004=Executar tasca programada
 Permission2401=Llegir accions (esdeveniments o tasques) vinculades al seu compte
 Permission2402=Crear/modificar accions (esdeveniments o tasques) vinculades al seu compte
 Permission2403=Eliminar accions (esdeveniments o tasques) vinculades al seu compte
@@ -882,9 +882,41 @@ Permission2503=Enviar o eliminar documents
 Permission2515=Configuració carpetes de documents
 Permission2801=Utilitzar el client FTP en mode lectura (només explorar i descarregar)
 Permission2802=Utilitzar el client FTP en mode escriptura (esborrar o pujar arxius)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+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)
+Permission20003=Elimina les peticions de dies lliures retribuïts
+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)
+Permission20006=Administra els dies de lliure disposició (configura i actualitza el balanç)
+Permission23001=Consulta les tasques programades
+Permission23002=Crear/Modificar les tasques programades
+Permission23003=Eliminar tasques programades
+Permission23004=Executar tasca programada
 Permission50101=Utilitza el punt de venda
 Permission50201=Consultar les transaccions
 Permission50202=Importar les transaccions
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Imprimir
 Permission55001=Llegir enquestes
 Permission55002=Crear/modificar enquestes
@@ -1078,7 +1110,7 @@ AreaForAdminOnly=Els paràmetres de configuració només poden ser establerts pe
 SystemInfoDesc=La informació del sistema és informació tècnica accessible només en només lectura als administradors.
 SystemAreaForAdminOnly=Aquesta àrea només està disponible per als usuaris administradors. Els permisos d'usuari de Dolibarr no poden canviar aquesta restricció.
 CompanyFundationDesc=Editeu la informació de l'empresa/entitat. Feu clic al botó "%s" o "%s" al final de la pàgina.
-AccountantDesc=Editeu els detalls del vostre comptable/auditor
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Número de fila
 DisplayDesc=Els paràmetres que afecten l'aspecte i el comportament de Dolibarr es poden modificar aquí.
 AvailableModules=Mòduls/complements disponibles
@@ -1891,3 +1923,5 @@ IFTTTDesc=Aquest mòdul està dissenyat per activar esdeveniments en IFTTT i / o
 UrlForIFTTT=Punt final d’URL per a IFTTT
 YouWillFindItOnYourIFTTTAccount=El trobareu al vostre compte IFTTT
 EndPointFor=Punt final per %s: %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/ca_ES/banks.lang b/htdocs/langs/ca_ES/banks.lang
index dc6e05e8513..8e221c286d0 100644
--- a/htdocs/langs/ca_ES/banks.lang
+++ b/htdocs/langs/ca_ES/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=No conciliat
 CustomerInvoicePayment=Cobrament a client
 SupplierInvoicePayment=Pagament al proveïdor
 SubscriptionPayment=Pagament de quota
-WithdrawalPayment=Cobrament de domiciliació
+WithdrawalPayment=Ordre de pagament de dèbit
 SocialContributionPayment=Pagament d'impostos varis
 BankTransfer=Transferència bancària
 BankTransfers=Transferències bancàries
diff --git a/htdocs/langs/ca_ES/cashdesk.lang b/htdocs/langs/ca_ES/cashdesk.lang
index f4c80787b1e..0f4251de48f 100644
--- a/htdocs/langs/ca_ES/cashdesk.lang
+++ b/htdocs/langs/ca_ES/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Nombre de terminals
 TerminalSelect=Selecciona el terminal que vols utilitzar:
 POSTicket=Tiquet TPV
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/ca_ES/mails.lang b/htdocs/langs/ca_ES/mails.lang
index 47d7cc4e1b8..1ec8f7d5687 100644
--- a/htdocs/langs/ca_ES/mails.lang
+++ b/htdocs/langs/ca_ES/mails.lang
@@ -78,9 +78,9 @@ GroupEmails=Correus grupals
 OneEmailPerRecipient=Un correu per destinatari (per defecte, un correu electrònic per registre seleccionat)
 WarningIfYouCheckOneRecipientPerEmail=Advertència, si marqueu aquesta casella, significa que només s'enviarà un correu electrònic per a diversos registres seleccionats, de manera que, si el vostre missatge conté variables de substitució que fan referència a dades d'un registre, no és possible reemplaçar-les.
 ResultOfMailSending=Resultat de l'enviament de correu massiu
-NbSelected=No. seleccionat
-NbIgnored=No. ignorat
-NbSent=No. enviat
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s missatge(s) enviat(s).
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contacte amb filtres de client
diff --git a/htdocs/langs/ca_ES/members.lang b/htdocs/langs/ca_ES/members.lang
index 4827becdaf6..4c1077e8d0f 100644
--- a/htdocs/langs/ca_ES/members.lang
+++ b/htdocs/langs/ca_ES/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=Tria les estadístiques que vols consultar...
 MenuMembersStats=Estadístiques
 LastMemberDate=Data de l'últim soci
 LatestSubscriptionDate=Data de l'última afiliació
-Nature=Caràcter
+MemberNature=Nature of member
 Public=Informació pública
 NewMemberbyWeb=S'ha afegit un nou soci. A l'espera d'aprovació
 NewMemberForm=Formulari d'inscripció
diff --git a/htdocs/langs/ca_ES/products.lang b/htdocs/langs/ca_ES/products.lang
index 4e7a25a4ac1..c16392c2b98 100644
--- a/htdocs/langs/ca_ES/products.lang
+++ b/htdocs/langs/ca_ES/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Preus del proveïdor
 SuppliersPricesOfProductsOrServices=Preus del venedor (de productes o serveis)
 CustomCode=Duana / mercaderia / codi HS
 CountryOrigin=País d'origen
-Nature=Tipus de producte (material / acabat)
+Nature=Nature of produt (material/finished)
 ShortLabel=Etiqueta curta
 Unit=Unitat
 p=u.
diff --git a/htdocs/langs/ca_ES/salaries.lang b/htdocs/langs/ca_ES/salaries.lang
index fb0315b9f84..ed8b1cef464 100644
--- a/htdocs/langs/ca_ES/salaries.lang
+++ b/htdocs/langs/ca_ES/salaries.lang
@@ -5,18 +5,17 @@ SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Compte comptable per defecte per als pagament
 Salary=Sou
 Salaries=Sous
 NewSalaryPayment=Nou pagament de sous
+AddSalaryPayment=Afegeix pagament de sou
 SalaryPayment=Pagament de sous
 SalariesPayments=Pagaments de sous
 ShowSalaryPayment=Veure pagament de sous
 THM=Tarifa per hora mitjana
 TJM=Tarifa diaria mitjana
 CurrentSalary=Salari actual
-THMDescription=Aquest valor es pot utilitzar per calcular el cost del temps consumit per usuaris en un projecte sencer (si el mòdul del projecte està en ús)
+THMDescription=Aquest valor es pot utilitzar per calcular el cost del temps consumit en un projecte introduït pels usuaris si s'utilitza el projecte de mòdul
 TJMDescription=Aquest valor només és informatiu i no s'utilitza en cap càlcul
 LastSalaries=Últims %s pagaments de salari
 AllSalaries=Tots els pagaments de salari
-<<<<<<< HEAD
-SalariesStatistics=Statistiques salaires
-=======
-SalariesStatistics=Estadistiques de salaris
->>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
+SalariesStatistics=Estadístiques de salaris
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/ca_ES/stocks.lang b/htdocs/langs/ca_ES/stocks.lang
index 1eceeeb080c..d173d9f2f6c 100644
--- a/htdocs/langs/ca_ES/stocks.lang
+++ b/htdocs/langs/ca_ES/stocks.lang
@@ -29,6 +29,8 @@ MovementId=ID del moviment
 StockMovementForId=ID de moviment %d
 ListMouvementStockProject=Llista de moviments d'estoc associats al projecte
 StocksArea=Àrea de magatzems
+AllWarehouses=Tots els magatzems
+IncludeAlsoDraftOrders=Inclou també projectes d'ordre
 Location=Lloc
 LocationSummary=Nom curt del lloc
 NumberOfDifferentProducts=Nombre de productes diferents
@@ -44,7 +46,6 @@ TransferStock=Transferència d'estoc
 MassStockTransferShort=Transferència d'estoc massiu
 StockMovement=Moviment d'estoc
 StockMovements=Moviments d'estoc
-LabelMovement=Etiqueta del moviment
 NumberOfUnit=Nombre de peces
 UnitPurchaseValue=Preu de compra unitari
 StockTooLow=Estoc insuficient
@@ -54,21 +55,23 @@ PMPValue=Valor (PMP)
 PMPValueShort=PMP
 EnhancedValueOfWarehouses=Valor d'estocs
 UserWarehouseAutoCreate=Crea un usuari de magatzem automàticament quan es crea un usuari
-AllowAddLimitStockByWarehouse=Permet afegir estoc límit i desitjat per parella (producte, magatzem) en lloc de únicament per producte
-IndependantSubProductStock=Estoc del producte i estoc del subproducte són independents
+AllowAddLimitStockByWarehouse=Gestioneu també valors per a existències d'estoc mínimes i desitjades per emparellament (producte-magatzem), a més de valors per producte
+IndependantSubProductStock=L'estoc de productes i subproductes són independents
 QtyDispatched=Quantitat desglossada
 QtyDispatchedShort=Quant. rebuda
 QtyToDispatchShort=Quant. a enviar
 OrderDispatch=Articles rebuts
-RuleForStockManagementDecrease=Regla per la reducció automàtica d'estoc (la reducció manual sempre és possible, excepte si hi ha una regla de reducció automàtica activada)
-RuleForStockManagementIncrease=Regla per l'increment automàtic d'estoc (l'increment manual sempre és possible, excepte si hi ha una regla d'increment automàtica activada)
-DeStockOnBill=Decrementar els estocs físics sobre les factures/abonaments a clients
-DeStockOnValidateOrder=Decrementar els estocs físics sobre les comandes de clients
+RuleForStockManagementDecrease=Tria la regla per reduir l'estoc automàtic (la disminució manual sempre és possible, fins i tot si s'activa una regla de disminució automàtica)
+RuleForStockManagementIncrease=Tria la regla per augmentar l'estoc automàtic (l'augment manual sempre és possible, fins i tot si s'activa una regla d'augment automàtic)
+DeStockOnBill=Disminueix els estocs real en la validació de la factura/abonament de client
+DeStockOnValidateOrder=Disminueix els estocs reals en la validació de comandes de client
 DeStockOnShipment=Disminueix l'estoc real al validar l'enviament
-DeStockOnShipmentOnClosing=Disminueix els estocs reals en tancar l'expedició
-ReStockOnBill=Incrementar els estocs físics sobre les factures/abonaments de proveïdors
-ReStockOnValidateOrder=Augmenta els estocs reals en l'aprovació de les comandes de compra
-ReStockOnDispatchOrder=Augmenta els estocs reals en l'entrega manual als magatzems, després de la recepció dels productes de la comanda proveïdor
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Augmenta els estocs reals en la validació de la factura/abonament del proveïdor
+ReStockOnValidateOrder=Augmenta els estocs reals en l'aprovació de la comanda de compra
+ReStockOnDispatchOrder=Augmenta els estocs reals en l'enviament manual al magatzem, després de rebre els productes de la comanda del proveïdor
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=La comanda encara no està o no té un estat que permeti un desglossament d'estoc.
 StockDiffPhysicTeoric=Motiu de la diferència entre l'estoc físic i virtual
 NoPredefinedProductToDispatch=No hi ha productes predefinits en aquest objecte. Per tant no es pot realitzar un desglossament d'estoc.
@@ -79,9 +82,9 @@ StockLimitDesc=(buit) significa cap advertència. <br> 0 es pot utilitzar per a
 PhysicalStock=Estoc físic
 RealStock=Estoc real
 RealStockDesc=L'estoc físic o real és l'estoc que tens actualment als teus magatzems/emplaçaments interns.
-RealStockWillAutomaticallyWhen=L'estoc real canviarà automàticament d'acord amb aquestes regles (consulteu la configuració del mòdul d'estoc per canviar-ho):
+RealStockWillAutomaticallyWhen=L'estoc real es modificarà d'acord amb aquesta regla (tal com es defineix al mòdul d'accions):
 VirtualStock=Estoc virtual
-VirtualStockDesc=L'estoc virtual és l'estoc que tindràs un cop es tanquin totes les accions obertes pendents que afecten als estocs (recepció de comanda de proveïdor, expedició de comanda de client, ...)
+VirtualStockDesc=L'existència virtual és l'estoc calculat disponible quan es tanquen totes les accions obertes / pendents (que afecten les accions) que es reben (les ordres de compra rebudes, les comandes de venda enviades, etc.)
 IdWarehouse=Id. magatzem
 DescWareHouse=Descripció magatzem
 LieuWareHouse=Localització magatzem
@@ -101,7 +104,7 @@ ThisWarehouseIsPersonalStock=Aquest magatzem representa l'estoc personal de %s %
 SelectWarehouseForStockDecrease=Tria el magatzem a utilitzar en el decrement d'estoc
 SelectWarehouseForStockIncrease=Tria el magatzem a utilitzar en l'increment d'estoc
 NoStockAction=Sense accions sobre l'estoc
-DesiredStock=Estoc òptim desitjat
+DesiredStock=Estoc desitjat
 DesiredStockDesc=Aquest import d'estoc serà el valor utilitzat per omplir l'estoc en la funció de reaprovisionament.
 StockToBuy=A demanar
 Replenishment=Reaprovisionament
@@ -114,13 +117,13 @@ CurentSelectionMode=Mode de sel·leció actual
 CurentlyUsingVirtualStock=Estoc virtual
 CurentlyUsingPhysicalStock=Estoc físic
 RuleForStockReplenishment=Regla pels reaprovisionaments d'estoc
-SelectProductWithNotNullQty=Seleccioni almenys un producte amb la quantitat diferent de 0 i un proveïdor
+SelectProductWithNotNullQty=Seleccioneu com a mínim un producte amb un valor no nul i un proveïdor
 AlertOnly= Només alertes
 WarehouseForStockDecrease=Per la disminució d'estoc s'utilitzara el magatzem <b>%s</b>
 WarehouseForStockIncrease=Pe l'increment d'estoc s'utilitzara el magatzem <b>%s</b>
 ForThisWarehouse=Per aquest magatzem
-ReplenishmentStatusDesc=Aquest és un llistat de tots els productes amb un estoc inferior a l'estoc desitjat (o inferior al valor d'alerta si la casella de verificació "només alerta" està marcat). Utilitzant la casella de verificació, pots crear comandes de proveïdors per corregir la diferència.
-ReplenishmentOrdersDesc=Aquest és un llistat de totes les comandes de proveïdor obertes que inclouen productes predefinits. Només comandes obertes amb productes predefinits, per tant, es mostren comandes que poden afectar als estocs.
+ReplenishmentStatusDesc=Es tracta d'una llista de tots els productes amb una borsa menor que l'estoc desitjat (o inferior al valor d'alerta si la casella de verificació "només alerta" està marcada). Amb la casella de verificació, podeu crear comandes de compra per omplir la diferència.
+ReplenishmentOrdersDesc=Aquesta és una llista de totes les comandes de compra oberta incloent productes predefinits. Només s'obren ordres amb productes predefinits, de manera que les comandes que poden afectar les existències, són visibles aquí.
 Replenishments=reaprovisionament
 NbOfProductBeforePeriod=Quantitat del producte %s en estoc abans del periode seleccionat (< %s)
 NbOfProductAfterPeriod=Quantitat del producte %s en estoc despres del periode seleccionat (> %s)
@@ -130,10 +133,11 @@ RecordMovement=Registre de transferència
 ReceivingForSameOrder=Recepcions d'aquesta comanda
 StockMovementRecorded=Moviments d'estoc registrat
 RuleForStockAvailability=Regles de requeriment d'estoc
-StockMustBeEnoughForInvoice=El nivell d'existències ha de ser suficient per afegir productes/serveis a factures (la comprovació es fa quan s'afegeix una línia a la factura en el cas de regles automàtiques de canvis d'estoc)
-StockMustBeEnoughForOrder=El nivell d'existències ha de ser suficient per afegir productes/serveis a comandes (la comprovació es fa quan s'afegeix una línia a la comanda en el cas de regles automàtiques de canvis d'estoc)
-StockMustBeEnoughForShipment= El nivell d'existències ha de ser suficient per afegir productes/serveis a enviaments (la comprovació es fa quan s'afegeix una línia a l'enviament en el cas de regles automàtiques de canvis d'estoc)
+StockMustBeEnoughForInvoice=El nivell d'estoc ha de ser suficient per afegir el producte/servei a la factura (la comprovació es fa sobre l'estoc real actual quan s'afegeix una línia a la factura sigui quina sigui la regla del canvi automàtic d'estoc)
+StockMustBeEnoughForOrder=El nivell d'estoc ha de ser suficient per afegir el producte/servei a la comanda (la comprovació es fa sobre l'estoc real actual quan s'afegeix una línia a la comanda sigui quina sigui la regla del canvi automàtic d'estoc)
+StockMustBeEnoughForShipment= El nivell d'estoc ha de ser suficient per afegir el producte/servei a l'enviament (la comprovació es fa sobre l'estoc real actual quan s'afegeix una línia a l'enviament sigui quina sigui la regla del canvi automàtic d'estoc)
 MovementLabel=Etiqueta del moviment
+TypeMovement=Tipus de moviment
 DateMovement=Data de moviment
 InventoryCode=Moviments o codi d'inventari
 IsInPackage=Contingut en producte compost
@@ -143,11 +147,11 @@ ShowWarehouse=Mostrar magatzem
 MovementCorrectStock=Ajustament d'estoc del producte %s
 MovementTransferStock=Transferència d'estoc de producte %s a un altre magatzem
 InventoryCodeShort=Codi Inv./Mov.
-NoPendingReceptionOnSupplierOrder=No hi ha recepcions pendents en comandes de proveïdor obertes
+NoPendingReceptionOnSupplierOrder=No hi ha cap recepció pendent deguda a l'ordre de compra obert
 ThisSerialAlreadyExistWithDifferentDate=Aquest número de lot/serie (<strong%s</strong>) ja existeix, però amb una data de caducitat o venda diferent (trobat <strong>%s</strong> però ha introduït <strong>%s</strong>).
 OpenAll=Actiu per a totes les accions
 OpenInternal=Actiu sols per accions internes
-UseDispatchStatus=Utilitza l'estat de despatx (aprovat/refusat) per línies de producte a la recepció de la comanda de proveïdor
+UseDispatchStatus=Utilitzeu un estat d'enviament (aprovació / rebuig) per a les línies de productes en la recepció de l'ordre de compra
 OptionMULTIPRICESIsOn=L'opció "diversos preus per segment" està actiu. Això significa que un producte té diversos preus de venda, per tant el preu de venda no pot ser calculat
 ProductStockWarehouseCreated=Estoc límit per llançar una alerta i estoc òptim desitjat creats correctament
 ProductStockWarehouseUpdated=Estoc límit per llançar una alerta i estoc òptim desitjat actualitzats correctament
@@ -172,13 +176,13 @@ inventoryDraft=En servei
 inventorySelectWarehouse=Selecciona magatzem
 inventoryConfirmCreate=Crear
 inventoryOfWarehouse=Inventari de magatzem: %s
-inventoryErrorQtyAdd=Error: una quantitat és menor que zero
+inventoryErrorQtyAdd=Error: una quantitat és inferior a zero
 inventoryMvtStock=Per inventari
 inventoryWarningProductAlreadyExists=Aquest producte ja està en llista
 SelectCategory=Filtre per categoria
-SelectFournisseur=Filtre de proveïdor
+SelectFournisseur=Categoria del proveïdor
 inventoryOnDate=Inventari
-INVENTORY_DISABLE_VIRTUAL=Permet no canviar l'estoc del producte fill d'un kit a l'inventari
+INVENTORY_DISABLE_VIRTUAL=Producte virtual (kit): no disminueixi l'estoc d'un producte secundari
 INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Utilitza el preu de compra si no es pot trobar l'últim preu de compra
 INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=El moviment d'estoc té data d'inventari
 inventoryChangePMPPermission=Permet canviar el valor PMP d'un producte
@@ -195,12 +199,16 @@ AddInventoryProduct=Afegeix producte a l'inventari
 AddProduct=Afegir
 ApplyPMP=Aplica el PMP
 FlushInventory=Alinea l'inventari
-ConfirmFlushInventory=Confirmes aquesta acció?
+ConfirmFlushInventory=Vols confirmar aquesta acció?
 InventoryFlushed=Inventari alineat
 ExitEditMode=Surt de l'edició
 inventoryDeleteLine=Elimina la línia
 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"
+StockSupportServices=La gestió d'estoc admet els serveis
+StockSupportServicesDesc=De manera predeterminada, només podeu emmagatzemar productes de tipus "producte". També podeu emmagatzemar un producte de tipus "servei" si tant el mòdul Serveis com aquesta opció estan habilitats.
 ReceiveProducts=Rebre articles
+StockIncreaseAfterCorrectTransfer=Incrementa per correcció/traspàs
+StockDecreaseAfterCorrectTransfer=Disminueix per correcció/traspàs
+StockIncrease=Augment d'estoc
+StockDecrease=Disminució d'estoc
diff --git a/htdocs/langs/ca_ES/website.lang b/htdocs/langs/ca_ES/website.lang
index 6606aa40a41..ff4dd50fd8d 100644
--- a/htdocs/langs/ca_ES/website.lang
+++ b/htdocs/langs/ca_ES/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=No teniu permís per afegir o editar contingut din
 ReplaceWebsiteContent=Substituïu el contingut del lloc web
 DeleteAlsoJs=Voleu suprimir també tots els fitxers javascript específics d'aquest lloc web?
 DeleteAlsoMedias=Voleu suprimir també tots els fitxers de mitjans específics d’aquest lloc web?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/ca_ES/withdrawals.lang b/htdocs/langs/ca_ES/withdrawals.lang
index 77c67a26dbb..8149a6968ba 100644
--- a/htdocs/langs/ca_ES/withdrawals.lang
+++ b/htdocs/langs/ca_ES/withdrawals.lang
@@ -18,14 +18,14 @@ InvoiceWaitingWithdraw=Factura esperant per domiciliació bancària
 AmountToWithdraw=Import a domiciliar
 WithdrawsRefused=Domiciliació bancària refusada
 NoInvoiceToWithdraw=No hi ha cap factura del client amb "Sol·licituds de domiciliació" obertes. Ves a la pestanya '%s' a la fitxa de la factura per fer una sol·licitud.
-ResponsibleUser=Usuari responsable de les domiciliacions
+ResponsibleUser=Usuari responsable
 WithdrawalsSetup=Configuració del pagament mitjançant domiciliació bancària
 WithdrawStatistics=Estadístiques del pagament mitjançant domiciliació bancària
 WithdrawRejectStatistics=Configuració del rebutj de pagament per domiciliació bancària
 LastWithdrawalReceipt=Últims %s rebuts domiciliats
 MakeWithdrawRequest=Fer una petició de pagament per domiciliació bancària
 WithdrawRequestsDone=%s domiciliacions registrades
-ThirdPartyBankCode=Codi banc del tercer
+ThirdPartyBankCode=Codi bancari de tercers
 NoInvoiceCouldBeWithdrawed=Cap factura s'ha carregat amb èxit. Comproveu que els tercers de les factures tenen un IBAN vàlid i que IBAN té un RUM (Referència de mandat exclusiva) amb mode <strong>%s</strong>.
 ClassCredited=Classificar com "Abonada"
 ClassCreditedConfirm=Esteu segur de voler classificar aquesta domiciliació com abonada al seu compte bancari?
@@ -50,7 +50,7 @@ StatusMotif0=No especificat
 StatusMotif1=Provisió insuficient
 StatusMotif2=Ordre del client
 StatusMotif3=No pagament per domiciliació bancària
-StatusMotif4=Compte bloquejat
+StatusMotif4=Comanda de vendes
 StatusMotif5=Compte inexistent
 StatusMotif6=Compte sense saldo
 StatusMotif7=Decisió judicial
@@ -66,11 +66,11 @@ NotifyCredit=Abonament de domiciliació
 NumeroNationalEmetter=Número Nacional del Emissor
 WithBankUsingRIB=Per als comptes bancaris que utilitzen CCC
 WithBankUsingBANBIC=Per als comptes bancaris que utilitzen el codi BAN/BIC/SWIFT
-BankToReceiveWithdraw=Compte bancari preparat per a rebre domiciliacions bancàries
+BankToReceiveWithdraw=Recepció del compte bancari
 CreditDate=Abonada el
 WithdrawalFileNotCapable=No és possible generar el fitxer bancari de domiciliació pel país %s (El país no esta suportat)
-ShowWithdraw=Veure domiciliació
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=No obstant això, si la factura té pendent algun pagament per domiciliació, no serà tancada per a permetre la gestió de la domiciliació.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=Aquesta llengüeta et permet fer una petició de pagament per domiciliació bancària. Un cop feta, aneu al menú Bancs -> Domiciliacions bancàries per a gestionar el pagament per domiciliació. Quan el pagament és tancat, el pagament sobre la factura serà automàticament gravat, i la factura tancada si el pendent a pagar re-calculat resulta cero.
 WithdrawalFile=Arxiu de la domiciliació
 SetToStatusSent=Classificar com "Arxiu enviat"
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=Això també registrarà els pagaments a les fac
 StatisticsByLineStatus=Estadístiques per estats de línies
 RUM=UMR
 RUMLong=Referència de mandat única (UMR)
-RUMWillBeGenerated=Si està buit, el número UMR es generarà una vegada que es guardi la informació del compte bancari
+RUMWillBeGenerated=Si està buit, es generarà una UMR (Referència de mandat únic) una vegada que es guardi la informació del compte bancari.
 WithdrawMode=Modo de domiciliació bancària (FRST o RECUR)
 WithdrawRequestAmount=Import de la domiciliació
 WithdrawRequestErrorNilAmount=No és possible crear una domiciliació sense import
@@ -102,6 +102,10 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Data d'execució
 CreateForSepa=Crea un fitxer de domiciliació bancària
+ICS=Identificador de creditor CI
+END_TO_END=Etiqueta XML "EndToEndId" de SEPA - Id. Única assignada per transacció
+USTRD=Etiqueta XML de la SEPA "no estructurada"
+ADDDAYS=Afegiu dies a la data d'execució
 
 ### Notifications
 InfoCreditSubject=Pagament de rebuts domiciliats %s pel banc
diff --git a/htdocs/langs/cs_CZ/accountancy.lang b/htdocs/langs/cs_CZ/accountancy.lang
index 776bc0b8511..0612da6048c 100644
--- a/htdocs/langs/cs_CZ/accountancy.lang
+++ b/htdocs/langs/cs_CZ/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Zde naleznete seznam zákazníků a prodejců subjektů a j
 ListAccounts=Seznam účetních účtů
 UnknownAccountForThirdparty=Neznámý účet subjektu. Použijeme %s
 UnknownAccountForThirdpartyBlocking=Neznámý účet subjektu. Chyba blokování
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Účet subjektu není definován nebo neznámý subjekt. Chyba blokování.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Účet subjektu není definován nebo neznámý subjekt. Chyba blokování.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Neznámý účet subjektu a účet čekání není definován. Chyba blokování
 PaymentsNotLinkedToProduct=Platba není spojena s žádným produktem / službou
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Export pro Cogilog
 Modelcsv_agiris=Export pro Agiris
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV konfigurovatelný
-Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Schéma Id účtů
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Bez platného zvláštním účtu
 WithValidAccount=S platným zvláštním účtu
 ValueNotIntoChartOfAccount=Tato hodnota účetního účtu neexistuje v účtu
 AccountRemovedFromGroup=Účet byl odstraněn ze skupiny
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Řada účetních účtu
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Řádky, které ještě nejsou vázány, použijte na
 
 ## Import
 ImportAccountingEntries=Účetní zápisy
-
+DateExport=Date export
 WarningReportNotReliable=Upozornění: Tento přehled není založen na záznamníku, takže neobsahuje transakci upravenou ručně v Knihovně. Je-li vaše deník aktuální, zobrazení účetnictví je přesnější.
 ExpenseReportJournal=Účet výkazů výdajů
 InventoryJournal=Inventářový věstník
diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang
index 01508debb80..6bb62b09319 100644
--- a/htdocs/langs/cs_CZ/admin.lang
+++ b/htdocs/langs/cs_CZ/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=Tato oblast poskytuje uživatelských funkcí. Pomocí nabí
 Purge=Očistit
 PurgeAreaDesc=Tato stránka umožňuje odstranit všechny soubory generované nebo uložené v Dolibarr (dočasné soubory nebo všechny soubory v adresáři <b> %s </b>). Použití této funkce není obvykle nutné. Je poskytována jako řešení pro uživatele, jejichž Dolibarr hostuje poskytovatel, který nenabízí oprávnění k odstranění souborů generovaných webovým serverem.
 PurgeDeleteLogFile=Odstranit soubory protokolu, včetně <b> %s </b> definované pro modul Syslog (bez rizika ztráty dat)
-PurgeDeleteTemporaryFiles=Smazat všechny dočasné soubory (bez rizika ztráty dat)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Odstranit dočasné soubory
 PurgeDeleteAllFilesInDocumentsDir=Odstranit všechny soubory v adresáři: <b> %s </b>. <br> Tímto odstraníte všechny generované dokumenty související s prvky (subjekty, faktury atd.), Soubory nahrané do modulu ECM, zálohování databází a dočasné soubory.
 PurgeRunNow=Vyčistit nyní
@@ -804,6 +804,7 @@ Permission401=Přečtěte slevy
 Permission402=Vytvořit / upravit slevy
 Permission403=Ověřit slevy
 Permission404=Odstranit slevy
+Permission430=Use Debug Bar
 Permission511=Přečtěte si platy
 Permission512=Vytvořte / upravte platby platů
 Permission514=Smazat platy
@@ -818,6 +819,9 @@ Permission532=Vytvořit / upravit služby
 Permission534=Odstranit služby
 Permission536=Viz / správa skryté služby
 Permission538=Export služeb
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Přečtěte si dary
 Permission702=Vytvořit / upravit dary
 Permission703=Odstranit dary
@@ -837,6 +841,12 @@ Permission1101=Přečtěte si dodací
 Permission1102=Vytvořit / upravit dodací
 Permission1104=Potvrzení doručení objednávky
 Permission1109=Odstranit dodací
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Přečtěte si dodavatele
 Permission1182=Přečtěte si objednávky
 Permission1183=Vytvořte / upravte objednávky
@@ -859,16 +869,6 @@ Permission1251=Spustit Hmotné dovozy externích dat do databáze (načítání
 Permission1321=Export zákazníků faktury, atributy a platby
 Permission1322=Znovu otevřít placené účet
 Permission1421=Exportní zakázky a atributy prodeje
-Permission20001=Přečtěte si žádosti o dovolenou (vaše dovolená a vaše podřízené)
-Permission20002=Vytvořte / upravte své žádosti o dovolenou (vaše dovolená a vaše podřízené)
-Permission20003=Smazat žádosti o dovolenou
-Permission20004=Přečtěte si všechny požadavky na dovolenou (i u uživatelů, kteří nejsou podřízeni)
-Permission20005=Vytvářet / upravovat požadavky na dovolenou pro všechny (i pro uživatele, kteří nejsou podřízeni)
-Permission20006=Žádosti admin opuštěné požadavky (setup a aktualizovat bilance)
-Permission23001=Čtení naplánovaných úloh
-Permission23002=Vytvoření/aktualizace naplánované úlohy
-Permission23003=Smazat naplánovanou úlohu
-Permission23004=Provést naplánovanou úlohu
 Permission2401=Přečtěte akce (události nebo úkoly) které souvisí s jeho účet
 Permission2402=Vytvořit / upravit akce (události nebo úkoly) které souvisí s jeho účet
 Permission2403=Odstranit akce (události nebo úkoly) které souvisí s jeho účet
@@ -882,9 +882,41 @@ Permission2503=Vložte nebo odstraňovat dokumenty
 Permission2515=Nastavení adresáře dokumenty
 Permission2801=Pomocí FTP klienta v režimu čtení (prohlížet a stahovat pouze)
 Permission2802=Pomocí FTP klienta v režimu zápisu (odstranit nebo vkládat)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Přečtěte si žádosti o dovolenou (vaše dovolená a vaše podřízené)
+Permission20002=Vytvořte / upravte své žádosti o dovolenou (vaše dovolená a vaše podřízené)
+Permission20003=Smazat žádosti o dovolenou
+Permission20004=Přečtěte si všechny požadavky na dovolenou (i u uživatelů, kteří nejsou podřízeni)
+Permission20005=Vytvářet / upravovat požadavky na dovolenou pro všechny (i pro uživatele, kteří nejsou podřízeni)
+Permission20006=Žádosti admin opuštěné požadavky (setup a aktualizovat bilance)
+Permission23001=Čtení naplánovaných úloh
+Permission23002=Vytvoření/aktualizace naplánované úlohy
+Permission23003=Smazat naplánovanou úlohu
+Permission23004=Provést naplánovanou úlohu
 Permission50101=Použijte prodejní místo
 Permission50201=Přečtěte transakce
 Permission50202=Importní operace
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Vytisknout
 Permission55001=Přečtěte si průzkumy
 Permission55002=Vytvořit/upravit ankety
@@ -1078,7 +1110,7 @@ AreaForAdminOnly=Parametry nastavení mohou být nastaveny pouze <b>uživateli a
 SystemInfoDesc=Systémové informace jsou různé technické informace, které získáte pouze v režimu pro čtení a viditelné pouze pro správce.
 SystemAreaForAdminOnly=Tato oblast je k dispozici pouze uživatelům správce. Uživatelské oprávnění Dolibarr nemůže toto omezení měnit.
 CompanyFundationDesc=Upravte informace společnosti / subjektu. Klikněte na tlačítko "%s" nebo "%s" v dolní části stránky.
-AccountantDesc=Upravte údaje svého účetního / účetního
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parametry ovlivňující vzhled a chování nástroje Dolibarr lze zde změnit.
 AvailableModules=Dostupné aplikace / moduly
@@ -1891,3 +1923,5 @@ IFTTTDesc=Tento modul je určen pro spouštění událostí na IFTTT a / nebo pr
 UrlForIFTTT=URL koncový bod pro IFTTT
 YouWillFindItOnYourIFTTTAccount=Najdete ho na svém účtu IFTTT
 EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/cs_CZ/banks.lang b/htdocs/langs/cs_CZ/banks.lang
index 42ea29d40bf..1515e2abee5 100644
--- a/htdocs/langs/cs_CZ/banks.lang
+++ b/htdocs/langs/cs_CZ/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=Nesladěno
 CustomerInvoicePayment=Zákaznická platba
 SupplierInvoicePayment=Dodavatelská platba
 SubscriptionPayment=Platba předplatného
-WithdrawalPayment=Výběr platby
+WithdrawalPayment=Debetní platební příkaz
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bankovní převod
 BankTransfers=Bankovní převody
diff --git a/htdocs/langs/cs_CZ/cashdesk.lang b/htdocs/langs/cs_CZ/cashdesk.lang
index 06438883dac..ff93f2d6563 100644
--- a/htdocs/langs/cs_CZ/cashdesk.lang
+++ b/htdocs/langs/cs_CZ/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminál
 NumberOfTerminals=Počet terminálů
 TerminalSelect=Vyberte terminál, který chcete použít:
 POSTicket=POS Ticket
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/cs_CZ/mails.lang b/htdocs/langs/cs_CZ/mails.lang
index 9321d8f66b0..b98921f4106 100644
--- a/htdocs/langs/cs_CZ/mails.lang
+++ b/htdocs/langs/cs_CZ/mails.lang
@@ -78,9 +78,9 @@ GroupEmails=Skupinové e-maily
 OneEmailPerRecipient=Jeden e-mail na jednoho příjemce (ve výchozím nastavení je vybrán jeden e-mail na záznam)
 WarningIfYouCheckOneRecipientPerEmail=Upozorňujeme, že pokud zaškrtnete toto políčko, znamená to, že bude odesláno pouze jeden e-mail pro několik vybraných záznamů, takže pokud vaše zpráva obsahuje substituční proměnné, které odkazují na data záznamu, nebude možné je nahradit.
 ResultOfMailSending=Výsledek masového odesílání e-mailu
-NbSelected=Počet vybraných
-NbIgnored=Ne. Ignorováno
-NbSent=nb odesláno
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s odeslaná zpráva(y).
 ConfirmUnvalidateEmailing=Opravdu chcete změnit e-mail <b> %s </b>pro návrh stavu?
 MailingModuleDescContactsWithThirdpartyFilter=Kontakt s filtry zákazníků
diff --git a/htdocs/langs/cs_CZ/members.lang b/htdocs/langs/cs_CZ/members.lang
index 2ffb379f7c9..9f7af348b54 100644
--- a/htdocs/langs/cs_CZ/members.lang
+++ b/htdocs/langs/cs_CZ/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=Zvolte statistik, které chcete číst ...
 MenuMembersStats=Statistika
 LastMemberDate=Nejnovější datum člena
 LatestSubscriptionDate=Poslední datum přihlášení
-Nature=Příroda
+MemberNature=Nature of member
 Public=Informace jsou veřejné
 NewMemberbyWeb=Nový uživatel přidán. Čeká na schválení
 NewMemberForm=Nový formulář člena
diff --git a/htdocs/langs/cs_CZ/products.lang b/htdocs/langs/cs_CZ/products.lang
index 4f4de2bb874..c5e9bdbb5ec 100644
--- a/htdocs/langs/cs_CZ/products.lang
+++ b/htdocs/langs/cs_CZ/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Ceny prodejců
 SuppliersPricesOfProductsOrServices=Ceny prodejců (produktů nebo služeb)
 CustomCode=Kód cla / komodity / HS
 CountryOrigin=Země původu
-Nature=Typ produktu (materiál / hotový)
+Nature=Nature of produt (material/finished)
 ShortLabel=Krátký štítek
 Unit=Jednotka
 p=u.
diff --git a/htdocs/langs/cs_CZ/salaries.lang b/htdocs/langs/cs_CZ/salaries.lang
index ee4ea89b641..c6518613796 100644
--- a/htdocs/langs/cs_CZ/salaries.lang
+++ b/htdocs/langs/cs_CZ/salaries.lang
@@ -1,18 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger 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=Účtovací účet používaný pro třetí strany
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Účelový účet určený na uživatelské kartě bude použit pouze pro účetnictví společnosti Subledger. Ten bude použit pro hlavní knihu a jako výchozí hodnota účtování společnosti Subledger, pokud není určen uživatelský účtovací účet pro uživatele.
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Účtovací účet je výchozí pro mzdové platby
 Salary=Mzda
 Salaries=Mzdy
 NewSalaryPayment=Nová platba mzdy
+AddSalaryPayment=Přidat platbu
 SalaryPayment=Platba mzdy
 SalariesPayments=Platby mezd
 ShowSalaryPayment=Ukázat platbu mzdy
 THM=Průměrná hodinová sazba
 TJM=Průměrná denní sazba
 CurrentSalary=Současná mzda
-THMDescription=Tato hodnota může být použita pro výpočet nákladů času spotřebovaného na projektu zadaného uživatele, pokud je použit modul projektu
-TJMDescription=Tato hodnota je v současné době pouze jako informace a nebyla využita k výpočtu
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
-SalariesStatistics=Statistiques salaires
+THMDescription=Tato hodnota může být použita pro výpočet nákladů na čas strávený na projektu zadaný uživateli, pokud je použit modul projektu
+TJMDescription=Tato hodnota je momentálně pouze informativní a nepoužívá se pro výpočet
+LastSalaries=Posledních %s plateb
+AllSalaries=Všechny mzdové platby
+SalariesStatistics=Statistika platů
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/cs_CZ/stocks.lang b/htdocs/langs/cs_CZ/stocks.lang
index 00318bab9a9..8ec2b49ab05 100644
--- a/htdocs/langs/cs_CZ/stocks.lang
+++ b/htdocs/langs/cs_CZ/stocks.lang
@@ -1,16 +1,16 @@
 # Dolibarr language file - Source file is en_US - stocks
 WarehouseCard=Karta skladiště
-Warehouse=Skladiště
-Warehouses=Skladiště
-ParentWarehouse=Parent sklad
-NewWarehouse=Nové skladiště/skladová oblast
-WarehouseEdit=Upravit skladiště
-MenuNewWarehouse=Nové skladiště
+Warehouse=Sklad
+Warehouses=Sklady
+ParentWarehouse=Nadřazený sklad
+NewWarehouse=Nový sklad / umístění skladu
+WarehouseEdit=Upravit sklad
+MenuNewWarehouse=Nový sklad
 WarehouseSource=Zdrojový sklad
 WarehouseSourceNotDefined=Není definován žádné skladiště
-AddWarehouse=Create warehouse
+AddWarehouse=Vytvořte sklad
 AddOne=Přidat jedno
-DefaultWarehouse=Default warehouse
+DefaultWarehouse=Výchozí sklad
 WarehouseTarget=Cílový sklad
 ValidateSending=Smazat odeslání
 CancelSending=Zrušit zasílání
@@ -18,17 +18,19 @@ DeleteSending=Smazat odeslání
 Stock=Sklad
 Stocks=Sklady
 StocksByLotSerial=Sklad množství/série
-LotSerial=Lots/Serials
-LotSerialList=List of lot/serials
+LotSerial=Loty / seriály
+LotSerialList=Seznam partitur / seriálů
 Movements=Pohyby
 ErrorWarehouseRefRequired=Referenční jméno skladiště je povinné
 ListOfWarehouses=Seznam skladišť
-ListOfStockMovements=Seznam skladových pohybů
-ListOfInventories=List of inventories
-MovementId=Movement ID
+ListOfStockMovements=Přehled skladových pohybů
+ListOfInventories=Seznam zásob
+MovementId=ID pohybu
 StockMovementForId=Hnutí ID %d
 ListMouvementStockProject=Seznam pohybů zásob spojené s projektem
-StocksArea=Oblast skladišť
+StocksArea=Sklady prostor
+AllWarehouses=Všechny sklady
+IncludeAlsoDraftOrders=Zahrnout také návrhy objednávek
 Location=Umístění
 LocationSummary=Krátký název umístění
 NumberOfDifferentProducts=Počet různých výrobků
@@ -37,51 +39,52 @@ LastMovement=poslední pohyb
 LastMovements=Poslední pohyby
 Units=Jednotky
 Unit=Jednotka
-StockCorrection=Stock correction
+StockCorrection=Korekce zásob
 CorrectStock=Správný sklad
 StockTransfer=Přenos zásob
 TransferStock=Přenos zásob
-MassStockTransferShort=Přenos hmoty stock
-StockMovement=Skladování
-StockMovements=pohybů zásob
-LabelMovement=Štítek pohybu
+MassStockTransferShort=Hromadný přenos zásob
+StockMovement=Pohyb zásob
+StockMovements=Pohyby zásob
 NumberOfUnit=Počet jednotek
 UnitPurchaseValue=Jednotková kupní cena
 StockTooLow=Stav skladu je nízký
-StockLowerThanLimit=Stock lower than alert limit (%s)
+StockLowerThanLimit=Sklad nižší než výstražný limit (%s)
 EnhancedValue=Hodnota
 PMPValue=Vážená průměrná cena
 PMPValueShort=WAP
-EnhancedValueOfWarehouses=Hodnota skladišť
-UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Umožňují přidat hranice a požadované zboží za pár (výrobek, sklad) namísto na produkt
-IndependantSubProductStock=Sklady produktů a subproduktů jsou nezávislé
+EnhancedValueOfWarehouses=Hodnota skladů
+UserWarehouseAutoCreate=Vytvoření uživatelského skladu automaticky při vytváření uživatele
+AllowAddLimitStockByWarehouse=Spravujte také hodnoty pro minimální a požadované zásoby na párování (produkt-sklad) kromě hodnot na produkt
+IndependantSubProductStock=Produktová skladová zásoba a podprojekt jsou nezávislé
 QtyDispatched=Množství odesláno
 QtyDispatchedShort=Odeslané množství
 QtyToDispatchShort=Odesílané množství
-OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Pravidlo pro automatické snížení řízení zásob (manuální pokles je vždy možné, i když je aktivováno automatické pravidlo poklesu)
-RuleForStockManagementIncrease=Pravidlo pro automatické zvýšení řízení zásob (manuální zvýšení je vždy možné, i když je aktivováno automatické zvýšení pravidlo)
-DeStockOnBill=Pokles reálných zásob na zákaznických fakturách/dobropisech validace
-DeStockOnValidateOrder=Pokles reálné zásoby na objednávky zákazníků validace
+OrderDispatch=Položky příjmů
+RuleForStockManagementDecrease=Zvolte pravidlo pro automatické snižování zásob (ruční snížení je vždy možné, i když je aktivováno pravidlo automatického snížení)
+RuleForStockManagementIncrease=Zvolte Pravidlo pro automatické zvýšení zásob (ruční nárůst je vždy možný, i když je aktivováno pravidlo automatického nárůstu)
+DeStockOnBill=Snížení skutečných zásob při validaci zákaznické faktury / dobropisu
+DeStockOnValidateOrder=Snížení skutečných zásob při validaci objednávky prodeje
 DeStockOnShipment=Pokles reálné zásoby na odeslání potvrzení
-DeStockOnShipmentOnClosing=Snížit skutečné zásoby na klasifikaci doprava zavřeno
-ReStockOnBill=Zvýšení reálné zásoby na dodavatele faktur/dobropisů validace
-ReStockOnValidateOrder=Increase real stocks on purchase orders approbation
-ReStockOnDispatchOrder=Zvýšení skutečné zásoby na ručním odesláním do skladu poté, co dodavatel přijetí objednávky zboží
-OrderStatusNotReadyToDispatch=Objednávka ještě není, nebo nastavení statusu, který umožňuje zasílání výrobků na skladě.
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Zvyšte skutečné zásoby při ověření faktury prodejce / dobropisu
+ReStockOnValidateOrder=Zvyšte skutečné zásoby při schválení objednávky
+ReStockOnDispatchOrder=Zvyšte reálné zásoby při manuálním odeslání do skladu, po obdržení objednávky zboží
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
+OrderStatusNotReadyToDispatch=Objednávka ještě nebo nadále nemá status, který umožňuje odesílání produktů ve skladových skladech.
 StockDiffPhysicTeoric=Vysvětlení rozdílu mezi fyzickým a teoretickým skladem
-NoPredefinedProductToDispatch=Žádné předdefinované produkty pro tento objekt. Takže není třeba odesílání na skladě.
+NoPredefinedProductToDispatch=Žádné předdefinované produkty pro tento objekt. Není tedy nutné odeslat zboží na skladě.
 DispatchVerb=Odeslání
 StockLimitShort=Limit pro upozornění
 StockLimit=Skladový limit pro upozornění
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
+StockLimitDesc=(prázdný) znamená žádné varování. <br> 0 lze použít pro varování, jakmile je zásoba prázdná.
 PhysicalStock=Fyzický sklad
 RealStock=Skutečný sklad
-RealStockDesc=Fyzická nebo skutečné populace populace v současné době máte na svých vnitřních skladů / stanovišť.
-RealStockWillAutomaticallyWhen=Skutečný fond se automaticky změní podle tohoto pravidla (viz nastavení stock modul tento stav změnit):
+RealStockDesc=Fyzické / skutečné zásoby jsou zásoby, které jsou v současné době ve skladech.
+RealStockWillAutomaticallyWhen=Reálná aktiva bude upravena podle tohoto pravidla (jak je definováno v modulu Akcie):
 VirtualStock=Virtuální sklad
-VirtualStockDesc=Virtuální fond je fond dostanete jednou všechny otevření nevyřízené akce, které mají vliv na akcie bude uzavřen (dodavatel pořadí přijatých zákaznických objednávek dodáno, ...)
+VirtualStockDesc=Virtuální zásoba je vypočítaná zásoba, jakmile jsou všechny otevřené / čekající akce (které ovlivňují akcie) uzavřeny (přijaté nákupní objednávky, zaslané objednávky atd.)
 IdWarehouse=ID skladu
 DescWareHouse=Popis skladiště
 LieuWareHouse=Lokalizace skladiště
@@ -119,88 +122,93 @@ AlertOnly= Pouze upozornění
 WarehouseForStockDecrease=Skladiště <b>%s</b> budou použity pro snížení skladu
 WarehouseForStockIncrease=Skladiště <b>%s</b> budou použity pro zvýšení stavu zásob
 ForThisWarehouse=Z tohoto skladiště
-ReplenishmentStatusDesc=Toto je seznam všech produktů s nižší než požadovanou zásobou skladem (nebo nižší než hodnota výstrahy, pokud je pole "pouze upozornění" zaškrtnuto), a doporučuje vám vytvořit dodavatelské objednávky pro doplnění rozdílu.
-ReplenishmentOrdersDesc=Toto je seznam všech otevřených dodavatelských objednávek, včetně předem stanovených výrobků. Jen otevřené objednávky s předdefinovanými produkty, které mohou mít vliv na zásoby, jsou zde viditelné.
+ReplenishmentStatusDesc=Toto je seznam všech produktů, jejichž zásoba je nižší než požadovaná zásoba (nebo je nižší než hodnota výstrahy, pokud je zaškrtnuto políčko "pouze výstraha"). Pomocí zaškrtávacího políčka můžete vytvořit objednávky k vyplnění rozdílu.
+ReplenishmentOrdersDesc=Jedná se o seznam všech otevřených objednávek včetně předdefinovaných produktů. Otevřeny jsou pouze objednávky s předdefinovanými produkty, takže objednávky, které mohou ovlivnit zásoby, jsou zde viditelné.
 Replenishments=Splátky
 NbOfProductBeforePeriod=Množství produktů %s na skladě, než zvolené období (< %s)
 NbOfProductAfterPeriod=Množství produktů %s na skladě po zvolené období (> %s)
 MassMovement=Hromadný pohyb
 SelectProductInAndOutWareHouse=Vyberte produkt, množství, zdrojový sklad a cílový sklad, pak klikněte na  "%s". Jakmile se tak stane pro všechny požadované pohyby, klikněte na  "%s".
-RecordMovement=Record transfer
+RecordMovement=Záznam přenosu
 ReceivingForSameOrder=Příjmy pro tuto objednávku
 StockMovementRecorded=Zaznamenány pohyby zásob
 RuleForStockAvailability=Pravidla o požadavcích na skladě
-StockMustBeEnoughForInvoice=Úroveň zásob musí být dostatečně přidat produkt / službu fakturovat (kontrola se provádí na současnou reálnou skladě při přidání řádku do faktury, co je pravidlo pro automatickou změnu populace)
-StockMustBeEnoughForOrder=Úroveň zásob musí být dostatečně přidat produkt / službu na objednávku (kontrola se provádí na současnou reálnou skladě při přidání řádku do pořádku, co je pravidlo pro automatickou změnu populace)
-StockMustBeEnoughForShipment= Úroveň zásob musí být dostatečně přidat výrobek / službu přepravy (kontrola se provádí na současnou reálnou skladě při přidání řádku do zásilky, co je pravidlo pro automatickou změnu populace)
+StockMustBeEnoughForInvoice=Úroveň zásob musí být dostatečná pro přidání produktu / služby k faktuře (kontrola se provádí na aktuálních reálných akcích při přidání řádku do faktury bez ohledu na pravidlo pro automatickou změnu akcií)
+StockMustBeEnoughForOrder=Úroveň zásob musí být dost na to, aby bylo možné přidat produkt / službu na objednávku (kontrola se provádí na aktuálním reálném skladu při přidání řádku do objednávky bez ohledu na pravidlo automatické změny zásob)
+StockMustBeEnoughForShipment= Úroveň zásob musí být dostatečná pro přidání produktu / služby k odeslání (kontrola se provádí na aktuální reálné akci při přidání řádku do zásilky bez ohledu na pravidlo automatické změny zásob)
 MovementLabel=Štítek pohybu
-DateMovement=Date of movement
+TypeMovement=Druh pohybu
+DateMovement=Datum pohybu
 InventoryCode=Kód pohybu nebo zásob
 IsInPackage=Obsažené v zásilce
 WarehouseAllowNegativeTransfer=Sklad může být negativní
-qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse and your setup does not allow negative stocks.
+qtyToTranferIsNotEnough=Nemáte dostatek zásob ze zdrojového skladu a vaše nastavení neumožňuje záporné zásoby.
 ShowWarehouse=Ukázat skladiště
 MovementCorrectStock=Sklad obsahuje korekci pro produkt %s
 MovementTransferStock=Přenos skladových produktů %s do jiného skladiště
 InventoryCodeShort=Inventární/pohybový kód
-NoPendingReceptionOnSupplierOrder=Nečeká na příjem kvůli otevřené dodavatelské objednávce
+NoPendingReceptionOnSupplierOrder=Neexistuje nepřijatý příjem v důsledku otevřené objednávky
 ThisSerialAlreadyExistWithDifferentDate=Toto množství/sériové číslo (<strong>%s</strong>) už ale s odlišnou spotřebou nebo datem prodeje existuje (found <strong>%s</strong> ale zadáte <strong>%s</strong>).
 OpenAll=Otevřený pro všechny akce
 OpenInternal=Otevřít pouze pro vnitřní akce
-UseDispatchStatus=Použijte stav odeslání (schvalovat / odpadu) pro produktových řad Na dodavatel objednávky příjmu
-OptionMULTIPRICESIsOn=Option „několik cen za segmentu“ svítí. To znamená, že výrobek má několik prodejní cenu, takže hodnota k prodeji nelze vypočítat
-ProductStockWarehouseCreated=Sklad limit pro pohotovosti a požadovanou optimální stock vytvořen správně
-ProductStockWarehouseUpdated=Sklad limit pro pohotovosti a požadovanou optimální stock správně aktualizována
-ProductStockWarehouseDeleted=Sklad limit pro pohotovosti a požadovanou optimální stock správně smazána
+UseDispatchStatus=Použijte stav odesílání (schválení / odmítnutí) pro produktové řady při příjmu objednávky
+OptionMULTIPRICESIsOn=Možnost "několik cen za segment" je zapnutá. To znamená, že výrobek má několik prodejních cen, takže hodnota pro prodej nelze vypočítat
+ProductStockWarehouseCreated=Limit zásob pro výstrahu a požadovanou optimální zásobu vytvořenou správně
+ProductStockWarehouseUpdated=Limit zásob pro výstrahu a požadovanou optimální zásobu byl správně aktualizován
+ProductStockWarehouseDeleted=Limit zásob pro výstrahu a požadovanou optimální zásobu jsou správně odstraněny
 AddNewProductStockWarehouse=Nastavit nový limit pro pohotovosti a požadovanou optimální zásoby
-AddStockLocationLine=Snížit množství klepnutím přidat další sklad pro tento produkt
-InventoryDate=Inventory date
-NewInventory=New inventory
-inventorySetup = Inventory Setup
-inventoryCreatePermission=Create new inventory
-inventoryReadPermission=View inventories
-inventoryWritePermission=Update inventories
-inventoryValidatePermission=Validate inventory
-inventoryTitle=Inventory
-inventoryListTitle=Inventories
-inventoryListEmpty=No inventory in progress
-inventoryCreateDelete=Create/Delete inventory
-inventoryCreate=Create new
+AddStockLocationLine=Snižte množství a klikněte na tlačítko Přidat další sklad pro tento produkt
+InventoryDate=Datum inventáře
+NewInventory=Nový inventář
+inventorySetup = Nastavení zásob
+inventoryCreatePermission=Vytvořte nový inventář
+inventoryReadPermission=Zobrazit zásoby
+inventoryWritePermission=Aktualizovat inventáře
+inventoryValidatePermission=Ověřit inventář
+inventoryTitle=Inventář
+inventoryListTitle=Zásoby
+inventoryListEmpty=Neprobíhá inventář
+inventoryCreateDelete=Vytvořit / Smazat inventář
+inventoryCreate=Vytvořit nový
 inventoryEdit=Úprava
 inventoryValidate=Ověřeno
 inventoryDraft=Běží
-inventorySelectWarehouse=Warehouse choice
+inventorySelectWarehouse=Výběr skladu
 inventoryConfirmCreate=Vytvořit
-inventoryOfWarehouse=Inventory for warehouse : %s
-inventoryErrorQtyAdd=Error : one quantity is leaser than zero
-inventoryMvtStock=By inventory
-inventoryWarningProductAlreadyExists=This product is already into list
+inventoryOfWarehouse=Inventář pro skladu: %s
+inventoryErrorQtyAdd=Chyba: jedno množství je menší než nula
+inventoryMvtStock=Podle inventáře
+inventoryWarningProductAlreadyExists=Tento produkt je již v seznamu
 SelectCategory=Filtr kategorie
-SelectFournisseur=Supplier filter
-inventoryOnDate=Inventory
-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
-inventoryChangePMPPermission=Allow to change PMP value for a product
-ColumnNewPMP=New unit PMP
-OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
-LastPA=Last BP
-CurrentPA=Curent BP
-RealQty=Real Qty
-RealValue=Real Value
-RegulatedQty=Regulated Qty
-AddInventoryProduct=Add product to inventory
+SelectFournisseur=Filtr prodejců
+inventoryOnDate=Inventář
+INVENTORY_DISABLE_VIRTUAL=Virtuální produkt (sada): neklesněte zásobu dětského produktu
+INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Použijte kupní cenu, pokud není k dispozici žádná poslední kupní cena
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Pohyb položek má datum inventáře
+inventoryChangePMPPermission=Povolit změnu hodnoty PMP pro produkt
+ColumnNewPMP=Nová jednotka PMP
+OnlyProdsInStock=Nepřidávejte produkt bez zásob
+TheoricalQty=Teoretické množství
+TheoricalValue=Teoretické množství
+LastPA=Poslední BP
+CurrentPA=Aktuální BP
+RealQty=Skutečné množství
+RealValue=Skutečná hodnota
+RegulatedQty=Regulovaný počet
+AddInventoryProduct=Přidejte produkt do inventáře
 AddProduct=Přidat
-ApplyPMP=Apply PMP
-FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action ?
-InventoryFlushed=Inventory flushed
-ExitEditMode=Exit edition
+ApplyPMP=Použijte PMP
+FlushInventory=Vypláchněte inventář
+ConfirmFlushInventory=Potvrdíte tuto akci?
+InventoryFlushed=Inventář byl vyplaven
+ExitEditMode=Ukončete úpravy
 inventoryDeleteLine=Odstranění řádku
-RegulateStock=Regulate Stock
+RegulateStock=Regulace zásob
 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 items
+StockSupportServices=Řízení zásob podporuje služby
+StockSupportServicesDesc=Ve výchozím nastavení můžete skladovat pouze produkty typu "produkt". Můžete také zakoupit produkt typu "služba", pokud jsou povoleny oba modulové služby a tato možnost.
+ReceiveProducts=Přijměte položky
+StockIncreaseAfterCorrectTransfer=Zvyšte korekcí / převodem
+StockDecreaseAfterCorrectTransfer=Snížení o opravu / převod
+StockIncrease=Zvýšení zásob
+StockDecrease=Snížení stavu zásob
diff --git a/htdocs/langs/cs_CZ/website.lang b/htdocs/langs/cs_CZ/website.lang
index b860fd511d6..8c1881021d4 100644
--- a/htdocs/langs/cs_CZ/website.lang
+++ b/htdocs/langs/cs_CZ/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=Nemáte oprávnění přidávat nebo upravovat dyn
 ReplaceWebsiteContent=Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/cs_CZ/withdrawals.lang b/htdocs/langs/cs_CZ/withdrawals.lang
index cb0726c00e9..ba1a151d65d 100644
--- a/htdocs/langs/cs_CZ/withdrawals.lang
+++ b/htdocs/langs/cs_CZ/withdrawals.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Plocha trvalých příkazů zákazníků
-SuppliersStandingOrdersArea=Direct kreditní platební příkazy area
+SuppliersStandingOrdersArea=Prostor přímých kreditních platebních příkazů
 StandingOrdersPayment=Inkasní příkazy k úhradě
-StandingOrderPayment=Platba inkasem platební příkaz
+StandingOrderPayment=Příkaz k inkasu
 NewStandingOrder=Nový příkaz k inkasu
 StandingOrderToProcess=Ve zpracování
 WithdrawalsReceipts=příkazy k inkasu
@@ -10,23 +10,23 @@ WithdrawalReceipt=Trvalý příkaz
 LastWithdrawalReceipts=Poslední %s soubory inkasní
 WithdrawalsLines=Řádky výběrů
 RequestStandingOrderToTreat=Žádost o inkasní platby, abychom mohli zpracovat
-RequestStandingOrderTreated=Žádost o zpracované  trvalé příkazy
+RequestStandingOrderTreated=Žádost o příkaz k inkasu byla zpracována
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Není to možné. Výběrový status musí být nastaven na 'připsání' před prohlášením odmítnutí na konkrétních řádcích.
-NbOfInvoiceToWithdraw=Nb. of qualified invoice with waiting direct debit order
-NbOfInvoiceToWithdrawWithInfo=Nb. zákaznické faktury s inkasní příkazy k úhradě s definovanými údaje o bankovním účtu
+NbOfInvoiceToWithdraw=Počet kvalifikovaných faktur s objednávkou inkasního příkazu
+NbOfInvoiceToWithdrawWithInfo=Počet zákaznických faktur s inkasními platebními příkazy s definovanými informacemi o bankovním účtu
 InvoiceWaitingWithdraw=Faktura čeká na inkaso
 AmountToWithdraw=Částka výběru
 WithdrawsRefused=Přímé inkaso odmítnuto
-NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
+NoInvoiceToWithdraw=Žádná zákaznická faktura s otevřenými "žádostmi o přímé inkaso" čeká. Přejděte na kartu "%s" na kartě faktury, abyste požádali.
 ResponsibleUser=Odpovědný uživatel
-WithdrawalsSetup=setup platba Platba inkasem
-WithdrawStatistics=Statistika platební inkasem
-WithdrawRejectStatistics=Inkasní platba odmítnout statistik
+WithdrawalsSetup=Nastavení platby inkasem
+WithdrawStatistics=Statistiky plateb přímého inkasa
+WithdrawRejectStatistics=Statistiky zamítnutí platby inkasem
 LastWithdrawalReceipt=Poslední %s přímého inkasa debetní
 MakeWithdrawRequest=Vytvořit požadavek výběru
 WithdrawRequestsDone=%s přímé žádosti o debetní platební zaznamenán
-ThirdPartyBankCode=Bankovní kód třetí strany
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
+ThirdPartyBankCode=Kód banky subjektu
+NoInvoiceCouldBeWithdrawed=Žádná faktura nebyla úspěšně odepsána. Zkontrolujte, zda jsou faktury na firmy s platným IBAN a zda má IBAN UMR (jedinečný mandátový odkaz) s režimem <strong> %s </strong>.
 ClassCredited=Označit přidání kreditu
 ClassCreditedConfirm=Jste si jisti, že chcete zařadit tento výběr příjmu jako připsaný na váš bankovní účet?
 TransData=Datum přenosu
@@ -48,16 +48,16 @@ StatusCredited=Připsání
 StatusRefused=Odmítnutí
 StatusMotif0=Nespecifikovaný
 StatusMotif1=Nedostatek finančních prostředků
-StatusMotif2=Žádost o napadení
-StatusMotif3=No platební příkaz k inkasu
-StatusMotif4=Objednávka zákazníka
+StatusMotif2=Žádost zpochybněna
+StatusMotif3=Žádný inkasní příkaz k inkasu
+StatusMotif4=Prodejní objednávka
 StatusMotif5=RIB nepoužitelný
 StatusMotif6=Účet bez rovnováhy
 StatusMotif7=Soudní rozhodnutí
 StatusMotif8=Jiný důvod
-CreateForSepaFRST=Create direct debit file (SEPA FRST)
-CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
-CreateAll=Create direct debit file (all)
+CreateForSepaFRST=Vytvoření souboru s inkasem (SEPA FRST)
+CreateForSepaRCUR=Vytvořte soubor inkasa (SEPA RCUR)
+CreateAll=Vytvořit soubor s inkasem (všechny)
 CreateGuichet=Pouze kancelář
 CreateBanque=Pouze banky
 OrderWaiting=Čekání na léčbu
@@ -66,42 +66,46 @@ NotifyCredit=Výběr kreditu
 NumeroNationalEmetter=Národní převodní číslo
 WithBankUsingRIB=U bankovních účtů pomocí RIB
 WithBankUsingBANBIC=U bankovních účtů pomocí IBAN/BIC/SWIFT
-BankToReceiveWithdraw=Bankovní účet pro příjem inkaso
+BankToReceiveWithdraw=Bankovní účet pro příjem
 CreditDate=Kredit na
 WithdrawalFileNotCapable=Nelze generovat soubor výběru příjmu pro vaši zemi %s (Vaše země není podporována)
-ShowWithdraw=Zobrazit výběr
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Nicméně, pokud faktura má alespoň jednu dosud nezpracovanou platbu z výběru, nebude nastavena jako placená pro povolení řízení výběru.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=Tato karta vám umožňuje požádat o trvalý příkaz. Jakmile to bude hotové,jděte do menu Bankovní údaje-> Výběry pro zřízení trvalého příkazu. Když je trvalý příkazu hotov, platba na faktuře bude automaticky zaznamenána a faktura uzavřena, pokud zbývající částka k placení je nula.
 WithdrawalFile=Soubor výběru
 SetToStatusSent=Nastavte na stav "Odeslaný soubor"
-ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
+ThisWillAlsoAddPaymentOnInvoice=Také budou zaznamenány platby na faktury a budou klasifikovány jako "Placené", pokud zůstane platit, je nulová
 StatisticsByLineStatus=Statistika podle stavu řádků
 RUM=UMR
 RUMLong=Unikátní Mandát Referenční
-RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=Pokud je prázdná, po uložení informací o bankovním účtu se vytvoří UMR (jedinečný mandátový odkaz).
 WithdrawMode=Režim přímé inkaso (FRST nebo opakovat)
 WithdrawRequestAmount=Množství přání inkasa
 WithdrawRequestErrorNilAmount=Nelze vytvořit inkasa Žádost o prázdnou hodnotu.
-SepaMandate=SEPA Direct Debit Mandate
+SepaMandate=Mandát přímého inkasa SEPA
 SepaMandateShort=SEPA Mandát
 PleaseReturnMandate=Prosím, vraťte tento mandát formulář poštou na adresu %s nebo poštou na adresu
 SEPALegalText=Podpisem tohoto mandátu formuláře opravňujete (A) %s zaslat instrukce do své banky, aby vrub vašeho účtu a (b) vaše banka k tíži účtu v souladu s pokyny od %s. Jako součást svých práv, máte nárok na vrácení peněz od banky v souladu s podmínkami a podmínkami vaší smlouvy se svou bankou. Náhrada musí být uplatněna nejpozději do 8 týdnů od data, kdy byl váš účet odepsána. Vaše práva týkající se výše uvedeného pověření jsou vysvětleny v prohlášení, které můžete získat od své banky.
 CreditorIdentifier=věřitel Identifier
-CreditorName=Jméno věřitele
+CreditorName=Název věřitele
 SEPAFillForm=(B) Vyplňte prosím všechna pole označená *
 SEPAFormYourName=Vaše jméno
 SEPAFormYourBAN=Vaše banka Název účtu (IBAN)
 SEPAFormYourBIC=Váš identifikační kód banky (BIC)
 SEPAFrstOrRecur=Způsob platby
-ModeRECUR=Reccurent platba
+ModeRECUR=Opakovaná platba
 ModeFRST=Jednorázová platba
 PleaseCheckOne=Zkontrolujte prosím jen jeden
-DirectDebitOrderCreated=Direct debit order %s created
-AmountRequested=Amount requested
+DirectDebitOrderCreated=Byla vytvořena objednávka inkasa %s
+AmountRequested=Požadovaná částka
 SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
-ExecutionDate=Execution date
-CreateForSepa=Create direct debit file
+ExecutionDate=Datum provedení
+CreateForSepa=Vytvořte soubor s inkasem
+ICS=Identifikátor věřitele CI
+END_TO_END="EndToEndId" SEPA XML tag - jedinečný identifikátor přiřazený ke každé transakci
+USTRD="Nestrukturovaná" značka SEPA XML
+ADDDAYS=Přidání dnů do data provedení
 
 ### Notifications
 InfoCreditSubject=Placení inkasní příkaz k úhradě %s bankou
diff --git a/htdocs/langs/da_DK/accountancy.lang b/htdocs/langs/da_DK/accountancy.lang
index 2ccb65fd407..e11155f691b 100644
--- a/htdocs/langs/da_DK/accountancy.lang
+++ b/htdocs/langs/da_DK/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Consult here the list of third-party customers and vendors
 ListAccounts=Liste over regnskabskonti
 UnknownAccountForThirdparty=Unknown third-party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Betaling er ikke knyttet til noget produkt / tjeneste
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Eksporter CSV Konfigurerbar
-Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=ID for kontoplan
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Uden gyldig tildelt konto
 WithValidAccount=Med gyldig tildelt konto
 ValueNotIntoChartOfAccount=Den angivne regnskabskonto eksisterer ikke i kontoplanen
 AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Interval for regnskabskonto
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Linjer endnu ikke bundet, brug menuen <a href="%s"> %
 
 ## Import
 ImportAccountingEntries=Regnskabsposter
-
+DateExport=Date export
 WarningReportNotReliable=Advarsel, denne rapport er ikke baseret på Ledger, så indeholder ikke transaktion ændret manuelt i Ledger. Hvis din journalisering er opdateret, er bogføringsvisningen mere præcis.
 ExpenseReportJournal=Udgifts Journal
 InventoryJournal=Opgørelse Journal
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index 3447a61c426..37f3564018b 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=Dette område giver administrationsfunktioner. Brug menuen t
 Purge=Ryd
 PurgeAreaDesc=På denne side kan du slette alle filer, der er genereret eller gemt af Dolibarr (midlertidige filer eller alle filer i <b> %s </b> bibliotek). Brug af denne funktion er normalt ikke nødvendig. Den leveres som en løsning for brugere, hvis Dolibarr er vært for en udbyder, der ikke tilbyder tilladelser til at slette filer genereret af webserveren.
 PurgeDeleteLogFile=Slet log-filer, herunder <b>%s</b> oprettet til Syslog-modul (ingen risiko for at miste data)
-PurgeDeleteTemporaryFiles=At slette alle midlertidige filer (ingen risiko for at miste data)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Slet midlertidige filer
 PurgeDeleteAllFilesInDocumentsDir=Slet alle filer i mappen: <b> %s </b>. <br> Dette vil slette alle genererede dokumenter relateret til elementer (tredjeparter, fakturaer osv. ..), filer uploadet til ECM modulet, database backup dumps og midlertidige filer.
 PurgeRunNow=Rensningsanordningen nu
@@ -804,6 +804,7 @@ Permission401=Læs rabatter
 Permission402=Opret/rediger rabatter
 Permission403=Bekræft rabatter
 Permission404=Slet rabatter
+Permission430=Use Debug Bar
 Permission511=Læs lønudbetalinger
 Permission512=Opret / modificer lønudbetalinger
 Permission514=Slet betaling af lønninger
@@ -818,6 +819,9 @@ Permission532=Opret/rediger ydelser
 Permission534=Slet ydelser
 Permission536=Se/administrer skjulte ydelser
 Permission538=Eksport af tjenesteydelser
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Læs donationer
 Permission702=Opret/rediger donationer
 Permission703=Slet donationer
@@ -837,6 +841,12 @@ Permission1101=Læs levering ordrer
 Permission1102=Opret/rediger leveringsordrer
 Permission1104=Bekræft levering ordrer
 Permission1109=Slet levering ordrer
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Læs leverandører
 Permission1182=Læs indkøbsordrer
 Permission1183=Opret / modtag indkøbsordrer
@@ -859,16 +869,6 @@ Permission1251=Kør massen import af eksterne data i databasen (data belastning)
 Permission1321=Eksporter kunde fakturaer, attributter og betalinger
 Permission1322=Genåb en betalt regning
 Permission1421=Eksporter salgsordrer og attributter
-Permission20001=Læs tilladelsesforespørgsler (din orlov og dine underordnede)
-Permission20002=Opret / rediger dine anmodninger om orlov (din ferie og dine underordnede)
-Permission20003=Slet permitteringsforespørgsler
-Permission20004=Læs alle orlovs forespørgsler (selv om bruger ikke er underordnede)
-Permission20005=Opret / modtag anmodninger om orlov for alle (selv af bruger ikke underordnede)
-Permission20006=Forladelsesforespørgsler (opsætning og opdateringsbalance)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
 Permission2401=Læs aktioner (begivenheder eller opgaver) i tilknytning til egen konto
 Permission2402=Opret/rediger handlinger (begivenheder eller opgaver) i tilknytning til egen konto
 Permission2403=Læs aktioner (begivenheder eller opgaver) af andre
@@ -882,9 +882,41 @@ Permission2503=Indsend eller slette dokumenter
 Permission2515=Opsæt dokumentdokumenter
 Permission2801=Brug FTP-klient i læsemodus (kun gennemse og download)
 Permission2802=Brug FTP-klient i skrivefunktion (slet eller upload filer)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Læs tilladelsesforespørgsler (din orlov og dine underordnede)
+Permission20002=Opret / rediger dine anmodninger om orlov (din ferie og dine underordnede)
+Permission20003=Slet permitteringsforespørgsler
+Permission20004=Læs alle orlovs forespørgsler (selv om bruger ikke er underordnede)
+Permission20005=Opret / modtag anmodninger om orlov for alle (selv af bruger ikke underordnede)
+Permission20006=Forladelsesforespørgsler (opsætning og opdateringsbalance)
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission50101=Brug Point of Sale
 Permission50201=Læs transaktioner
 Permission50202=Import transaktioner
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Print
 Permission55001=Læs afstemninger
 Permission55002=Opret / rediger afstemninger
@@ -1078,7 +1110,7 @@ AreaForAdminOnly=Opsætningsparametre kan kun indstilles af <b> administratorbru
 SystemInfoDesc=System oplysninger er diverse tekniske oplysninger du får i read only mode og synlig kun for administratorer.
 SystemAreaForAdminOnly=Dette område er kun tilgængeligt for administratorbrugere. Dolibarr bruger tilladelser kan ikke ændre denne begrænsning.
 CompanyFundationDesc=Rediger virksomhedens / enhedens oplysninger. Klik på "%s" eller "%s" knappen nederst på siden.
-AccountantDesc=Rediger oplysningerne om din revisor / bogholder
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parametre, der påvirker udseende og opførsel af Dolibarr kan ændres her.
 AvailableModules=Tilgængelige app / moduler
@@ -1891,3 +1923,5 @@ IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute s
 UrlForIFTTT=URL endpoint for IFTTT
 YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/da_DK/banks.lang b/htdocs/langs/da_DK/banks.lang
index 8efd1caeb10..f6f39d2064a 100644
--- a/htdocs/langs/da_DK/banks.lang
+++ b/htdocs/langs/da_DK/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=Ikke afstemt
 CustomerInvoicePayment=Kunde betaling
 SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Abonnementsbetaling
-WithdrawalPayment=Tilbagetrækning betaling
+WithdrawalPayment=Debit payment order
 SocialContributionPayment=Social / skattemæssig skat betaling
 BankTransfer=bankoverførsel
 BankTransfers=Bankoverførsler
diff --git a/htdocs/langs/da_DK/cashdesk.lang b/htdocs/langs/da_DK/cashdesk.lang
index 9a662efab42..a1e571c56b9 100644
--- a/htdocs/langs/da_DK/cashdesk.lang
+++ b/htdocs/langs/da_DK/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/da_DK/mails.lang b/htdocs/langs/da_DK/mails.lang
index 49db17c3584..3aea0b5baea 100644
--- a/htdocs/langs/da_DK/mails.lang
+++ b/htdocs/langs/da_DK/mails.lang
@@ -19,6 +19,8 @@ MailTopic=Email topic
 MailText=Besked
 MailFile=Vedhæftede filer
 MailMessage=Email indhold
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
 ShowEMailing=Vis emailing
 ListOfEMailings=Liste over emailings
 NewMailing=Ny emailing
@@ -76,9 +78,9 @@ GroupEmails=Gruppe e-mails
 OneEmailPerRecipient=Én email pr. Modtager (som standard er der valgt en e-mail pr. Post)
 WarningIfYouCheckOneRecipientPerEmail=Advarsel, hvis du markerer denne boks betyder det kun, at en e-mail vil blive sendt til flere forskellige valgte poster, så hvis din besked indeholder substitutionsvariabler, der refererer til data i en post, bliver det ikke muligt at erstatte dem.
 ResultOfMailSending=Result of mass Email sending
-NbSelected=Nej valgt
-NbIgnored=Nej ignoreret
-NbSent=Nej sendt
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s besked (er) sendt.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
diff --git a/htdocs/langs/da_DK/members.lang b/htdocs/langs/da_DK/members.lang
index fd4610abae1..cb26f94a83c 100644
--- a/htdocs/langs/da_DK/members.lang
+++ b/htdocs/langs/da_DK/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=Vælg statistikker, du ønsker at læse ...
 MenuMembersStats=Statistik
 LastMemberDate=Seneste medlem dato
 LatestSubscriptionDate=Latest subscription date
-Nature=Natur
+MemberNature=Nature of member
 Public=Information er offentlige
 NewMemberbyWeb=Nyt medlem tilføjet. Afventer godkendelse
 NewMemberForm=Nyt medlem formular
diff --git a/htdocs/langs/da_DK/products.lang b/htdocs/langs/da_DK/products.lang
index 1b4acfb73a7..1cf45888f60 100644
--- a/htdocs/langs/da_DK/products.lang
+++ b/htdocs/langs/da_DK/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Leverandørpriser
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Told / vare / HS-kode
 CountryOrigin=Oprindelsesland
-Nature=Product Type (material/finished)
+Nature=Nature of produt (material/finished)
 ShortLabel=Kort etiket
 Unit=Enhed
 p=u.
diff --git a/htdocs/langs/da_DK/salaries.lang b/htdocs/langs/da_DK/salaries.lang
index 37a60883839..b9be2c3691c 100644
--- a/htdocs/langs/da_DK/salaries.lang
+++ b/htdocs/langs/da_DK/salaries.lang
@@ -1,18 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Regnskabskonto bruges til tredjepart
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Den dedikerede regnskabskonto, der er defineret på brugerkort, vil kun blive brugt til mellemregnings bogholderi. Denne vil blive brugt til hoved bogholderi og som standardværdi for bogholderi regnskab, hvis dedikeret brugerkonto på bruger ikke er defineret.
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Den dedikerede regnskabskonto, der er defineret på brugerkort, vil kun blive anvendt til underledere. Denne vil blive brugt til General Ledger og som standardværdi for Subledger regnskab, hvis dedikeret brugerregnskabskonto på bruger ikke er defineret.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Regnskabskonto som standard for lønudbetalinger
 Salary=Løn
 Salaries=Løn
 NewSalaryPayment=Ny lønbetaling
+AddSalaryPayment=Tilføj lønbetaling
 SalaryPayment=Løn betaling
 SalariesPayments=Lønudbetalinger
 ShowSalaryPayment=Vis lønbetaling
 THM=Gennemsnitlig timepris
 TJM=Gennemsnitlig dagspris
 CurrentSalary=Nuværende løn
-THMDescription=Denne værdi kan bruges til at beregne kostpris for forbrugt tid på et projekt indtastet af brugere, hvis modulprojekt anvendes
-TJMDescription=Denne værdi er i øjeblikket kun som information og bruges ikke til nogen beregning
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
 LastSalaries=Seneste %s lønbetalinger
 AllSalaries=Alle lønudbetalinger
-SalariesStatistics=Statistiques salaires
+SalariesStatistics=Lønstatistik
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/da_DK/stocks.lang b/htdocs/langs/da_DK/stocks.lang
index c96fcfed4dd..152fff9d276 100644
--- a/htdocs/langs/da_DK/stocks.lang
+++ b/htdocs/langs/da_DK/stocks.lang
@@ -3,34 +3,36 @@ WarehouseCard=Warehouse kortet
 Warehouse=Warehouse
 Warehouses=Lager
 ParentWarehouse=Moderselskab
-NewWarehouse=Nyt oplag / Stock område
+NewWarehouse=New warehouse / Stock Location
 WarehouseEdit=Rediger lager
 MenuNewWarehouse=Ny lagerhal
 WarehouseSource=Kilde lagerhal
 WarehouseSourceNotDefined=Intet lager defineret,
-AddWarehouse=Create warehouse
+AddWarehouse=Opret lager
 AddOne=Tilføj en
-DefaultWarehouse=Default warehouse
+DefaultWarehouse=Standardlager
 WarehouseTarget=Målret lager
 ValidateSending=Slet afsendelse
 CancelSending=Annuller afsendelse
 DeleteSending=Slet afsendelse
-Stock=Stock
+Stock=Lager
 Stocks=Lagre
-StocksByLotSerial=Lagre efter lot / seriel
-LotSerial=Masser / Serials
-LotSerialList=Liste over partier / serier
+StocksByLotSerial=Lagerført efter parti/seriel
+LotSerial=Parti/Serienr
+LotSerialList=Liste over partier/seriernr.
 Movements=Bevægelser
-ErrorWarehouseRefRequired=Warehouse reference navn er påkrævet
-ListOfWarehouses=Liste over pakhuse
-ListOfStockMovements=Liste over lagerbevægelserne
-ListOfInventories=List of inventories
-MovementId=Bevægelses-id
+ErrorWarehouseRefRequired=Varelagers reference navn er påkrævet
+ListOfWarehouses=Liste over Varelagre
+ListOfStockMovements=Liste over lager bevægelserne
+ListOfInventories=Liste over varebeholdninger
+MovementId=Bevægelses ID
 StockMovementForId=Bevægelses-id %d
 ListMouvementStockProject=Liste over lagerbevægelser forbundet med projektet
 StocksArea=Pakhuse
-Location=Lieu
-LocationSummary=Kortnavn placering
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
+Location=Placering
+LocationSummary=Kort placerings navn
 NumberOfDifferentProducts=Antal forskellige varer
 NumberOfProducts=Samlet antal varer
 LastMovement=Seneste bevægelse
@@ -44,7 +46,6 @@ TransferStock=Overførselslager
 MassStockTransferShort=Massebestemmelse overførsel
 StockMovement=Stock bevægelse
 StockMovements=Aktiebevægelser
-LabelMovement=Bevægelsesmærke
 NumberOfUnit=Antal enheder
 UnitPurchaseValue=Enhedskøbspris
 StockTooLow=Stock for lavt
@@ -54,21 +55,23 @@ PMPValue=Værdi
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Lager værdi
 UserWarehouseAutoCreate=Opret et brugerlager automatisk, når du opretter en bruger
-AllowAddLimitStockByWarehouse=Tillad at tilføje grænse og ønsket lager pr. Par (produkt, lager) i stedet for pr. Produkt
+AllowAddLimitStockByWarehouse=Manage also values for minimum and desired stock per pairing (product-warehouse) in addition to values per product
 IndependantSubProductStock=Produktbeholdning og underprodukt er uafhængige
 QtyDispatched=Afsendte mængde
 QtyDispatchedShort=Antal afsendt
 QtyToDispatchShort=Antal til afsendelse
 OrderDispatch=Vareindtægter
-RuleForStockManagementDecrease=Regel for automatisk lagerstyring mindskes (manuel reduktion er altid muligt, selvom en automatisk reduktionsregel er aktiveret)
-RuleForStockManagementIncrease=Regel for automatisk lagerstyring øges (manuel stigning er altid mulig, selvom en automatisk stigningsregel er aktiveret)
-DeStockOnBill=Fraførsel reelle bestande på fakturaer / kreditnotaer
-DeStockOnValidateOrder=Fraførsel reelle bestande om ordrer noter
-DeStockOnShipment=Reducer reelle aktier på forsendelse validering
-DeStockOnShipmentOnClosing=Sænk reelle aktier på fragtklassifikation lukket
-ReStockOnBill=Forhøjelse reelle bestande på fakturaer / kreditnotaer
-ReStockOnValidateOrder=Increase real stocks on purchase orders approbation
-ReStockOnDispatchOrder=Forøg ægte lagre ved manuel afsendelse til lager, efter leverandørens bestilling af varer
+RuleForStockManagementDecrease=Vælg Regel for automatisk lagernedgang (manuelt fald er altid muligt, selvom en automatisk reduktionsregel er aktiveret)
+RuleForStockManagementIncrease=Vælg Regel for automatisk lagerforhøjelse (manuel stigning er altid mulig, selvom en automatisk stigningsregel er aktiveret)
+DeStockOnBill=Reducer det reelle vareantal i lager ved bekræftelse af kundefaktura / kreditnota
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
+DeStockOnShipment=Reducer reelle aktier på forsendelse bekræftelse
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Øg reelle aktier ved købsordre godkendelse
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=Ordren har endnu ikke eller ikke længere en status, der tillader afsendelse af varer fra varelagre.
 StockDiffPhysicTeoric=Forklaring til forskel mellem fysisk og virtuel bestand
 NoPredefinedProductToDispatch=Ingen foruddefinerede produkter for dette objekt. Så ingen ekspedition på lager er påkrævet.
@@ -76,15 +79,15 @@ DispatchVerb=Forsendelse
 StockLimitShort=Begræns for advarsel
 StockLimit=Lagergrænse for advarsel
 StockLimitDesc=(tom) betyder ingen advarsel. <br> 0 kan bruges til en advarsel, så snart lageret er tomt.
-PhysicalStock=Fysiske lager
+PhysicalStock=Physical Stock
 RealStock=Real Stock
-RealStockDesc=Fysisk eller reel bestand er den beholdning du i øjeblikket har i dine interne lagre / emplacements.
-RealStockWillAutomaticallyWhen=Den reelle beholdning ændres automatisk i henhold til disse regler (se lagermodul opsætning for at ændre dette):
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual lager
-VirtualStockDesc=Virtual stock er den aktie, du får, når alle åbne ventende handlinger, der påvirker aktierne, vil blive lukket (leverandør ordre modtaget, afsendelse af kundeordre, ...)
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
 IdWarehouse=Id lager
 DescWareHouse=Beskrivelse lager
-LieuWareHouse=Lokalisering lager
+LieuWareHouse=Lager placering
 WarehousesAndProducts=Varelagre og varer
 WarehousesAndProductsBatchDetail=Lager og produkter (med detaljer pr. Lot / serie)
 AverageUnitPricePMPShort=Gennemsnitlig input pris
@@ -101,7 +104,7 @@ ThisWarehouseIsPersonalStock=Denne lagerhal er personlig status over %s %s
 SelectWarehouseForStockDecrease=Vælg lageret skal bruges til lager fald
 SelectWarehouseForStockIncrease=Vælg lageret skal bruges til lager stigning
 NoStockAction=Ingen lager aktion
-DesiredStock=Ønsket optimal lager
+DesiredStock=Desired Stock
 DesiredStockDesc=Dette lagerbeløb er den værdi, der bruges til at fylde lageret ved genopfyldningsfunktionen.
 StockToBuy=At bestille
 Replenishment=genopfyldning
@@ -114,13 +117,13 @@ CurentSelectionMode=Aktuel valgtilstand
 CurentlyUsingVirtualStock=Virtual lager
 CurentlyUsingPhysicalStock=Fysiske lager
 RuleForStockReplenishment=Regel for lageropfyldning
-SelectProductWithNotNullQty=Vælg mindst et produkt med et antal ikke null og en leverandør
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
 AlertOnly= Kun advarsler
 WarehouseForStockDecrease=Lageret <b> %s </ b> vil blive brugt til lagernedgang
 WarehouseForStockIncrease=Lageret <b> %s </ b> vil blive brugt til lagerforhøjelse
 ForThisWarehouse=Til dette lager
-ReplenishmentStatusDesc=Dette er en liste over alle produkter med en lagerbeholdning lavere end ønsket lager (eller lavere end advarselsværdi, hvis afkrydsningsfeltet "alarm kun" er markeret). Ved at bruge afkrydsningsfeltet kan du oprette leverandørordrer for at udfylde forskellen.
-ReplenishmentOrdersDesc=Dette er en liste over alle åbne leverandørordrer inklusive foruddefinerede produkter. Kun åbne ordrer med foruddefinerede produkter, så ordrer der kan påvirke lagre, er synlige her.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=genopfyldninger
 NbOfProductBeforePeriod=Mængde af produkt %s på lager inden valgt periode (<%s)
 NbOfProductAfterPeriod=Mængde af produkt %s på lager efter valgt periode (> %s)
@@ -130,10 +133,11 @@ RecordMovement=Optag overførsel
 ReceivingForSameOrder=Kvitteringer for denne ordre
 StockMovementRecorded=Aktiebevægelser registreret
 RuleForStockAvailability=Regler om lagerkrav
-StockMustBeEnoughForInvoice=Lager niveau skal være nok til at tilføje produkt / service til faktura (check er udført på nuværende reelle lager, når du tilføjer en linje til faktura uanset hvad der gælder for automatisk lagerændring)
-StockMustBeEnoughForOrder=Lagerniveau skal være nok til at tilføje produkt / service til ordre (check er udført på nuværende reelle lager, når du tilføjer en linje i rækkefølge, uanset hvad der gælder for automatisk lagerændring)
-StockMustBeEnoughForShipment= Lagerniveau skal være nok til at tilføje produkt / service til forsendelse (check er udført på nuværende reelle lager, når du tilføjer en linje til forsendelse, uanset hvad der gælder for automatisk lagerændring)
+StockMustBeEnoughForInvoice=Lagerniveau skal være tilstrækkeligt til at tilføje produkt / service til faktura (check sker på nuværende reelle lager, når du tilføjer en linje til faktura uanset reglen for automatisk lagerændring)
+StockMustBeEnoughForOrder=Lager niveau skal være nok til at tilføje produkt / service til ordre (check er udført på nuværende reelle lager, når du tilføjer en linje til ordre uanset reglen for automatisk lagerændring)
+StockMustBeEnoughForShipment= Lagerniveau skal være tilstrækkeligt til at tilføje produkt / service til forsendelse (check er udført på nuværende reelle lager, når du tilføjer en linje til forsendelse uanset reglen for automatisk lagerændring)
 MovementLabel=Etikett for bevægelse
+TypeMovement=Type of movement
 DateMovement=Dato for bevægelse
 InventoryCode=Bevægelse eller lager kode
 IsInPackage=Indeholdt i pakken
@@ -143,11 +147,11 @@ ShowWarehouse=Vis lager
 MovementCorrectStock=Lagerkorrektion for produkt %s
 MovementTransferStock=Lageroverførsel af produkt %s til et andet lager
 InventoryCodeShort=Inv./Mov. kode
-NoPendingReceptionOnSupplierOrder=Ingen venter modtagelse på grund af åben leverandørbestilling
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
 ThisSerialAlreadyExistWithDifferentDate=Dette lot / serienummer (<strong> %s </ strong>) findes allerede, men med forskellige eatby eller sellby dato (fundet <strong> %s </ strong>, men du indtaster <strong> %s </ strong>).
 OpenAll=Åbn for alle handlinger
 OpenInternal=Åben kun for interne handlinger
-UseDispatchStatus=Brug en afsendelsesstatus (godkend / afvis) for produktlinjer ved modtagelse af leverandørbestilling
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
 OptionMULTIPRICESIsOn=Mulighed for "flere priser pr. Segment" er på. Det betyder, at et produkt har flere salgspriser, så værdien til salg ikke kan beregnes
 ProductStockWarehouseCreated=Lagergrænse for alarm og ønsket optimal lager korrekt oprettet
 ProductStockWarehouseUpdated=Lagergrænse for alarm og ønsket optimal lager korrekt opdateret
@@ -160,27 +164,27 @@ inventorySetup = Opstilling af lager
 inventoryCreatePermission=Opret ny opgørelse
 inventoryReadPermission=Se varebeholdninger
 inventoryWritePermission=Opdater inventar
-inventoryValidatePermission=Valider inventar
+inventoryValidatePermission=Bekræft inventar
 inventoryTitle=Beholdning
 inventoryListTitle=Varebeholdninger
 inventoryListEmpty=Ingen opgørelse pågår
 inventoryCreateDelete=Opret / Slet inventar
 inventoryCreate=Lav ny
 inventoryEdit=Redigér
-inventoryValidate=Valideret
+inventoryValidate=Bekræftet
 inventoryDraft=Kørsel
 inventorySelectWarehouse=Lagervalg
 inventoryConfirmCreate=Opret
-inventoryOfWarehouse=Lagerbeholdning: %s
-inventoryErrorQtyAdd=Fejl: En mængde er leaser end nul
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
 inventoryMvtStock=Ved opgørelse
 inventoryWarningProductAlreadyExists=Dette produkt er allerede på listen
-SelectCategory=Kategori filter
-SelectFournisseur=Leverandørfilter
+SelectCategory=Kategorifilter
+SelectFournisseur=Vendor filter
 inventoryOnDate=Beholdning
-INVENTORY_DISABLE_VIRTUAL=Tillad ikke at afstøde børneprodukt fra et sæt på lager
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
 INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Brug købsprisen, hvis der ikke findes nogen sidste købspris
-INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Lagerbevægelse har datoen for lagerbeholdningen
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement has date of inventory
 inventoryChangePMPPermission=Tillad at ændre PMP-værdi for en vare
 ColumnNewPMP=Ny enhed PMP
 OnlyProdsInStock=Tilføj ikke produkt uden lager
@@ -201,6 +205,10 @@ ExitEditMode=Afslutningsudgave
 inventoryDeleteLine=Slet linie
 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 items
+StockSupportServices=Lagerstyring understøtter Tjenester
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
+ReceiveProducts=Modtag genstande
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
diff --git a/htdocs/langs/da_DK/website.lang b/htdocs/langs/da_DK/website.lang
index a466ad7008a..455f76a52d3 100644
--- a/htdocs/langs/da_DK/website.lang
+++ b/htdocs/langs/da_DK/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/da_DK/withdrawals.lang b/htdocs/langs/da_DK/withdrawals.lang
index c6588ad8186..ca6c79297aa 100644
--- a/htdocs/langs/da_DK/withdrawals.lang
+++ b/htdocs/langs/da_DK/withdrawals.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Betalingsordre for direkte debitering
 SuppliersStandingOrdersArea=Direkte kredit betalingsordre område
-StandingOrdersPayment=Direct debit payment orders
+StandingOrdersPayment=Betalingsordrer til direkte debitering
 StandingOrderPayment=Betalingsordre med "Direkte debit"
 NewStandingOrder=Ny direkte debitering
 StandingOrderToProcess=For at kunne behandle
@@ -12,21 +12,21 @@ WithdrawalsLines=Direkte debitordre
 RequestStandingOrderToTreat=Anmodning om betaling med direkte debitering for at behandle
 RequestStandingOrderTreated=Forespørgsel om betaling med direkte debitering behandlet
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Ikke muligt endnu. Uddragsstatus skal indstilles til 'krediteret', før de erklærer afvisning på bestemte linjer.
-NbOfInvoiceToWithdraw=Nb. af kvalificeret faktura med ventende direkte debitering
-NbOfInvoiceToWithdrawWithInfo=Nb. af kundefaktura med ordrer med direkte debitering med angivne bankkontooplysninger
+NbOfInvoiceToWithdraw=Antal kvalificeret faktura med ventende direkte debitering
+NbOfInvoiceToWithdrawWithInfo=Antal kundefakturaer med ordrer med direkte debitering, der har defineret bankkontooplysninger
 InvoiceWaitingWithdraw=Faktura venter på direkte debitering
 AmountToWithdraw=Beløb til at trække
 WithdrawsRefused=Direkte debitering afvist
 NoInvoiceToWithdraw=Ingen kundefaktura med åbne 'Debitforespørgsler' venter. Gå på fanen '%s' på faktura kort for at fremsætte en anmodning.
-ResponsibleUser=Ansvarlig bruger
+ResponsibleUser=User Responsible
 WithdrawalsSetup=Indbetaling af direkte debitering
 WithdrawStatistics=Betalingsstatistik for direkte debitering
 WithdrawRejectStatistics=Direkte debitering betaling afviser statistikker
 LastWithdrawalReceipt=Seneste %s direkte debit kvitteringer
 MakeWithdrawRequest=Lav en anmodning om direkte debitering
 WithdrawRequestsDone=%s anmodninger om direkte debitering indbetalt
-ThirdPartyBankCode=Tredjepart bankkode
-NoInvoiceCouldBeWithdrawed=Ingen faktura tilbagetrukket med succes. Kontroller, at fakturaer er på virksomheder med en gyldig standard BAN, og at BAN har en RUM-tilstand <strong> %s </ strong>.
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=Ingen faktura debiteres med succes. Kontroller, at fakturaer er på virksomheder med en gyldig IBAN, og at IBAN har en UMR (Unique Mandate Reference) med tilstanden <strong> %s </ strong>.
 ClassCredited=Klassificere krediteres
 ClassCreditedConfirm=Er du sikker på at du vil klassificere denne tilbagetrækning modtagelse som krediteres på din bankkonto?
 TransData=Dato Transmission
@@ -50,7 +50,7 @@ StatusMotif0=Uspecificeret
 StatusMotif1=Levering insuffisante
 StatusMotif2=Tirage conteste
 StatusMotif3=Ingen betaling med direkte debitering
-StatusMotif4=Kunde Bestil
+StatusMotif4=Sales Order
 StatusMotif5=RIB inexploitable
 StatusMotif6=Konto uden balance
 StatusMotif7=Retslig afgørelse
@@ -66,11 +66,11 @@ NotifyCredit=Tilbagetrækning Credit
 NumeroNationalEmetter=National Transmitter Antal
 WithBankUsingRIB=For bankkonti ved hjælp af RIB
 WithBankUsingBANBIC=For bankkonti ved hjælp af IBAN / BIC / SWIFT
-BankToReceiveWithdraw=Bankkonto for at modtage direkte debitering
+BankToReceiveWithdraw=Receiving Bank Account
 CreditDate=Kredit på
 WithdrawalFileNotCapable=Kan ikke generere tilbagekøbskvitteringsfil for dit land %s (Dit land understøttes ikke)
-ShowWithdraw=Vis Træk
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Hvis faktura mindst en tilbagetrækning betaling endnu ikke behandlet, vil den ikke blive angivet som betales for at tillade at styre tilbagetrækning før.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=Denne fane giver dig mulighed for at anmode om en ordrebetalingsordre. Når du er færdig, skal du gå ind i menuen Bank-> Direkte debiteringsordrer for at administrere ordren med direkte debitering. Når betalingsordren er lukket, registreres betaling på faktura automatisk, og fakturaen lukkes, hvis resten skal betales, er null.
 WithdrawalFile=Udtagelsesfil
 SetToStatusSent=Sæt til status "Fil sendt"
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=Dette registrerer også betalinger til fakturaer
 StatisticsByLineStatus=Statistikker efter status af linjer
 RUM=UMR
 RUMLong=Unik Mandat Reference
-RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direkte debiteringstilstand (FRST eller RECUR)
 WithdrawRequestAmount=Beløb for direkte debitering:
 WithdrawRequestErrorNilAmount=Kunne ikke oprette direkte debitering for tomt beløb.
@@ -87,21 +87,25 @@ SepaMandateShort=SEPA-mandat
 PleaseReturnMandate=Ret venligst denne mandatformular via e-mail til %s eller pr. Mail til
 SEPALegalText=Ved at underskrive denne mandatformular bemyndiger du (A) %s at sende instruktioner til din bank for at debitere din konto og (B) din bank at debitere din konto i overensstemmelse med instruktionerne fra %s. Som en del af dine rettigheder har du ret til refusion fra din bank i henhold til vilkårene for din aftale med din bank. En refusion skal kræves inden for 8 uger fra den dato, hvor din konto blev debiteret. Dine rettigheder vedrørende ovennævnte mandat forklares i en erklæring, som du kan få fra din bank.
 CreditorIdentifier=Kreditoridentifikator
-CreditorName=Kreditorens navn
+CreditorName=Creditor Name
 SEPAFillForm=(B) Udfyld venligst alle felter markeret *
 SEPAFormYourName=Dit navn
 SEPAFormYourBAN=Dit bankkonto navn (IBAN)
 SEPAFormYourBIC=Din bankidentifikator kode (BIC)
 SEPAFrstOrRecur=Betalings type
-ModeRECUR=Recuurent betaling
+ModeRECUR=Recurring payment
 ModeFRST=Engangsbetaling
 PleaseCheckOne=Tjek venligst kun en
 DirectDebitOrderCreated=Direkte debitering %s oprettet
 AmountRequested=Beløb anmodet
 SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
-ExecutionDate=Execution date
-CreateForSepa=Create direct debit file
+ExecutionDate=Udførelsesdato
+CreateForSepa=Opret direkte debitering fil
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
 
 ### Notifications
 InfoCreditSubject=Betaling af betaling med direkte debitering %s af banken
diff --git a/htdocs/langs/de_DE/accountancy.lang b/htdocs/langs/de_DE/accountancy.lang
index 84ff07b49ae..f9e9e1e9380 100644
--- a/htdocs/langs/de_DE/accountancy.lang
+++ b/htdocs/langs/de_DE/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Consult here the list of third-party customers and vendors
 ListAccounts=Liste der Abrechnungskonten
 UnknownAccountForThirdparty=Unknown third-party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Zahlung ist keinem Produkt oder Dienstleistung zugewisen
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Konfigurierbarer CSV Export
-Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Kontenplan ID
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Mit keinem gültigen dedizierten Konto
 WithValidAccount=Mit gültigen dedizierten Konto
 ValueNotIntoChartOfAccount=Dieser Wert für das Buchhaltungs-Konto existiert nicht im Kontenplan
 AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Bereich von Sachkonten
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Zeilen noch nicht zugeordnet, verwende das Menu <a hr
 
 ## Import
 ImportAccountingEntries=Buchaltungseinträge
-
+DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Spesenabrechnung Journal
 InventoryJournal=Inventarjournal
diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
index 7a82b0301c9..7006ed146e8 100644
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=In diesem Bereich finden Sie die Verwaltungsfunktionen. Verw
 Purge=Bereinigen
 PurgeAreaDesc=Auf dieser Seite können Sie alle von Dolibarr erzeugten oder gespeicherten Dateien (temporäre Dateien oder alle Dateien im Verzeichnis <b>%s</b> ) löschen. Die Verwendung dieser Funktion ist in der Regel nicht erforderlich. Es wird als Workaround für Benutzer bereitgestellt, deren Dolibarr von einem Anbieter gehostet wird, der keine Berechtigungen zum löschen von Dateien anbietet, die vom Webserver erzeugt wurden.
 PurgeDeleteLogFile=Löschen der Protokolldateien, einschließlich <b>%s</b>, die für das Syslog-Modul definiert wurden (kein Risiko Daten zu verlieren)
-PurgeDeleteTemporaryFiles=Löschen aller temporären Dateien  (kein Datenverlust möglich)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=temporäre Dateien löschen
 PurgeDeleteAllFilesInDocumentsDir=Alle Dateien im Verzeichnis: <b>%s</b> löschen: <br>Dadurch werden alle erzeugten Dokumente löschen, die sich auf verknüpfte (Dritte, Rechnungen usw....), Dateien, die in das ECM Modul hochgeladen wurden, Datenbank, Backup, Dumps und temporäre Dateien beziehen.
 PurgeRunNow=Jetzt bereinigen
@@ -804,6 +804,7 @@ Permission401=Rabatte anzeigen
 Permission402=Rabatte erstellen/bearbeiten
 Permission403=Rabatte freigeben
 Permission404=Rabatte löschen
+Permission430=Use Debug Bar
 Permission511=Read payments of salaries
 Permission512=Lohnzahlungen anlegen / ändern
 Permission514=Delete payments of salaries
@@ -818,6 +819,9 @@ Permission532=Leistungen erstellen/bearbeiten
 Permission534=Leistungen löschen
 Permission536=Versteckte Leistungen einsehen/verwalten
 Permission538=Leistungen exportieren
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Spenden anzeigen
 Permission702=Spenden erstellen/bearbeiten
 Permission703=Spenden löschen
@@ -837,6 +841,12 @@ Permission1101=Lieferscheine einsehen
 Permission1102=Lieferscheine erstellen/bearbeiten
 Permission1104=Lieferscheine freigeben
 Permission1109=Lieferscheine löschen
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Lieferanten einsehen
 Permission1182=Lieferantenbestellungen anzeigen
 Permission1183=Lieferantenbestellungen erstellen/bearbeiten
@@ -859,16 +869,6 @@ Permission1251=Massenimports von externen Daten ausführen (data load)
 Permission1321=Kundenrechnungen, -attribute und -zahlungen exportieren
 Permission1322=Eine bezahlte Rechnung wieder öffnen
 Permission1421=Export sales orders and attributes
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
-Permission20003=Urlaubsanträge löschen
-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
-Permission23003=cronjobs löschen
-Permission23004=cronjobs ausführen
 Permission2401=Ereignisse (Termine/Aufgaben) in Verbindung mit eigenem Konto einsehen
 Permission2402=Ereignisse (Termine/Aufgaben) in Verbindung mit eigenem Konto erstellen/bearbeiten
 Permission2403=Ereignisse  (Termine/Aufgaben) in Verbindung mit eigenem Konto löschen
@@ -882,9 +882,41 @@ Permission2503=Dokumente bestätigen oder löschen
 Permission2515=Dokumentverzeichnisse verwalten
 Permission2801=FTP-Client im Lesemodus nutzen (nur ansehen und herunterladen)
 Permission2802=FTP-Client im Schreibmodus nutzen (Dateien löschen oder hochladen)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
+Permission20003=Urlaubsanträge löschen
+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
+Permission23003=cronjobs löschen
+Permission23004=cronjobs ausführen
 Permission50101=benutze Kasse (POS)
 Permission50201=Transaktionen einsehen
 Permission50202=Transaktionen importieren
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Drucken
 Permission55001=Abstimmungen einsehen
 Permission55002=Abstimmung erstellen/ändern
@@ -1078,7 +1110,7 @@ AreaForAdminOnly=Einstellungen können nur durch </b>Administratoren</b> veränd
 SystemInfoDesc=Verschiedene systemrelevante, technische Informationen - Lesemodus und nur für Administratoren sichtbar.
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
-AccountantDesc=Edit the details of your accountant/bookkeeper
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Verfügbare Module
@@ -1891,3 +1923,5 @@ IFTTTDesc=Dieses Modul wurde entwickelt, um Ereignisse auf IFTTT auszulösen und
 UrlForIFTTT=URL-Endpunkt für IFTTT
 YouWillFindItOnYourIFTTTAccount=Sie finden es auf Ihrem IFTTTT-Konto.
 EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/de_DE/banks.lang b/htdocs/langs/de_DE/banks.lang
index 8dfb7808f89..9cd672ff36f 100644
--- a/htdocs/langs/de_DE/banks.lang
+++ b/htdocs/langs/de_DE/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=nicht ausgeglichen
 CustomerInvoicePayment=Kundenzahlung
 SupplierInvoicePayment=Lieferanten Zahlung
 SubscriptionPayment=Beitragszahlung
-WithdrawalPayment=Lastschriftzahlung
+WithdrawalPayment=Lastschrift
 SocialContributionPayment=Zahlung von Sozialabgaben/Steuern
 BankTransfer=Kontentransfer
 BankTransfers=Kontentransfers
diff --git a/htdocs/langs/de_DE/cashdesk.lang b/htdocs/langs/de_DE/cashdesk.lang
index d6d13ac7d7c..5675c114bc0 100644
--- a/htdocs/langs/de_DE/cashdesk.lang
+++ b/htdocs/langs/de_DE/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/de_DE/mails.lang b/htdocs/langs/de_DE/mails.lang
index c038968386c..b142199c307 100644
--- a/htdocs/langs/de_DE/mails.lang
+++ b/htdocs/langs/de_DE/mails.lang
@@ -78,9 +78,9 @@ GroupEmails=Gruppenmails
 OneEmailPerRecipient=Ein E-Mail pro Empfänger (Standardmässig, ein E-Mail pro Datensatz ausgewählt)
 WarningIfYouCheckOneRecipientPerEmail=Achtung: Wenn diese Checkbox angekreuzt ist, wird nur eine E-Mail für mehrere Datensätze versendet. Falls Sie Variablen verwenden die sich auf den Datensatz beziehen, werden diese Variablen nicht ersetzt).
 ResultOfMailSending=Result of mass Email sending
-NbSelected=Anzahl gewählte
-NbIgnored=Anzahl ignoriert
-NbSent=Anzahl gesendet
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s E-Mail(s) versendet.
 ConfirmUnvalidateEmailing=Möchten Sie die E-Mail-Kampange <b>%s</b> auf den Status "Entwurf" zurücksetzen?
 MailingModuleDescContactsWithThirdpartyFilter=Kontakt mit Kunden Filter
diff --git a/htdocs/langs/de_DE/members.lang b/htdocs/langs/de_DE/members.lang
index fe9e9fc18c3..56c6c2d04f3 100644
--- a/htdocs/langs/de_DE/members.lang
+++ b/htdocs/langs/de_DE/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=Wählen Sie die gewünschte Statistik aus ...
 MenuMembersStats=Statistik
 LastMemberDate=Letztes Mitgliedsdatum
 LatestSubscriptionDate=Letztes Abo-Datum
-Nature=Art
+MemberNature=Nature of member
 Public=Informationen sind öffentlich (Nein = Privat)
 NewMemberbyWeb=Neues Mitgliede hinzugefügt, warte auf Genehmigung.
 NewMemberForm=Neues Mitgliederformular
diff --git a/htdocs/langs/de_DE/products.lang b/htdocs/langs/de_DE/products.lang
index 63630192f48..8270e25fd2f 100644
--- a/htdocs/langs/de_DE/products.lang
+++ b/htdocs/langs/de_DE/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Lieferanten Preise
 SuppliersPricesOfProductsOrServices=Herstellerpreise (von Produkten oder Dienstleistungen)
 CustomCode=Zolltarifnummer
 CountryOrigin=Urspungsland
-Nature=Produkttyp  (Material / Fertig)
+Nature=Nature of produt (material/finished)
 ShortLabel=Kurzbezeichnung
 Unit=Einheit
 p=u.
diff --git a/htdocs/langs/de_DE/salaries.lang b/htdocs/langs/de_DE/salaries.lang
index 534c47aa871..4ceaf557fd6 100644
--- a/htdocs/langs/de_DE/salaries.lang
+++ b/htdocs/langs/de_DE/salaries.lang
@@ -1,10 +1,11 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Standard Buchhaltungskonto für Benutzer Partner
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Das in der Benutzerkarte hinterlegte Konto wird nur für die Nebenbücher verwendet. Dieses Konto wird für das Hauptbuch und als Vorgabewert für die Nebnbücher verwendet, wenn beim Benutzer kein Konto hinterlegt ist.
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Das in der Benutzerkarte hinterlegte Konto wird nur für die Nebenbücher verwendet. Dieses Konto wird für das Hauptbuch und als Vorgabewert für die Nebenbücher verwendet, wenn beim Benutzer kein Konto hinterlegt ist.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Buchhaltungs-Konto für Löhne
 Salary=Lohn
 Salaries=Löhne
 NewSalaryPayment=Neue Lohnzahlung
+AddSalaryPayment=Gehaltszahlung hinzufügen
 SalaryPayment=Lohnzahlung
 SalariesPayments=Lohnzahlungen
 ShowSalaryPayment=Zeige Lohnzahlung
@@ -13,6 +14,8 @@ TJM=Durchschnittlicher Tagessatz
 CurrentSalary=aktueller  Lohn
 THMDescription=Dieser Wert kann verwendet werden, um die Kosten für die verbrauchte Zeit eines Anwender zu berechnen, wenn das Modul Projektverwaltung verwendet wird,
 TJMDescription=Dieser Wert ist aktuell nur zu Informationszwecken und wird nicht für eine Berechnung verwendet
-LastSalaries=Letzte %sLohnzahlungen
+LastSalaries=Letzte %s Lohnzahlungen
 AllSalaries=Alle Lohnzahlungen
-SalariesStatistics=Statistiques salaires
+SalariesStatistics=Statistik Gehälter
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/de_DE/stocks.lang b/htdocs/langs/de_DE/stocks.lang
index 93a2a51a292..2fa571d8e32 100644
--- a/htdocs/langs/de_DE/stocks.lang
+++ b/htdocs/langs/de_DE/stocks.lang
@@ -66,10 +66,12 @@ RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual
 DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
 DeStockOnValidateOrder=Decrease real stocks on validation of sales order
 DeStockOnShipment=Verringere reale Bestände bei Bestädigung von Lieferungen
-DeStockOnShipmentOnClosing=Verringere Lagerbestände beim Schließen der Versanddokumente
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
 ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
 ReStockOnValidateOrder=Increase real stocks on purchase order approval
 ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=Auftrag wurde noch nicht oder nicht mehr ein Status, der Erzeugnisse auf Lager Hallen Versand ermöglicht.
 StockDiffPhysicTeoric=Begründung für Differenz  zwischen Inventurbestand und Lagerbestand
 NoPredefinedProductToDispatch=Keine vordefinierten Produkte für dieses Objekt. Also kein Versand im Lager erforderlich ist.
diff --git a/htdocs/langs/de_DE/website.lang b/htdocs/langs/de_DE/website.lang
index 56a2fb50105..a06c0d64103 100644
--- a/htdocs/langs/de_DE/website.lang
+++ b/htdocs/langs/de_DE/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/de_DE/withdrawals.lang b/htdocs/langs/de_DE/withdrawals.lang
index e04df9257cd..c93f95ed408 100644
--- a/htdocs/langs/de_DE/withdrawals.lang
+++ b/htdocs/langs/de_DE/withdrawals.lang
@@ -69,8 +69,8 @@ WithBankUsingBANBIC=Bankkonten mit IBAN/BIC
 BankToReceiveWithdraw=Bankkonto für Abbuchungen
 CreditDate=Am
 WithdrawalFileNotCapable=Abbuchungsformular für Ihr Land %s konnte nicht erstellt werden (Dieses Land wird nicht unterstützt).
-ShowWithdraw=Zeige Abbuchung
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Wenn eine Rechnung mindestens eine noch zu bearbeitende Verbuchung vorweist, kann diese nicht als bezahlt markiert werden.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=Dieser Tab ermöglicht Ihnen, eine Zahlung per Bankeinzug anfordern. Wenn Sie fertig sind, gehen Sie in das Menü Bank->Lastschriftaufträge, um den Lastschriftauftrag zu verwalten. Wenn der Zahlungsauftrag geschlossen wird, wird die Zahlung auf der Rechnung automatisch aufgezeichnet und die Rechnung geschlossen, wenn der Restbetrag null ist.
 WithdrawalFile=Datei abbuchen
 SetToStatusSent=Setze in Status "Datei versandt"
diff --git a/htdocs/langs/el_GR/accountancy.lang b/htdocs/langs/el_GR/accountancy.lang
index a04afc621c4..cda38d3b569 100644
--- a/htdocs/langs/el_GR/accountancy.lang
+++ b/htdocs/langs/el_GR/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Consult here the list of third-party customers and vendors
 ListAccounts=Λίστα των λογιστικών λογαριασμών
 UnknownAccountForThirdparty=Unknown third-party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
-Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Without valid dedicated account
 WithValidAccount=With valid dedicated account
 ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
 AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Range of accounting account
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
-
+DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index ee2961b334e..dd5792b897c 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=Αυτή η περιοχή παρέχει λειτουργί
 Purge=Εκκαθάριση
 PurgeAreaDesc=Αυτή η σελίδα σας επιτρέπει να διαγράψετε όλα τα αρχεία που κατασκευάζονται ή αποθηκεύονται από την Dolibarr (προσωρινά αρχεία ή όλα τα αρχεία σε <b>%s </ b> directory).  Η χρήση αυτής της λειτουργίας δεν είναι απαραίτητη.  Παρέχεται για χρήστες των οποίων η Dolibarr φιλοξενείται από πάροχο, που δεν προσφέρει δικαίωμα διαγραφής αρχείων που κατασκευάστηκαν από τον web server.
 PurgeDeleteLogFile=Διαγράψτε τα αρχεία καταγραφής, συμπεριλαμβανομένων<b>%s</b> που είναι ορισμένα για τη χρήση της μονάδας Syslog (χωρίς κίνδυνο απώλειας δεδομένων)
-PurgeDeleteTemporaryFiles=Διαγραφή ολών των προσωρινών αρχείων (δεν υπάρχει κίνδυνος απώλειας δεδομένων)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Διαγραφή προσωρινών αρχείων
 PurgeDeleteAllFilesInDocumentsDir=Διαγράψτε όλα τα αρχεία στον κατάλογο: <b>%s</b> . <br> Αυτό θα διαγράψει όλα τα παραγόμενα έγγραφα που σχετίζονται με στοιχεία (τρίτα μέρη, τιμολόγια κ.λπ.), αρχεία που έχουν φορτωθεί στη μονάδα ECM, αρχεία από αντίγραφα ασφαλείας βάσεων δεδομένων και προσωρινά αρχεία.
 PurgeRunNow=Διαγραφή τώρα
@@ -804,6 +804,7 @@ Permission401=Read discounts
 Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
+Permission430=Use Debug Bar
 Permission511=Read payments of salaries
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
@@ -818,6 +819,9 @@ Permission532=Create/modify services
 Permission534=Delete services
 Permission536=See/manage hidden services
 Permission538=Export services
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Read donations
 Permission702=Δημιουργία / τροποποίηση δωρεές
 Permission703=Διαγραφή δωρεές
@@ -837,6 +841,12 @@ Permission1101=Read delivery orders
 Permission1102=Create/modify delivery orders
 Permission1104=Validate delivery orders
 Permission1109=Delete delivery orders
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Read suppliers
 Permission1182=Read purchase orders
 Permission1183=Create/modify purchase orders
@@ -859,16 +869,6 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
-Permission20003=Διαγραφή των αιτήσεων άδειας
-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)
-Permission23001=Λεπτομέρειες προγραμματισμένης εργασίας
-Permission23002=Δημιουργήστε/ενημερώστε μια προγραμματισμένη εργασία
-Permission23003=Διαγράψτε μια προγραμματισμένη εργασία
-Permission23004=Εκτελέστε μια προγραμματισμένη εργασία
 Permission2401=Read actions (events or tasks) linked to his account
 Permission2402=Create/modify actions (events or tasks) linked to his account
 Permission2403=Delete actions (events or tasks) linked to his account
@@ -882,9 +882,41 @@ Permission2503=Υποβολή ή να διαγράψετε τα έγγραφα
 Permission2515=Setup documents directories
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
+Permission20003=Διαγραφή των αιτήσεων άδειας
+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)
+Permission23001=Λεπτομέρειες προγραμματισμένης εργασίας
+Permission23002=Δημιουργήστε/ενημερώστε μια προγραμματισμένη εργασία
+Permission23003=Διαγράψτε μια προγραμματισμένη εργασία
+Permission23004=Εκτελέστε μια προγραμματισμένη εργασία
 Permission50101=Use Point of Sale
 Permission50201=Διαβάστε τις συναλλαγές
 Permission50202=Πράξεις εισαγωγής
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Εκτύπωση
 Permission55001=Διαβάστε δημοσκοπήσεις
 Permission55002=Δημιουργία/τροποποίηση ερευνών
@@ -1078,7 +1110,7 @@ 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 to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
-AccountantDesc=Edit the details of your accountant/bookkeeper
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
@@ -1891,3 +1923,5 @@ IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute s
 UrlForIFTTT=URL endpoint for IFTTT
 YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/el_GR/banks.lang b/htdocs/langs/el_GR/banks.lang
index 1a302a45d4e..b12849fe6ed 100644
--- a/htdocs/langs/el_GR/banks.lang
+++ b/htdocs/langs/el_GR/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=Not reconciled
 CustomerInvoicePayment=Πληρωμή Πελάτη
 SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Πληρωμή συνδρομής
-WithdrawalPayment=Ανάκληση πληρωμής
+WithdrawalPayment=Debit payment order
 SocialContributionPayment=Σίγουρα θέλετε να μαρκάρετε αυτό το αξιόγραφο σαν απορριφθέν;
 BankTransfer=Τραπεζική Μεταφορά
 BankTransfers=Τραπεζικές Μεταφορές
diff --git a/htdocs/langs/el_GR/cashdesk.lang b/htdocs/langs/el_GR/cashdesk.lang
index 59f0a6fb495..496974a0115 100644
--- a/htdocs/langs/el_GR/cashdesk.lang
+++ b/htdocs/langs/el_GR/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/el_GR/mails.lang b/htdocs/langs/el_GR/mails.lang
index 108f7ca136f..c1661e2340f 100644
--- a/htdocs/langs/el_GR/mails.lang
+++ b/htdocs/langs/el_GR/mails.lang
@@ -19,6 +19,8 @@ MailTopic=Email topic
 MailText=Μήνυμα
 MailFile=Επισυναπτώμενα Αρχεία
 MailMessage=Κείμενο email
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
 ShowEMailing=Show emailing
 ListOfEMailings=List of emailings
 NewMailing=New emailing
@@ -76,9 +78,9 @@ GroupEmails=Group emails
 OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
 WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
 ResultOfMailSending=Result of mass Email sending
-NbSelected=No. selected
-NbIgnored=No. ignored
-NbSent=No. sent
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
diff --git a/htdocs/langs/el_GR/members.lang b/htdocs/langs/el_GR/members.lang
index d6fd8245df5..26e52a39ce7 100644
--- a/htdocs/langs/el_GR/members.lang
+++ b/htdocs/langs/el_GR/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=Επιλέξτε στατιστικά στοιχεία π
 MenuMembersStats=Στατιστικά
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
-Nature=Nature
+MemberNature=Nature of member
 Public=Δημόσιο
 NewMemberbyWeb=Νέο μέλος πρόσθεσε. Εν αναμονή έγκρισης
 NewMemberForm=Νέα μορφή μέλος
diff --git a/htdocs/langs/el_GR/products.lang b/htdocs/langs/el_GR/products.lang
index aeec8f5d587..4b73e391054 100644
--- a/htdocs/langs/el_GR/products.lang
+++ b/htdocs/langs/el_GR/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Χώρα προέλευσης
-Nature=Product Type (material/finished)
+Nature=Nature of produt (material/finished)
 ShortLabel=Σύντομη ετικέτα
 Unit=Μονάδα
 p=Μονάδα
diff --git a/htdocs/langs/el_GR/salaries.lang b/htdocs/langs/el_GR/salaries.lang
index 842a9e568a2..d9c0fcbfd87 100644
--- a/htdocs/langs/el_GR/salaries.lang
+++ b/htdocs/langs/el_GR/salaries.lang
@@ -1,18 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger 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_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
 Salary=Mισθός
 Salaries=Μισθοί
 NewSalaryPayment=Νέα μισθοδοσία
+AddSalaryPayment=Add salary payment
 SalaryPayment=Μισθός
 SalariesPayments=Πληρωμές μισθών
 ShowSalaryPayment=Εμφάνιση μισθοδοσίας
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Τρέχον μισθός
-THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
-TJMDescription=Αυτή η τιμή εμφανίζεται μόνο σαν πληροφορία και δεν χρησιμοποιείται για κανένα υπολογισμό
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
-SalariesStatistics=Statistiques salaires
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/el_GR/stocks.lang b/htdocs/langs/el_GR/stocks.lang
index 1da45170eba..3a7652891e4 100644
--- a/htdocs/langs/el_GR/stocks.lang
+++ b/htdocs/langs/el_GR/stocks.lang
@@ -3,7 +3,7 @@ WarehouseCard=Κάρτα Αποθήκης
 Warehouse=Αποθήκη
 Warehouses=Αποθήκες
 ParentWarehouse=Parent warehouse
-NewWarehouse=Νέα αποθήκη / Χρηματιστήριο περιοχή
+NewWarehouse=New warehouse / Stock Location
 WarehouseEdit=Τροποποίηση αποθήκη
 MenuNewWarehouse=Νέα αποθήκη
 WarehouseSource=Αποθήκη Πηγή
@@ -29,6 +29,8 @@ MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Περιοχή αποθηκών
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
 Location=Τοποθεσία
 LocationSummary=Σύντομη τοποθεσία όνομα
 NumberOfDifferentProducts=Αριθμός διαφορετικών προϊόντων
@@ -44,7 +46,6 @@ TransferStock=Transfer stock
 MassStockTransferShort=Μαζική μεταφορά αποθέματος
 StockMovement=Stock movement
 StockMovements=Stock movements
-LabelMovement=Ετικέτα
 NumberOfUnit=Αριθμός μονάδων
 UnitPurchaseValue=Unit purchase price
 StockTooLow=Χρηματιστήριο πολύ χαμηλή
@@ -54,21 +55,23 @@ PMPValue=Μέση σταθμική τιμή
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Αποθήκες αξία
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Allow to add limit and desired stock per couple (product, warehouse) instead of per product
-IndependantSubProductStock=Το απόθεμα προϊόντος και απόθεμα υποπροϊόντος είναι ανεξάρτητα
+AllowAddLimitStockByWarehouse=Manage also values for minimum and desired stock per pairing (product-warehouse) in addition to values per product
+IndependantSubProductStock=Product stock and subproduct stock are independent
 QtyDispatched=Ποσότητα αποστέλλονται
 QtyDispatchedShort=Απεσταλμένη ποσότητα
 QtyToDispatchShort=Ποσότητα για αποστολή
 OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
-RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
-DeStockOnBill=Μείωση πραγματικών αποθεμάτων για τους πελάτες τιμολόγια / πιστωτικά επικύρωση σημειώσεις
-DeStockOnValidateOrder=Μείωση πραγματικών αποθεμάτων σχετικά με τις παραγγελίες των πελατών επικύρωσης
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
 DeStockOnShipment=Decrease real stocks on shipping validation
-DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification closed
-ReStockOnBill=Αύξηση πραγματικού αποθέματα για τους προμηθευτές τιμολόγια / πιστωτικά επικύρωση σημειώσεις
-ReStockOnValidateOrder=Increase real stocks on purchase orders approbation
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=Παραγγελία δεν έχει ακόμη ή όχι περισσότερο μια κατάσταση που επιτρέπει την αποστολή των προϊόντων σε αποθήκες αποθεμάτων.
 StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
 NoPredefinedProductToDispatch=Δεν προκαθορισμένα προϊόντα για αυτό το αντικείμενο. Έτσι, δεν έχει αποστολή σε απόθεμα είναι απαραίτητη.
@@ -76,12 +79,12 @@ DispatchVerb=Αποστολή
 StockLimitShort=Όριο για ειδοποιήσεις
 StockLimit=Όριο ειδοποιήσεων για το απόθεμα
 StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
-PhysicalStock=Φυσικό απόθεμα
+PhysicalStock=Physical Stock
 RealStock=Real Χρηματιστήριο
-RealStockDesc=Physical or real stock is the stock you currently have into your internal warehouses/emplacements.
-RealStockWillAutomaticallyWhen=The real stock will automatically change according to this rules (see stock module setup to change this):
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Εικονική απόθεμα
-VirtualStockDesc=Virtual stock is the stock you will get once all open pending actions that affect stocks will be closed (supplier order received, customer order shipped, ...)
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
 IdWarehouse=Id αποθήκη
 DescWareHouse=Αποθήκη Περιγραφή
 LieuWareHouse=Αποθήκη Localisation
@@ -101,7 +104,7 @@ ThisWarehouseIsPersonalStock=Αυτή η αποθήκη αποτελεί προ
 SelectWarehouseForStockDecrease=Επιλέξτε αποθήκη που θα χρησιμοποιηθεί για μείωση αποθεμάτων
 SelectWarehouseForStockIncrease=Επιλέξτε αποθήκη που θα χρησιμοποιηθεί για αύξηση των αποθεμάτων
 NoStockAction=No stock action
-DesiredStock=Desired optimal stock
+DesiredStock=Desired Stock
 DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
 StockToBuy=Για να παραγγείλετε
 Replenishment=Αναπλήρωση
@@ -114,13 +117,13 @@ CurentSelectionMode=Τρέχουσα μέθοδος επιλογής
 CurentlyUsingVirtualStock=Εικονικό απόθεμα
 CurentlyUsingPhysicalStock=Φυσικό απόθεμα
 RuleForStockReplenishment=Κανόνας για τα αποθέματα αναπλήρωσης
-SelectProductWithNotNullQty=Επιλέξτε τουλάχιστον ένα προϊόν με ποσότητα δεν είναι έγκυρη σε προμηθευτή
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
 AlertOnly= Ειδοποιήσεις μόνο
 WarehouseForStockDecrease=Η αποθήκη <b>%s</b> να να χρησιμοποιηθεί για μείωση αποθεμάτων
 WarehouseForStockIncrease=Η αποθήκη <b>%s</b> θα χρησιμοποιηθεί για την αύξηση των αποθεμάτων
 ForThisWarehouse=Για αυτή την αποθήκη
-ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is a list of all open supplier orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Αναπληρώσεις
 NbOfProductBeforePeriod=Ποσότητα του προϊόντος %s σε απόθεμα πριν από την επιλεγμένη περίοδο (< %s)
 NbOfProductAfterPeriod=Ποσότητα του προϊόντος %s σε απόθεμα πριν από την επιλεγμένη περίοδο (> %s)
@@ -130,10 +133,11 @@ RecordMovement=Record transfer
 ReceivingForSameOrder=Αποδείξεις για αυτή την παραγγελία
 StockMovementRecorded=Οι κινήσεις των αποθεμάτων καταγράφονται
 RuleForStockAvailability=Κανόνες σχετικά με τις απαιτήσεις του αποθέματος
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever is rule for automatic stock change)
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Ετικέτα λογιστικής κίνησης
+TypeMovement=Type of movement
 DateMovement=Date of movement
 InventoryCode=Λογιστική κίνηση ή κωδικός απογραφής
 IsInPackage=Περιεχόμενα συσκευασίας
@@ -143,11 +147,11 @@ ShowWarehouse=Εμφάνιση αποθήκης
 MovementCorrectStock=Διόρθωση αποθέματος για το προϊόν %s
 MovementTransferStock=Μετακίνηση του προϊόντος %s σε μια άλλη αποθήκη
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
 OpenAll=Open for all actions
 OpenInternal=Open only for internal actions
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on supplier order reception
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
 OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
 ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
 ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
@@ -171,16 +175,16 @@ inventoryValidate=Επικυρώθηκε
 inventoryDraft=Σε εξέλιξη
 inventorySelectWarehouse=Warehouse choice
 inventoryConfirmCreate=Δημιουργία
-inventoryOfWarehouse=Inventory for warehouse : %s
-inventoryErrorQtyAdd=Error : one quantity is leaser than zero
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
 inventoryMvtStock=By inventory
 inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Φίλτρο κατηγορίας
-SelectFournisseur=Supplier filter
+SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
 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
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement has date of inventory
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
@@ -195,12 +199,16 @@ AddInventoryProduct=Add product to inventory
 AddProduct=Προσθήκη
 ApplyPMP=Apply PMP
 FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action ?
+ConfirmFlushInventory=Do you confirm this action?
 InventoryFlushed=Inventory flushed
 ExitEditMode=Exit edition
 inventoryDeleteLine=Διαγραφή γραμμής
 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"
+StockSupportServices=Stock management supports Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
 ReceiveProducts=Receive items
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
diff --git a/htdocs/langs/el_GR/website.lang b/htdocs/langs/el_GR/website.lang
index 7ae9d1709c4..cf8c218f6a8 100644
--- a/htdocs/langs/el_GR/website.lang
+++ b/htdocs/langs/el_GR/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/el_GR/withdrawals.lang b/htdocs/langs/el_GR/withdrawals.lang
index 4062bb27a98..3e61ea098c5 100644
--- a/htdocs/langs/el_GR/withdrawals.lang
+++ b/htdocs/langs/el_GR/withdrawals.lang
@@ -12,21 +12,21 @@ WithdrawalsLines=Direct debit order lines
 RequestStandingOrderToTreat=Request for direct debit payment order to process
 RequestStandingOrderTreated=Request for direct debit payment order processed
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Δεν είναι ακόμη δυνατή. Ανακαλούν το καθεστώς πρέπει να ρυθμιστεί ώστε να «πιστωθεί» πριν δηλώσει απόρριψη στις συγκεκριμένες γραμμές.
-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
+NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Ποσό για την απόσυρση
 WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
-ResponsibleUser=Υπεύθυνος χρήστη
+ResponsibleUser=User Responsible
 WithdrawalsSetup=Direct debit payment setup
 WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
-ThirdPartyBankCode=Τρίτο κόμμα τραπεζικός κωδικός
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Ταξινομήστε πιστώνεται
 ClassCreditedConfirm=Είστε σίγουροι ότι θέλετε να χαρακτηρίσει την παραλαβή ως απόσυρση πιστώνεται στον τραπεζικό σας λογαριασμό;
 TransData=Η ημερομηνία αποστολής
@@ -50,7 +50,7 @@ StatusMotif0=Απροσδιόριστο
 StatusMotif1=Ανεπαρκή κεφάλαια
 StatusMotif2=Αίτηση προσβαλλόμενη
 StatusMotif3=No direct debit payment order
-StatusMotif4=Παραγγελία του πελάτη
+StatusMotif4=Sales Order
 StatusMotif5=RIB άχρηστα
 StatusMotif6=Λογαριασμός χωρίς ισορροπία
 StatusMotif7=Δικαστική απόφαση
@@ -66,11 +66,11 @@ NotifyCredit=Πιστωτικές Απόσυρση
 NumeroNationalEmetter=Εθνικό Αριθμός Transmitter
 WithBankUsingRIB=Για τους τραπεζικούς λογαριασμούς που χρησιμοποιούν RIB
 WithBankUsingBANBIC=Για τους τραπεζικούς λογαριασμούς που χρησιμοποιούν IBAN / BIC / SWIFT
-BankToReceiveWithdraw=Bank account to receive direct debit
+BankToReceiveWithdraw=Receiving Bank Account
 CreditDate=Πιστωτικές με
 WithdrawalFileNotCapable=Αδύνατο να δημιουργηθεί το αρχείο παραλαβή απόσυρση για τη χώρα σας %s (η χώρα σας δεν υποστηρίζεται)
-ShowWithdraw=Εμφάνιση Ανάληψη
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Ωστόσο, εάν το τιμολόγιο δεν έχει τουλάχιστον μία πληρωμή απόσυρσης ακόμη σε επεξεργασία, δεν θα πρέπει να οριστεί ως καταβληθέν θα επιτρέψει εκ των προτέρων την απόσυρση από την διαχείριση.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Απόσυρση αρχείο
 SetToStatusSent=Ρυθμίστε την κατάσταση "αποστολή αρχείου"
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Στατιστικά στοιχεία από την κατάσταση των γραμμών
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -87,13 +87,13 @@ 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
+CreditorName=Creditor Name
 SEPAFillForm=(B) Please complete all the fields marked *
 SEPAFormYourName=Το όνομά σας
 SEPAFormYourBAN=Your Bank Account Name (IBAN)
 SEPAFormYourBIC=Your Bank Identifier Code (BIC)
 SEPAFrstOrRecur=Type of payment
-ModeRECUR=Reccurent payment
+ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
@@ -102,6 +102,10 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/es_CL/admin.lang b/htdocs/langs/es_CL/admin.lang
index eab645cdc09..6a15d209266 100644
--- a/htdocs/langs/es_CL/admin.lang
+++ b/htdocs/langs/es_CL/admin.lang
@@ -428,6 +428,13 @@ Permission1202=Crear / Modificar una exportación
 Permission1251=Ejecutar las importaciones masivas de datos externos en la base de datos (carga de datos)
 Permission1321=Exportar facturas, atributos y pagos de clientes
 Permission1322=Reabrir una factura paga
+Permission2414=Exportar acciones / tareas de otros
+Permission2501=Leer / Descargar documentos
+Permission2502=Descargar documentos
+Permission2503=Presentar o eliminar documentos
+Permission2515=Configurar directorios de documentos
+Permission2801=Use el cliente FTP en modo de lectura (navegue y descargue solamente)
+Permission2802=Utilice el cliente FTP en modo de escritura (eliminar o cargar archivos)
 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)
@@ -436,13 +443,6 @@ Permission23001=Leer trabajo programado
 Permission23002=Crear / actualizar trabajo programado
 Permission23003=Eliminar trabajo programado
 Permission23004=Ejecutar trabajo programado
-Permission2414=Exportar acciones / tareas de otros
-Permission2501=Leer / Descargar documentos
-Permission2502=Descargar documentos
-Permission2503=Presentar o eliminar documentos
-Permission2515=Configurar directorios de documentos
-Permission2801=Use el cliente FTP en modo de lectura (navegue y descargue solamente)
-Permission2802=Utilice el cliente FTP en modo de escritura (eliminar o cargar archivos)
 Permission50201=Leer transacciones
 Permission50202=Transacciones de importación
 Permission54001=Impresión
diff --git a/htdocs/langs/es_CO/admin.lang b/htdocs/langs/es_CO/admin.lang
index 313150bca14..88f1d404b80 100644
--- a/htdocs/langs/es_CO/admin.lang
+++ b/htdocs/langs/es_CO/admin.lang
@@ -547,14 +547,6 @@ Permission1181=Leer proveedores
 Permission1202=Crear / Modificar una exportación
 Permission1251=Ejecutar importaciones masivas de datos externos en la base de datos (carga de datos)
 Permission1321=Exportación de facturas de clientes, atributos y pagos.
-Permission20003=Eliminar solicitudes de permiso
-Permission20004=Lea todas las solicitudes de permiso (incluso de usuarios no subordinados)
-Permission20005=Crear / modificar solicitudes de permisos para todos (incluso de usuarios no subordinados)
-Permission20006=Solicitudes de licencia de administrador (configuración y actualización del saldo)
-Permission23001=Leer trabajo programado
-Permission23002=Crear / actualizar trabajo programado
-Permission23003=Eliminar trabajo programado
-Permission23004=Ejecutar trabajo programado
 Permission2401=Leer acciones (eventos o tareas) vinculadas a su cuenta.
 Permission2402=Crear / modificar acciones (eventos o tareas) vinculadas a su cuenta.
 Permission2403=Eliminar acciones (eventos o tareas) vinculadas a su cuenta.
@@ -568,6 +560,14 @@ Permission2503=Presentar o borrar documentos
 Permission2515=Configurar directorios de documentos
 Permission2801=Usar el cliente FTP en modo de lectura (solo navegar y descargar)
 Permission2802=Usar el cliente FTP en modo de escritura (eliminar o cargar archivos)
+Permission20003=Eliminar solicitudes de permiso
+Permission20004=Lea todas las solicitudes de permiso (incluso de usuarios no subordinados)
+Permission20005=Crear / modificar solicitudes de permisos para todos (incluso de usuarios no subordinados)
+Permission20006=Solicitudes de licencia de administrador (configuración y actualización del saldo)
+Permission23001=Leer trabajo programado
+Permission23002=Crear / actualizar trabajo programado
+Permission23003=Eliminar trabajo programado
+Permission23004=Ejecutar trabajo programado
 Permission50201=Leer transacciones
 Permission50202=Transacciones de importación
 Permission54001=Impresión
diff --git a/htdocs/langs/es_EC/admin.lang b/htdocs/langs/es_EC/admin.lang
index 90081f4e9a9..6e52d4ec437 100644
--- a/htdocs/langs/es_EC/admin.lang
+++ b/htdocs/langs/es_EC/admin.lang
@@ -664,16 +664,6 @@ Permission1236=Exportar facturas de proveedores, atributos y pagos.
 Permission1237=Órdenes de compra de exportación y sus detalles.
 Permission1251=Ejecutar importaciones masivas de datos externos en la base de datos (carga de datos)
 Permission1321=Exportar facturas, atributos y pagos de clientes.
-Permission20001=Lea las solicitudes de licencia (su licencia y las de sus subordinados)
-Permission20002=Cree / modifique sus solicitudes de licencia (su licencia y las de sus subordinados)
-Permission20003=Solicitudes de licencia / permiso
-Permission20004=Lea todas las solicitudes de permiso.
-Permission20005=Crear / modificar solicitudes de permiso para todos (incluso para usuarios no subordinados)
-Permission20006=Administrar solicitud de licencia / permiso
-Permission23001=Leer trabajo programado
-Permission23002=Crear / actualizar trabajo programado
-Permission23003=Programa de trabajo
-Permission23004=Ejecutar trabajo programado
 Permission2402=Crear / modificar acciones (eventos o tareas) vinculados a su cuenta
 Permission2403=Borrar acciones (eventos o tareas) vinculados a su cuenta
 Permission2411=Leer acciones.
@@ -685,6 +675,16 @@ Permission2502=Descargar documentos
 Permission2515=Configuración de los documentos
 Permission2801=Utilizar cliente FTP en modo de lectura (sólo navegar y descargar)
 Permission2802=Utilizar cliente FTP en modo de escritura (borrar o subir archivos)
+Permission20001=Lea las solicitudes de licencia (su licencia y las de sus subordinados)
+Permission20002=Cree / modifique sus solicitudes de licencia (su licencia y las de sus subordinados)
+Permission20003=Solicitudes de licencia / permiso
+Permission20004=Lea todas las solicitudes de permiso.
+Permission20005=Crear / modificar solicitudes de permiso para todos (incluso para usuarios no subordinados)
+Permission20006=Administrar solicitud de licencia / permiso
+Permission23001=Leer trabajo programado
+Permission23002=Crear / actualizar trabajo programado
+Permission23003=Programa de trabajo
+Permission23004=Ejecutar trabajo programado
 Permission50101=Use el punto de venta
 Permission50201=Leer transacciones
 Permission50202=Importar transacciones
diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang
index 75d170e4bae..f80257a135c 100644
--- a/htdocs/langs/es_ES/accountancy.lang
+++ b/htdocs/langs/es_ES/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Consulte aquí el listado de clientes y proveedores y sus c
 ListAccounts=Listado de cuentas contables
 UnknownAccountForThirdparty=Cuenta contable de tercero desconocida, usaremos %s
 UnknownAccountForThirdpartyBlocking=Cuenta contable de tercero desconocida. Error de bloqueo
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Cuenta del tercero desconocida o tercero desconocido. Error de bloqueo
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Cuenta del tercero desconocida o tercero desconocido. Error de bloqueo
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Cuenta del tercero desconocida y cuenta de espera no definida. Error de bloqueo
 PaymentsNotLinkedToProduct=Pagos no vinculados a un producto/servicio
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Eportar a Cogilog
 Modelcsv_agiris=Exportar a Agiris
 Modelcsv_openconcerto=Exportar a OpenConcerto (En pruebas)
 Modelcsv_configurable=Exportación CSV Configurable
-Modelcsv_FEC=Exportación FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Exportación a Sage 50 Suiza
 ChartofaccountsId=Id plan contable
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Sin cuenta dedicada válida
 WithValidAccount=Con cuenta dedicada válida
 ValueNotIntoChartOfAccount=Este valor de cuenta contable no existe en el plan general contable
 AccountRemovedFromGroup=Cuenta eliminada del grupo
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Rango de cuenta contable
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=No es posible autodetectar, utilice el menú <a href=
 
 ## Import
 ImportAccountingEntries=Entradas contables
-
+DateExport=Date export
 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=Informe de gastos diario
 InventoryJournal=Inventario
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 530bca323a5..50c267efd41 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=Esta área ofrece distintas funciones de administración. Ut
 Purge=Purga
 PurgeAreaDesc=Esta página le permite borrar todos los archivos generados o almacenados por Dolibarr (archivos temporales o todos los archivos del directorio <b>%s</b>). El uso de esta función no es necesaria. Se proporciona como solución para los usuarios cuyos Dolibarr se encuentran en un proveedor que no ofrece permisos para eliminar los archivos generados por el servidor web.
 PurgeDeleteLogFile=Eliminar archivos de registro, incluidos <b> %s</b> definidos por el módulo Syslog (sin riesgo de perder datos)
-PurgeDeleteTemporaryFiles=Eliminar todos los ficheros temporales (sin riesgo de perdida de datos)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Eliminar archivos temporales
 PurgeDeleteAllFilesInDocumentsDir=Eliminar todos los archivos del directorio <b>%s</b>. Serán eliminados archivos temporales y archivos relacionados con elementos (terceros, facturas, etc.), archivos subidos al módulo GED, copias de seguridad de la base de datos y archivos temporales.
 PurgeRunNow=Purgar
@@ -804,6 +804,7 @@ Permission401=Consultar haberes
 Permission402=Crear/modificar haberes
 Permission403=Validar haberes
 Permission404=Eliminar haberes
+Permission430=Use Debug Bar
 Permission511=Consultar pagos de salarios
 Permission512=Crear/modificar pagos de salarios
 Permission514=Eliminar pagos de salarios
@@ -818,6 +819,9 @@ Permission532=Crear/modificar servicios
 Permission534=Eliminar servicios
 Permission536=Ver/gestionar los servicios ocultos
 Permission538=Exportar servicios
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Consultar donaciones
 Permission702=Crear/modificar donaciones
 Permission703=Eliminar donaciones
@@ -837,6 +841,12 @@ Permission1101=Consultar ordenes de envío
 Permission1102=Crear/modificar ordenes de envío
 Permission1104=Validar orden de envío
 Permission1109=Eliminar orden de envío
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Consultar proveedores
 Permission1182=Leer pedidos de compra
 Permission1183=Crear/modificar pedidos a proveedores
@@ -859,16 +869,6 @@ Permission1251=Lanzar las importaciones en masa a la base de datos (carga de dat
 Permission1321=Exportar facturas a clientes, campos adicionales y cobros
 Permission1322=Reabrir una factura pagada
 Permission1421=Exportar pedidos y atributos
-Permission20001=Leer peticiones días líbres (suyos y subordinados)
-Permission20002=Crear/modificar peticiones días libres (suyos y de sus subordinados)
-Permission20003=Eliminar peticiones de días retribuidos
-Permission20004=Leer todas las peticiones de días retribuidos (incluso no subordinados)
-Permission20005=Crear/modificar las peticiones de días retribuidos para todos (incluso no subordinados)
-Permission20006=Administrar días retribuidos (configuración y actualización de balance)
-Permission23001=Consultar Trabajo programado
-Permission23002=Crear/actualizar Trabajo programado
-Permission23003=Borrar Trabajo Programado
-Permission23004=Ejecutar Trabajo programado
 Permission2401=Leer acciones (eventos o tareas) vinculadas a su cuenta
 Permission2402=Crear/modificar acciones (eventos o tareas) vinculadas a su cuenta
 Permission2403=Eliminar acciones (eventos o tareas) vinculadas a su cuenta
@@ -882,9 +882,41 @@ Permission2503=Enviar o eliminar documentos
 Permission2515=Configuración directorios de documentos
 Permission2801=Utilizar el cliente FTP en modo lectura (sólo explorar y descargar)
 Permission2802=Utilizar el cliente FTP en modo escritura (borrar o subir archivos)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Leer peticiones días líbres (suyos y subordinados)
+Permission20002=Crear/modificar peticiones días libres (suyos y de sus subordinados)
+Permission20003=Eliminar peticiones de días retribuidos
+Permission20004=Leer todas las peticiones de días retribuidos (incluso no subordinados)
+Permission20005=Crear/modificar las peticiones de días retribuidos para todos (incluso no subordinados)
+Permission20006=Administrar días retribuidos (configuración y actualización de balance)
+Permission23001=Consultar Trabajo programado
+Permission23002=Crear/actualizar Trabajo programado
+Permission23003=Borrar Trabajo Programado
+Permission23004=Ejecutar Trabajo programado
 Permission50101=Utilizar TPV
 Permission50201=Consultar las transacciones
 Permission50202=Importar las transacciones
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Imprimir
 Permission55001=Leer encuestas
 Permission55002=Crear/modificar encuestas
@@ -1078,7 +1110,7 @@ AreaForAdminOnly=Los parámetros de configuración solamente pueden ser tratados
 SystemInfoDesc=La información del sistema es información técnica accesible solamente en solo lectura a los administradores.
 SystemAreaForAdminOnly=Esta área está disponible solo para usuarios administradores. Los permisos de usuario de Dolibarr no pueden cambiar esta restricción.
 CompanyFundationDesc=Edite la información de la empresa o institución. Haga clic en el botón "%s" o "%s" a pié de página
-AccountantDesc=Edite los detalles de su contable/auditor
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Código contable
 DisplayDesc=Los parámetros que afectan el aspecto y el comportamiento de Dolibarr se pueden modificar aquí.
 AvailableModules=Módulos disponibles
@@ -1891,3 +1923,5 @@ IFTTTDesc=Este módulo está diseñado para desencadenar eventos en IFTTT y/o pa
 UrlForIFTTT=URL endpoint de IFTTT
 YouWillFindItOnYourIFTTTAccount=Lo encontrará en su cuenta de IFTTT.
 EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/es_ES/banks.lang b/htdocs/langs/es_ES/banks.lang
index 0da047d7b2e..c78e0f4fbd3 100644
--- a/htdocs/langs/es_ES/banks.lang
+++ b/htdocs/langs/es_ES/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=No reconciliado
 CustomerInvoicePayment=Cobro a cliente
 SupplierInvoicePayment=Pago a proveedor
 SubscriptionPayment=Pago cuota
-WithdrawalPayment=Cobro de domiciliación
+WithdrawalPayment=Domiciliación
 SocialContributionPayment=Pago impuesto social/fiscal
 BankTransfer=Transferencia bancaria
 BankTransfers=Transferencias bancarias
diff --git a/htdocs/langs/es_ES/cashdesk.lang b/htdocs/langs/es_ES/cashdesk.lang
index b287ad1f041..0fd77fcbbac 100644
--- a/htdocs/langs/es_ES/cashdesk.lang
+++ b/htdocs/langs/es_ES/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Número de terminales
 TerminalSelect=Seleccione el terminal que desea usar:
 POSTicket=Ticket POS
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/es_ES/mails.lang b/htdocs/langs/es_ES/mails.lang
index a85ba7323a6..3ec73be0883 100644
--- a/htdocs/langs/es_ES/mails.lang
+++ b/htdocs/langs/es_ES/mails.lang
@@ -78,9 +78,9 @@ GroupEmails=E-mail grupales
 OneEmailPerRecipient=Un e-mail por destinatario (de forma predeterminada, un e-mail por registro seleccionado)
 WarningIfYouCheckOneRecipientPerEmail=Atención: Si marca esta casilla, significa que solo se enviará un e-mail para varios registros diferentes seleccionados, por lo tanto, si su mensaje contiene variables de sustitución que hacen referencia a los datos de un registro, no será posible reemplazarlos.
 ResultOfMailSending=Resultado del envío masivo de e-mails
-NbSelected=Nº seleccionados
-NbIgnored=Nº ignorados
-NbSent=Nº enviados
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number 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
diff --git a/htdocs/langs/es_ES/members.lang b/htdocs/langs/es_ES/members.lang
index a17afd53629..369def6ea99 100644
--- a/htdocs/langs/es_ES/members.lang
+++ b/htdocs/langs/es_ES/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=Elija las estadísticas que desea consultar...
 MenuMembersStats=Estadísticas
 LastMemberDate=Última fecha de miembro
 LatestSubscriptionDate=Fecha de la última cotización
-Nature=Naturaleza
+MemberNature=Nature of member
 Public=Información pública
 NewMemberbyWeb=Nuevo miembro añadido. En espera de validación
 NewMemberForm=Formulario de inscripción
diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang
index bc67a8032d7..26f341e862a 100644
--- a/htdocs/langs/es_ES/products.lang
+++ b/htdocs/langs/es_ES/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Precios de proveedores
 SuppliersPricesOfProductsOrServices=Precios de proveedores (productos o servicios)
 CustomCode=Código aduanero
 CountryOrigin=País de origen
-Nature=Naturaleza
+Nature=Nature of produt (material/finished)
 ShortLabel=Etiqueta corta
 Unit=Unidad
 p=u.
diff --git a/htdocs/langs/es_ES/salaries.lang b/htdocs/langs/es_ES/salaries.lang
index f1d2db6ec65..741fff7e2a4 100644
--- a/htdocs/langs/es_ES/salaries.lang
+++ b/htdocs/langs/es_ES/salaries.lang
@@ -17,3 +17,5 @@ TJMDescription=Este valor actualmente es informativo y no se utiliza para realiz
 LastSalaries=Últimos %s pagos salariales
 AllSalaries=Todos los pagos salariales
 SalariesStatistics=Estadísticas salariales
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/es_ES/stocks.lang b/htdocs/langs/es_ES/stocks.lang
index 2595ff1752e..017b503b915 100644
--- a/htdocs/langs/es_ES/stocks.lang
+++ b/htdocs/langs/es_ES/stocks.lang
@@ -66,10 +66,12 @@ RuleForStockManagementIncrease=Regla para el aumento automático de stocks (el a
 DeStockOnBill=Decrementar los stocks físicos sobre las facturas/abonos a clientes
 DeStockOnValidateOrder=Decrementar el stock real en la validación los pedidos de clientes
 DeStockOnShipment=Decrementar stock real en la validación de envíos
-DeStockOnShipmentOnClosing=Decrementar stock real en el cierre del envío
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
 ReStockOnBill=Incrementar el stock real en la validación de las facturas/abonos de proveedores
 ReStockOnValidateOrder=Incrementar los stocks físicos en la aprobación de pedidos a proveedores
 ReStockOnDispatchOrder=Incrementa el stock real en el desglose manual de la recepción de los pedidos a proveedores
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=El pedido aún no está o no tiene un estado que permita un desglose de stock.
 StockDiffPhysicTeoric=Motivo de la diferencia entre valores físicos y teóricos
 NoPredefinedProductToDispatch=No hay productos predefinidos en este objeto. Por lo tanto no se puede realizar un desglose de stock.
diff --git a/htdocs/langs/es_ES/website.lang b/htdocs/langs/es_ES/website.lang
index b9dfcea43e5..8e33637f714 100644
--- a/htdocs/langs/es_ES/website.lang
+++ b/htdocs/langs/es_ES/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=No tiene permiso para agregar o editar contenido d
 ReplaceWebsiteContent=Reemplazar el contenido del sitio web
 DeleteAlsoJs=¿Eliminar también todos los archivos javascript específicos de este sitio web?
 DeleteAlsoMedias=¿Eliminar también todos los archivos de medios específicos de este sitio web?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/es_ES/withdrawals.lang b/htdocs/langs/es_ES/withdrawals.lang
index b1bf74f9013..c82b2821aa9 100644
--- a/htdocs/langs/es_ES/withdrawals.lang
+++ b/htdocs/langs/es_ES/withdrawals.lang
@@ -69,8 +69,8 @@ WithBankUsingBANBIC=Para las cuentas bancarias que utilizan el código BAN/BIC/S
 BankToReceiveWithdraw=Cuenta bancaria para recibir la domiciliación
 CreditDate=Abonada el
 WithdrawalFileNotCapable=No es posible generar el fichero bancario de domiciliación para el país %s (El país no está soportado)
-ShowWithdraw=Ver domiciliación
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Sin embargo, si la factura tiene pendiente algún pago por domiciliación, no será cerrada para permitir la gestión de la domiciliación.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=Esta pestaña le permite realizar una petición de domiciliación. Una vez realizadas las peticiones, vaya al menú Bancos->Domiciliaciones para gestionar la domiciliación. Al cerrar una domiciliación, los pagos de las facturas se registrarán automáticamente, y las facturas completamente pagadas serán cerradas.
 WithdrawalFile=Archivo de la domiciliación
 SetToStatusSent=Clasificar como "Archivo enviado"
diff --git a/htdocs/langs/es_VE/admin.lang b/htdocs/langs/es_VE/admin.lang
index 878e85bb2e9..9d3c0f25368 100644
--- a/htdocs/langs/es_VE/admin.lang
+++ b/htdocs/langs/es_VE/admin.lang
@@ -8,9 +8,9 @@ Permission254=Modificar la contraseña de otros usuarios
 Permission255=Eliminar o desactivar otros usuarios
 Permission256=Consultar sus permisos
 Permission1321=Exportar facturas a clientes, atributos y cobros
-Permission20003=Eliminar peticiones de días libres retribuidos
 Permission2402=Crear/eliminar acciones (eventos o tareas) vinculadas a su cuenta
 Permission2403=Modificar acciones (eventos o tareas) vinculadas a su cuenta
+Permission20003=Eliminar peticiones de días libres retribuidos
 DictionaryProspectStatus=Estado prospección
 ExtraFields=Atributos adicionales
 ExtraFieldsLines=Atributos adicionales (líneas)
diff --git a/htdocs/langs/et_EE/accountancy.lang b/htdocs/langs/et_EE/accountancy.lang
index f103f951d34..f06e0291439 100644
--- a/htdocs/langs/et_EE/accountancy.lang
+++ b/htdocs/langs/et_EE/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Consult here the list of third-party customers and vendors
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third-party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
-Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Without valid dedicated account
 WithValidAccount=With valid dedicated account
 ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
 AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Range of accounting account
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
-
+DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang
index f7cd5a80968..89b4189f8ab 100644
--- a/htdocs/langs/et_EE/admin.lang
+++ b/htdocs/langs/et_EE/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Tühjenda
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Kustuta kõik ajutised failid (andmekao riski pole)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Tühjenda nüüd
@@ -804,6 +804,7 @@ Permission401=Allahindluste vaatamine
 Permission402=Allahindluste loomine/muutmine
 Permission403=Allahindluste kinnitamine
 Permission404=Allahindluste kustutamine
+Permission430=Use Debug Bar
 Permission511=Read payments of salaries
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
@@ -818,6 +819,9 @@ Permission532=Teenuste loomine/muutmine
 Permission534=Teenuste kustutamine
 Permission536=Peidetud teenuste vaatamine/haldamine
 Permission538=Teenuste eksport
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Annetuste vaatamine
 Permission702=Annetuste loomine/muutmine
 Permission703=Annetuste kustutamine
@@ -837,6 +841,12 @@ Permission1101=Tarnekorralduste vaatamine
 Permission1102=Tarnekorralduste loomine/muutmine
 Permission1104=Tarnekorralduste kinnitamine
 Permission1109=Tarnekorralduste kustutamine
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Hankijate vaatamine
 Permission1182=Read purchase orders
 Permission1183=Create/modify purchase orders
@@ -859,16 +869,6 @@ Permission1251=Väliste andmete massiline import andmebaasi (andmete laadimine)
 Permission1321=Müügiarvete, atribuutide ja maksete eksport
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those 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)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
 Permission2401=Oma kontoga seotud juhtumite (tegevuste või ülesannete) vaatamine
 Permission2402=Oma kontoga seotud juhtumite (tegevuste või ülesannete) loomine/muutmine
 Permission2403=Oma kontoga seotud juhtumite (tegevuste või ülesannete) kustutamine
@@ -882,9 +882,41 @@ Permission2503=Dokumentide üles laadimine või kustutamine
 Permission2515=Dokumendikaustade seadistamine
 Permission2801=FTP kliendi kasutamine lugemisrežiimis (ainult sirvimine ja alla laadimine)
 Permission2802=FTP kliendi kasutamine kirjutusrežiimis (failide kustutamine või üles laadimine)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those 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)
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale
 Permission50201=Tehingute vaatamine
 Permission50202=Tehingute impor
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Prindi
 Permission55001=Küsitluste vaatamine
 Permission55002=Küsitluste loomine/muutmine
@@ -1078,7 +1110,7 @@ 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=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
-AccountantDesc=Edit the details of your accountant/bookkeeper
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
@@ -1891,3 +1923,5 @@ IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute s
 UrlForIFTTT=URL endpoint for IFTTT
 YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/et_EE/banks.lang b/htdocs/langs/et_EE/banks.lang
index 7a04075f18e..91cd2cc0f24 100644
--- a/htdocs/langs/et_EE/banks.lang
+++ b/htdocs/langs/et_EE/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=Not reconciled
 CustomerInvoicePayment=Kliendi laekumi
 SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Liikmemaks
-WithdrawalPayment=Väljamakse
+WithdrawalPayment=Debit payment order
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Pangaülekanne
 BankTransfers=Pangaülekanded
diff --git a/htdocs/langs/et_EE/cashdesk.lang b/htdocs/langs/et_EE/cashdesk.lang
index 41eeabff320..13c13db56f8 100644
--- a/htdocs/langs/et_EE/cashdesk.lang
+++ b/htdocs/langs/et_EE/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/et_EE/mails.lang b/htdocs/langs/et_EE/mails.lang
index 7979953065e..124100ca5fc 100644
--- a/htdocs/langs/et_EE/mails.lang
+++ b/htdocs/langs/et_EE/mails.lang
@@ -19,6 +19,8 @@ MailTopic=Email topic
 MailText=Sõnum
 MailFile=Manustatud failid
 MailMessage=E-kirja sisu
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
 ShowEMailing=Näita e-postitust
 ListOfEMailings=E-postituste nimekiri
 NewMailing=Uus e-postitus
@@ -76,9 +78,9 @@ GroupEmails=Group emails
 OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
 WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
 ResultOfMailSending=Result of mass Email sending
-NbSelected=No. selected
-NbIgnored=No. ignored
-NbSent=No. sent
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
diff --git a/htdocs/langs/et_EE/members.lang b/htdocs/langs/et_EE/members.lang
index 7c9cbdc4dd8..166f365aaa5 100644
--- a/htdocs/langs/et_EE/members.lang
+++ b/htdocs/langs/et_EE/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=Vali soovitud statistika...
 MenuMembersStats=Statistika
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
-Nature=Loomus
+MemberNature=Nature of member
 Public=Informatsioon on avalik
 NewMemberbyWeb=Uus liige lisatud, ootab heaks kiitmist
 NewMemberForm=Uue liikme vorm
diff --git a/htdocs/langs/et_EE/products.lang b/htdocs/langs/et_EE/products.lang
index df57806e5e2..5eb54c89bf3 100644
--- a/htdocs/langs/et_EE/products.lang
+++ b/htdocs/langs/et_EE/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Päritolumaa
-Nature=Product Type (material/finished)
+Nature=Nature of produt (material/finished)
 ShortLabel=Short label
 Unit=Ühik
 p=u.
diff --git a/htdocs/langs/et_EE/salaries.lang b/htdocs/langs/et_EE/salaries.lang
index d0f6afeb0a5..d3ee991fc6e 100644
--- a/htdocs/langs/et_EE/salaries.lang
+++ b/htdocs/langs/et_EE/salaries.lang
@@ -1,18 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger 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_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
 Salary=Palk
 Salaries=Palgad
 NewSalaryPayment=Uus palga makse
+AddSalaryPayment=Add salary payment
 SalaryPayment=Palga makse
 SalariesPayments=Palkade maksed
 ShowSalaryPayment=Näita palga makset
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
-THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
-TJMDescription=This value is currently as information only and is not used for any calculation
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
-SalariesStatistics=Statistiques salaires
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/et_EE/stocks.lang b/htdocs/langs/et_EE/stocks.lang
index d937f6dc8da..8acea661093 100644
--- a/htdocs/langs/et_EE/stocks.lang
+++ b/htdocs/langs/et_EE/stocks.lang
@@ -3,7 +3,7 @@ WarehouseCard=Lao kaart
 Warehouse=Ladu
 Warehouses=Laod
 ParentWarehouse=Parent warehouse
-NewWarehouse=Uus ladu/laojäägi ala
+NewWarehouse=New warehouse / Stock Location
 WarehouseEdit=Muuda ladu
 MenuNewWarehouse=Uus ladu
 WarehouseSource=Lähteladu
@@ -29,6 +29,8 @@ MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
 Location=Asukoht
 LocationSummary=Asukoha lühike nimi
 NumberOfDifferentProducts=Erinevate toodete arv
@@ -44,7 +46,6 @@ TransferStock=Transfer stock
 MassStockTransferShort=Mass stock transfer
 StockMovement=Stock movement
 StockMovements=Stock movements
-LabelMovement=Liikumise silt
 NumberOfUnit=Ühikute arv
 UnitPurchaseValue=Ühiku ostuhind
 StockTooLow=Laojääk on liiga madal
@@ -54,21 +55,23 @@ PMPValue=Kaalutud keskmine hind
 PMPValueShort=KKH
 EnhancedValueOfWarehouses=Ladude väärtus
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Allow to add limit and desired stock per couple (product, warehouse) instead of per product
-IndependantSubProductStock=Product stock and subproduct stock are independant
+AllowAddLimitStockByWarehouse=Manage also values for minimum and desired stock per pairing (product-warehouse) in addition to values per product
+IndependantSubProductStock=Product stock and subproduct stock are independent
 QtyDispatched=Saadetud kogus
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
-RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
-DeStockOnBill=Vähenda reaalset laojääki müügiarve/kreeditarve kinnitamisel
-DeStockOnValidateOrder=Vähenda reaalset laojääki müügitellimuse kinnitamisel
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
 DeStockOnShipment=Decrease real stocks on shipping validation
-DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification closed
-ReStockOnBill=Suurenda reaalset laojääki ostuarvete/kreeditarvete kinnitamisel
-ReStockOnValidateOrder=Increase real stocks on purchase orders approbation
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=Tellimus kas ei ole veel jõudnud või ei ole enam staatuses, mis lubab toodete lattu saatmist.
 StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
 NoPredefinedProductToDispatch=Selle objektiga ei ole seotud ettemääratud tooteid, seega ei ole vaja laojäägi saatmist.
@@ -76,12 +79,12 @@ DispatchVerb=Saada
 StockLimitShort=Hoiatuse piir
 StockLimit=Koguse piir hoiatuseks
 StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
-PhysicalStock=Füüsiline laojääk
+PhysicalStock=Physical Stock
 RealStock=Reaalne laojääk
-RealStockDesc=Physical or real stock is the stock you currently have into your internal warehouses/emplacements.
-RealStockWillAutomaticallyWhen=The real stock will automatically change according to this rules (see stock module setup to change this):
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtuaalne laojääk
-VirtualStockDesc=Virtual stock is the stock you will get once all open pending actions that affect stocks will be closed (supplier order received, customer order shipped, ...)
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
 IdWarehouse=Lao ID
 DescWareHouse=Lao kirjeldus
 LieuWareHouse=Lao lokaliseerimine
@@ -101,7 +104,7 @@ ThisWarehouseIsPersonalStock=See ladu esitab isiklikku varu, mis kuulub üksusel
 SelectWarehouseForStockDecrease=Vali laojäägi vähendamiseks kasutatav ladu
 SelectWarehouseForStockIncrease=Vali laojäägi suurendamiseks kasutatav ladu
 NoStockAction=Laojäägi tegevust ei ole
-DesiredStock=Desired optimal stock
+DesiredStock=Desired Stock
 DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
 StockToBuy=Tellida
 Replenishment=Värskendamine
@@ -114,13 +117,13 @@ CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtuaalne laojääk
 CurentlyUsingPhysicalStock=Füüsiline laojääk
 RuleForStockReplenishment=Laojäägi värskendamise reegel
-SelectProductWithNotNullQty=Vali vähemalt üks toode, mille kogus ei ole null ja millel on hankija
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
 AlertOnly= Ainult hoiatused
 WarehouseForStockDecrease=Laojäägi vähendamiseks kasutatakse ladu <b>%s</b>
 WarehouseForStockIncrease=Laojäägi suurendamiseks kasutatakse ladu <b>%s</b>
 ForThisWarehouse=Antud lao tarbeks
-ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is a list of all open supplier orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Värskendamised
 NbOfProductBeforePeriod=Toote %s laojääk enne valitud perioodi (< %s)
 NbOfProductAfterPeriod=Toote %s laojääk pärast valitud perioodi (> %s)
@@ -130,10 +133,11 @@ RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever is rule for automatic stock change)
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
+TypeMovement=Type of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -143,11 +147,11 @@ ShowWarehouse=Näita ladu
 MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
 OpenAll=Open for all actions
 OpenInternal=Open only for internal actions
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on supplier order reception
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
 OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
 ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
 ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
@@ -171,16 +175,16 @@ inventoryValidate=Kinnitatud
 inventoryDraft=Aktiivne
 inventorySelectWarehouse=Warehouse choice
 inventoryConfirmCreate=Loo
-inventoryOfWarehouse=Inventory for warehouse : %s
-inventoryErrorQtyAdd=Error : one quantity is leaser than zero
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
 inventoryMvtStock=By inventory
 inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Kategooriate filter
-SelectFournisseur=Supplier filter
+SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
 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
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement has date of inventory
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
@@ -195,12 +199,16 @@ AddInventoryProduct=Add product to inventory
 AddProduct=Lisa
 ApplyPMP=Apply PMP
 FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action ?
+ConfirmFlushInventory=Do you confirm this action?
 InventoryFlushed=Inventory flushed
 ExitEditMode=Exit edition
 inventoryDeleteLine=Kustuta rida
 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"
+StockSupportServices=Stock management supports Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
 ReceiveProducts=Receive items
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
diff --git a/htdocs/langs/et_EE/website.lang b/htdocs/langs/et_EE/website.lang
index 1bea0f4c586..6d82202b241 100644
--- a/htdocs/langs/et_EE/website.lang
+++ b/htdocs/langs/et_EE/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/et_EE/withdrawals.lang b/htdocs/langs/et_EE/withdrawals.lang
index 0636e5a468c..529e07d3ffe 100644
--- a/htdocs/langs/et_EE/withdrawals.lang
+++ b/htdocs/langs/et_EE/withdrawals.lang
@@ -12,21 +12,21 @@ 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
+NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Väljamaksmise summa
 WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
-ResponsibleUser=Vastutav kasutaja
+ResponsibleUser=User Responsible
 WithdrawalsSetup=Direct debit payment setup
 WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
-ThirdPartyBankCode=Kolmanda isiku pangakood
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Määra krediteerituks
 ClassCreditedConfirm=Kas oled kindel, et soovid selle väljamakse kviitungi liigitada pangakontole krediteerituks?
 TransData=Saatmise kuupäev
@@ -50,7 +50,7 @@ StatusMotif0=Määramata
 StatusMotif1=Pole piisavalt raha
 StatusMotif2=Nõue vaidlustatud
 StatusMotif3=No direct debit payment order
-StatusMotif4=Kliendi tellimus
+StatusMotif4=Sales Order
 StatusMotif5=RIB pole kasutuskõlbulik
 StatusMotif6=Saldota konto
 StatusMotif7=Kohtuotsus
@@ -66,11 +66,11 @@ NotifyCredit=Väljamakse kreedit
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=Pankadele, mis kasutavad RIB
 WithBankUsingBANBIC=Pankadele, mis kasutavad IBAN/BIC/SWIFT
-BankToReceiveWithdraw=Bank account to receive direct debit
+BankToReceiveWithdraw=Receiving Bank Account
 CreditDate=Krediteeri
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
-ShowWithdraw=Näita väljamakset
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Juhul kui arvel on vähemalt üks töötlemata väljamakse, ei märgita seda makstuks, et lubada eelnevat väljamakse haldamist.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Väljamaksete fail
 SetToStatusSent=Märgi staatuseks 'Fail saadetud'
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -87,13 +87,13 @@ 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
+CreditorName=Creditor Name
 SEPAFillForm=(B) Please complete all the fields marked *
 SEPAFormYourName=Sinu nimi
 SEPAFormYourBAN=Your Bank Account Name (IBAN)
 SEPAFormYourBIC=Your Bank Identifier Code (BIC)
 SEPAFrstOrRecur=Type of payment
-ModeRECUR=Reccurent payment
+ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
@@ -102,6 +102,10 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/eu_ES/accountancy.lang b/htdocs/langs/eu_ES/accountancy.lang
index daa5b4ef413..bb141cb9eb0 100644
--- a/htdocs/langs/eu_ES/accountancy.lang
+++ b/htdocs/langs/eu_ES/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Consult here the list of third-party customers and vendors
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third-party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
-Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Without valid dedicated account
 WithValidAccount=With valid dedicated account
 ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
 AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Range of accounting account
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
-
+DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang
index 5231c6df643..085961d7266 100644
--- a/htdocs/langs/eu_ES/admin.lang
+++ b/htdocs/langs/eu_ES/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Garbitu
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Orain garbitu
@@ -804,6 +804,7 @@ Permission401=Read discounts
 Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
+Permission430=Use Debug Bar
 Permission511=Read payments of salaries
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
@@ -818,6 +819,9 @@ Permission532=Create/modify services
 Permission534=Delete services
 Permission536=See/manage hidden services
 Permission538=Export services
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
@@ -837,6 +841,12 @@ Permission1101=Read delivery orders
 Permission1102=Create/modify delivery orders
 Permission1104=Validate delivery orders
 Permission1109=Delete delivery orders
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Read suppliers
 Permission1182=Read purchase orders
 Permission1183=Create/modify purchase orders
@@ -859,16 +869,6 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those 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)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
 Permission2401=Read actions (events or tasks) linked to his account
 Permission2402=Create/modify actions (events or tasks) linked to his account
 Permission2403=Delete actions (events or tasks) linked to his account
@@ -882,9 +882,41 @@ Permission2503=Dokumentuak bidali edo ezabatzea
 Permission2515=Dokumentuen karpetak konfiguratzea
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those 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)
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale
 Permission50201=Read transactions
 Permission50202=Import transactions
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Print
 Permission55001=Read polls
 Permission55002=Create/modify polls
@@ -1078,7 +1110,7 @@ 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 to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
-AccountantDesc=Edit the details of your accountant/bookkeeper
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
@@ -1891,3 +1923,5 @@ IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute s
 UrlForIFTTT=URL endpoint for IFTTT
 YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/eu_ES/banks.lang b/htdocs/langs/eu_ES/banks.lang
index 9cc27478cf9..e54d9c5be14 100644
--- a/htdocs/langs/eu_ES/banks.lang
+++ b/htdocs/langs/eu_ES/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
 SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Subscription payment
-WithdrawalPayment=Withdrawal payment
+WithdrawalPayment=Debit payment order
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
diff --git a/htdocs/langs/eu_ES/cashdesk.lang b/htdocs/langs/eu_ES/cashdesk.lang
index f1b50e4ffab..bc5e9f2763a 100644
--- a/htdocs/langs/eu_ES/cashdesk.lang
+++ b/htdocs/langs/eu_ES/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/eu_ES/mails.lang b/htdocs/langs/eu_ES/mails.lang
index 5cf441c72ef..b5947e9b94d 100644
--- a/htdocs/langs/eu_ES/mails.lang
+++ b/htdocs/langs/eu_ES/mails.lang
@@ -19,6 +19,8 @@ MailTopic=Email topic
 MailText=Mezua
 MailFile=Attached files
 MailMessage=Email body
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
 ShowEMailing=Show emailing
 ListOfEMailings=List of emailings
 NewMailing=New emailing
@@ -76,9 +78,9 @@ GroupEmails=Group emails
 OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
 WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
 ResultOfMailSending=Result of mass Email sending
-NbSelected=No. selected
-NbIgnored=No. ignored
-NbSent=No. sent
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
diff --git a/htdocs/langs/eu_ES/members.lang b/htdocs/langs/eu_ES/members.lang
index 9f72095351e..abe20775611 100644
--- a/htdocs/langs/eu_ES/members.lang
+++ b/htdocs/langs/eu_ES/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
-Nature=Nature
+MemberNature=Nature of member
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
diff --git a/htdocs/langs/eu_ES/products.lang b/htdocs/langs/eu_ES/products.lang
index 926e97d0a30..ed5d9ec76b6 100644
--- a/htdocs/langs/eu_ES/products.lang
+++ b/htdocs/langs/eu_ES/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
-Nature=Product Type (material/finished)
+Nature=Nature of produt (material/finished)
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/eu_ES/salaries.lang b/htdocs/langs/eu_ES/salaries.lang
index 1d4ebd7f54f..f73ea288346 100644
--- a/htdocs/langs/eu_ES/salaries.lang
+++ b/htdocs/langs/eu_ES/salaries.lang
@@ -1,18 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger 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_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
 Salary=Soldata
 Salaries=Soldatak
 NewSalaryPayment=Soldata ordainketa berria
+AddSalaryPayment=Add salary payment
 SalaryPayment=Soldata ordainketa
 SalariesPayments=Soldaten ordainketak
 ShowSalaryPayment=Soldataren ordainketa erakutsi
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
-THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
-TJMDescription=This value is currently as information only and is not used for any calculation
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
-SalariesStatistics=Statistiques salaires
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/eu_ES/stocks.lang b/htdocs/langs/eu_ES/stocks.lang
index 1e704eacc2d..d7552515516 100644
--- a/htdocs/langs/eu_ES/stocks.lang
+++ b/htdocs/langs/eu_ES/stocks.lang
@@ -3,7 +3,7 @@ WarehouseCard=Warehouse card
 Warehouse=Warehouse
 Warehouses=Warehouses
 ParentWarehouse=Parent warehouse
-NewWarehouse=New warehouse / Stock area
+NewWarehouse=New warehouse / Stock Location
 WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
 WarehouseSource=Source warehouse
@@ -29,6 +29,8 @@ MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
 Location=Kokapena
 LocationSummary=Short name location
 NumberOfDifferentProducts=Number of different products
@@ -44,7 +46,6 @@ TransferStock=Transfer stock
 MassStockTransferShort=Mass stock transfer
 StockMovement=Stock movement
 StockMovements=Stock movements
-LabelMovement=Movement label
 NumberOfUnit=Number of units
 UnitPurchaseValue=Unit purchase price
 StockTooLow=Stock too low
@@ -54,21 +55,23 @@ PMPValue=Weighted average price
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Allow to add limit and desired stock per couple (product, warehouse) instead of per product
-IndependantSubProductStock=Product stock and subproduct stock are independant
+AllowAddLimitStockByWarehouse=Manage also values for minimum and desired stock per pairing (product-warehouse) in addition to values per product
+IndependantSubProductStock=Product stock and subproduct stock are independent
 QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
-RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
-DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
-DeStockOnValidateOrder=Decrease real stocks on customers orders validation
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
 DeStockOnShipment=Decrease real stocks on shipping validation
-DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification closed
-ReStockOnBill=Increase real stocks on suppliers invoices/credit notes validation
-ReStockOnValidateOrder=Increase real stocks on purchase orders approbation
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows dispatching of products in stock warehouses.
 StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
 NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required.
@@ -76,12 +79,12 @@ DispatchVerb=Dispatch
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
 StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
-PhysicalStock=Physical stock
+PhysicalStock=Physical Stock
 RealStock=Real Stock
-RealStockDesc=Physical or real stock is the stock you currently have into your internal warehouses/emplacements.
-RealStockWillAutomaticallyWhen=The real stock will automatically change according to this rules (see stock module setup to change this):
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
-VirtualStockDesc=Virtual stock is the stock you will get once all open pending actions that affect stocks will be closed (supplier order received, customer order shipped, ...)
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
@@ -101,7 +104,7 @@ ThisWarehouseIsPersonalStock=This warehouse represents personal stock of %s %s
 SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
 SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
 NoStockAction=No stock action
-DesiredStock=Desired optimal stock
+DesiredStock=Desired Stock
 DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
 StockToBuy=To order
 Replenishment=Replenishment
@@ -114,13 +117,13 @@ CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtual stock
 CurentlyUsingPhysicalStock=Physical stock
 RuleForStockReplenishment=Rule for stocks replenishment
-SelectProductWithNotNullQty=Select at least one product with a qty not null and a supplier
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
 AlertOnly= Alerts only
 WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is a list of all open supplier orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,10 +133,11 @@ RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever is rule for automatic stock change)
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
+TypeMovement=Type of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -143,11 +147,11 @@ ShowWarehouse=Show warehouse
 MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
 OpenAll=Open for all actions
 OpenInternal=Open only for internal actions
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on supplier order reception
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
 OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
 ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
 ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
@@ -171,16 +175,16 @@ inventoryValidate=Validated
 inventoryDraft=Running
 inventorySelectWarehouse=Warehouse choice
 inventoryConfirmCreate=Create
-inventoryOfWarehouse=Inventory for warehouse : %s
-inventoryErrorQtyAdd=Error : one quantity is leaser than zero
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
 inventoryMvtStock=By inventory
 inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
-SelectFournisseur=Supplier filter
+SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
 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
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement has date of inventory
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
@@ -195,12 +199,16 @@ AddInventoryProduct=Add product to inventory
 AddProduct=Gehitu
 ApplyPMP=Apply PMP
 FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action ?
+ConfirmFlushInventory=Do you confirm this action?
 InventoryFlushed=Inventory flushed
 ExitEditMode=Exit edition
 inventoryDeleteLine=Delete line
 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"
+StockSupportServices=Stock management supports Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
 ReceiveProducts=Receive items
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
diff --git a/htdocs/langs/eu_ES/website.lang b/htdocs/langs/eu_ES/website.lang
index 237ffc1b2f8..4771a5d59d2 100644
--- a/htdocs/langs/eu_ES/website.lang
+++ b/htdocs/langs/eu_ES/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/eu_ES/withdrawals.lang b/htdocs/langs/eu_ES/withdrawals.lang
index 3defcec975a..cbca2b2f103 100644
--- a/htdocs/langs/eu_ES/withdrawals.lang
+++ b/htdocs/langs/eu_ES/withdrawals.lang
@@ -12,21 +12,21 @@ 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
+NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Amount to withdraw
 WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
-ResponsibleUser=Responsible user
+ResponsibleUser=User Responsible
 WithdrawalsSetup=Direct debit payment setup
 WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
-ThirdPartyBankCode=Third party bank code
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Classify credited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
@@ -50,7 +50,7 @@ StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
 StatusMotif2=Request contested
 StatusMotif3=No direct debit payment order
-StatusMotif4=Customer Order
+StatusMotif4=Sales Order
 StatusMotif5=RIB unusable
 StatusMotif6=Account without balance
 StatusMotif7=Judicial Decision
@@ -66,11 +66,11 @@ NotifyCredit=Withdrawal Credit
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=For bank accounts using RIB
 WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
-BankToReceiveWithdraw=Bank account to receive direct debit
+BankToReceiveWithdraw=Receiving Bank Account
 CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
-ShowWithdraw=Show Withdraw
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -87,13 +87,13 @@ 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
+CreditorName=Creditor 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
+ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
@@ -102,6 +102,10 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/fa_IR/accountancy.lang b/htdocs/langs/fa_IR/accountancy.lang
index 1133ce3e5dc..a95ab2d55ed 100644
--- a/htdocs/langs/fa_IR/accountancy.lang
+++ b/htdocs/langs/fa_IR/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=اینجا فهرست مشتری‌ها و تامین‌ک
 ListAccounts=فهرست حساب‌های حسابداری
 UnknownAccountForThirdparty=حساب‌ شخص‌سوم ناشناخته. از %s استفاده می‌شود.
 UnknownAccountForThirdpartyBlocking=حساب شخص‌سوم ناشناخته. خطای انسدادی
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=حساب شخص‌سوم تعریف نشده یا شخص سوم ناشناخته است. خطای انسدادی
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=حساب شخص‌سوم تعریف نشده یا شخص سوم ناشناخته است. خطای انسدادی
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=حساب شخص‌سوم ناشناخته و حساب انتظار تعریف نشده است. خطای انسدادی
 PaymentsNotLinkedToProduct=پرداخت به هیچ محصول/خدمتی وصل نشده است
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=صدور برای Cogilog
 Modelcsv_agiris=صدور برای Agiris
 Modelcsv_openconcerto=صادرکردن برای OpenConcerto  (آزمایشی)
 Modelcsv_configurable= صدور قابل پیکربندی CSV 
-Modelcsv_FEC=صادرکردن برای FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=صادرکردن برای Sage 50 Switzerland
 ChartofaccountsId=ساختار شناسۀ حساب‌‌ها
 
@@ -316,6 +317,9 @@ WithoutValidAccount=بدون حساب اختصاصی معتبر
 WithValidAccount=با حساب اختصاصی معتبر
 ValueNotIntoChartOfAccount=مقدار حساب حساب‌داری در نمودار حساب وجود ندارد
 AccountRemovedFromGroup=حساب از گروه حذف شده‌است
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=بازۀ حساب حساب‌داری
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=سطوری که هنوز بند نشده‌اند، 
 
 ## Import
 ImportAccountingEntries=ورودی‌های حساب‌داری
-
+DateExport=Date export
 WarningReportNotReliable=هشدار! این گزارش بر مبنای دفتر کل نمی‌باشد، بنابراین دربردارندۀ تراکنش‌هائی که به شکل دستی در دفترکل ویرایش شده‌اند نیست. در صورتی که دفترنویسی شما روزآمد باشد، نمای «دفترنویسی» دقیق‌تر است.
 ExpenseReportJournal=دفتر گزارش هزینه‌ها
 InventoryJournal=دفتر انبار
diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang
index 5bf94c840ab..14062d810cf 100644
--- a/htdocs/langs/fa_IR/admin.lang
+++ b/htdocs/langs/fa_IR/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=این واحد دربردارندۀ عوامل مربوط 
 Purge=پاک‌کردن
 PurgeAreaDesc=این صفحه به شما امکان حذف همۀ فایل‌های تولید شده و ذخیره شده با Dolibarr  را می‌دهد (فایل‌های موقت یا همۀ فایلهای داخل پوشۀ <b>%s</b>). استفاده از این قابلیت در شرایط عادی ضرورتی ندارد. این قابلیت برای کاربرانی ایجاد شده است که میزبانی وبگاه آن‌ها امکان حذف فایل‌هائی که توسط سرویس‌دهندۀ وب ایجاد شده‌اند را نداده است. 
 PurgeDeleteLogFile=حذف فایل‌های گزارش‌کار، شامل تعریف <b>%s</b> برای واحد گزارش‌کار سامانه Syslog (خطری برای از دست دادن داده‌ها نیست)
-PurgeDeleteTemporaryFiles=حذف همۀ فایل‌های موقتی (خطری برای از دست دادن داده‌ها نیست)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=حذف فایل‌های موقتی
 PurgeDeleteAllFilesInDocumentsDir=حذف همۀ فایل‌های موجود در پوشۀ: <b>%s</b>. <br> این باعث حذف همۀ مستنداتی که به عناصر مربوطند ( اشخاص سوم، صورت‌حساب و غیره ...)، فایل‌هائی که به واحد ECM ارسال شده‌اند، نسخه‌برداری‌های پشتیبان بانک‌داده و فایل‌های موقت خواهد شد.
 PurgeRunNow=شروع پاک‌سازی
@@ -804,6 +804,7 @@ Permission401=ملاحظۀ تخفیف‌ها
 Permission402=ساخت/ویرایش تخفیف‌ها
 Permission403=اعتباردهی تخفیف‌ها
 Permission404=حذف تخفیف‌ها
+Permission430=Use Debug Bar
 Permission511=ملاحظۀ پرداخت حقوق‌ها
 Permission512=ساخت/ویرایش پرداخت حقوق
 Permission514=حذف پرداخت حقوق
@@ -818,6 +819,9 @@ Permission532=ایجاد/ویرایش خدمات
 Permission534=حذف خدمات
 Permission536=مشاهده/مدیریت خدمات پنهان
 Permission538=صادرکردن خدمات
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=ملاحظۀ کمک‌های‌مالی
 Permission702=ایجاد/ویرایش کمک‌های‌مالی
 Permission703=حذف کمک‌های‌مالی
@@ -837,6 +841,12 @@ Permission1101=ملاحظۀ سفارشات تحویل
 Permission1102=ساخت/ویرایش سفارشات تحویل
 Permission1104=اعتباردهی سفارشات تحویل
 Permission1109=حذف سفارشات تحویل
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=ملاحظۀ تامین‌کنندگان
 Permission1182=خواندن سفارشات خرید
 Permission1183=ساخت/ویرایش سفارشات خرید
@@ -859,16 +869,6 @@ Permission1251=اجرای واردات گستردۀ داده‌های خارجی
 Permission1321=صادرکردن صورت‌حساب‌های مشتریان، صفت‌ها و پرداخت‌ها
 Permission1322=بازکردن دوبارۀ یک صورت‌حساب پرداخت‌شده
 Permission1421=صادرکردن سفارش‌های فروش و صفات
-Permission20001=ملاحظۀ درخواست‌های مرخصی (درخواست‌های مرخصی افراد تحت مدیریت شما)
-Permission20002=ساخت/ویرایش درخواست‌های مرخصی شما (شما و افراد تحت نظر شما)
-Permission20003=حذف درخواست‌های مرخصی
-Permission20004=ملاحظۀ همۀ درخواست‌های مرخصی (حتی کاربری که تحت مدیریت شما نیست)
-Permission20005=ساخت/ویرایش درخواست مرخصی همگان (حتی کاربرانی که تحت مدیریت شما نیستند)
-Permission20006=درخواست‌های مرخصی مدیر (تنظیمات و به‌هنگام‌سازی تعادل)
-Permission23001=ملاحظۀ وظایف زمان‌بندی‌شده
-Permission23002=ساخت/ویرایش  وظایف زمان‌بندی‌شده
-Permission23003=حذف  وظایف زمان‌بندی‌شده
-Permission23004=اجرای  وظایف زمان‌بندی‌شده
 Permission2401=ملاحظۀ فعالیت‌ها (رخدادها یا وظایف) پیوند شده به حساب کاربر
 Permission2402=ساخت/ویرایش  فعالیت‌ها (رخدادها یا وظایف) پیوند شده به حساب کاربر
 Permission2403=حذف  فعالیت‌ها (رخدادها یا وظایف) پیوند شده به حساب کاربر
@@ -882,9 +882,41 @@ Permission2503=تسلیم یا حذف مستندات
 Permission2515=تنظیم پوشه‌های مستندات
 Permission2801=استفاده از متقاضی FTP در حالت خواندنی (منحصر به مرور و دریافت)
 Permission2802=استفاده از متقاضی FTP در حالت نوشتنی (حذف یا ارسال فایل)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=ملاحظۀ درخواست‌های مرخصی (درخواست‌های مرخصی افراد تحت مدیریت شما)
+Permission20002=ساخت/ویرایش درخواست‌های مرخصی شما (شما و افراد تحت نظر شما)
+Permission20003=حذف درخواست‌های مرخصی
+Permission20004=ملاحظۀ همۀ درخواست‌های مرخصی (حتی کاربری که تحت مدیریت شما نیست)
+Permission20005=ساخت/ویرایش درخواست مرخصی همگان (حتی کاربرانی که تحت مدیریت شما نیستند)
+Permission20006=درخواست‌های مرخصی مدیر (تنظیمات و به‌هنگام‌سازی تعادل)
+Permission23001=ملاحظۀ وظایف زمان‌بندی‌شده
+Permission23002=ساخت/ویرایش  وظایف زمان‌بندی‌شده
+Permission23003=حذف  وظایف زمان‌بندی‌شده
+Permission23004=اجرای  وظایف زمان‌بندی‌شده
 Permission50101=استفاده از صندوق POS
 Permission50201=ملاحظۀ تراکنش‌ها
 Permission50202=واردکردن تراکنش‌ها
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=چاپ
 Permission55001=ملاحظۀ نظرسنجی‌ها
 Permission55002=ساخت/ویرایش نظرسنجی‌ها
@@ -1078,7 +1110,7 @@ AreaForAdminOnly=مقادیر برپاسازی تنها توسط <b>کاربرا
 SystemInfoDesc=اطلاعات سامانه، اطلاعاتی فنی است که در حالت فقط خواندنی است و تنها برای مدیران قابل نمایش است.
 SystemAreaForAdminOnly=این ناحیه تنها برای کاربران مدیر در دسترس است. مجوزهای کاربران Dolibarr  این محدودیت‌ها را تغییر نمی‌دهد.
 CompanyFundationDesc=ویرایش اطلاعات مربوط به شرکت/موجودیت. بر روی "%s" یا "%s" در انتهای صفحه کلیک نمائید.
-AccountantDesc=ویرایش جزئیات مربوط به حساب‌دار/دفتردار 
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=کد حساب‌دار
 DisplayDesc=مقادیری که بر شکل و رفتار Dolibarr اثرگذارند از این‌جا قابل تغییرند.
 AvailableModules=برنامه‌ها/واحد‌های دردسترس
@@ -1891,3 +1923,5 @@ IFTTTDesc=این واحد برای راه‌انداختن رخدادها بر I
 UrlForIFTTT=نشانی اینترنتی نهائی برای IFTTT
 YouWillFindItOnYourIFTTTAccount=شما آن را بر حساب IFTTT خود پیدا خواهید کرد
 EndPointFor=نقطۀ آخر برای %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/fa_IR/banks.lang b/htdocs/langs/fa_IR/banks.lang
index 58284e96f00..ac3a1f9ff1a 100644
--- a/htdocs/langs/fa_IR/banks.lang
+++ b/htdocs/langs/fa_IR/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=وفق داده نشده
 CustomerInvoicePayment=پرداخت مشتری
 SupplierInvoicePayment=پرداخت فروشنده
 SubscriptionPayment=پرداخت اشتراک
-WithdrawalPayment=پرداخت به صورت برداشت
+WithdrawalPayment=سفارش پرداخت مستقیم
 SocialContributionPayment=پرداخت مالیات اجتماعی/سیاست مالی
 BankTransfer=انتقال بانکی
 BankTransfers=انتقالات بانکی
diff --git a/htdocs/langs/fa_IR/cashdesk.lang b/htdocs/langs/fa_IR/cashdesk.lang
index f57071c5fed..ee61f670395 100644
--- a/htdocs/langs/fa_IR/cashdesk.lang
+++ b/htdocs/langs/fa_IR/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=پایانه
 NumberOfTerminals=تعداد پایانه‌ها
 TerminalSelect=پایانه‌ای که می‌خواهید استفاده کنید را انتخاب نمائید:
 POSTicket=برگۀ صندوق
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/fa_IR/mails.lang b/htdocs/langs/fa_IR/mails.lang
index 05a6b345a45..944ec850582 100644
--- a/htdocs/langs/fa_IR/mails.lang
+++ b/htdocs/langs/fa_IR/mails.lang
@@ -78,9 +78,9 @@ GroupEmails=گروه‌بندی رایانامه‌ها
 OneEmailPerRecipient=یک رایانامه برای یک گیرنده (به طور پیش‌فرض، یک رایانامه برای هر ردیف انتخاب شده)
 WarningIfYouCheckOneRecipientPerEmail=هشدار، در صورتی که این کادر را تائید کنید، این بدان معناست تنها یک رایانامه به ردیف‌های مختلف انتخاب شده ارسال می‌شود، بنابراین، در صورتی که رایانامۀ شما دربردارندۀ متغیرهای جایگزین‌ساز باشد که به داده‌های یک ردیف اشاره می‌کند، امکان جایگزینی آن‌ها وجود نخواهد داشت.
 ResultOfMailSending=نتیجۀ ارسال انبوه رایانامه
-NbSelected=تعداد انتخاب شده
-NbIgnored=تعداد نادیده‌گرفته‌شده
-NbSent=تعداد ارسال‌شده
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s پیام ارسال شد ()
 ConfirmUnvalidateEmailing=آیا مطمئنید می‌خواهید وضعیت رایانامۀ <b>%s</b> را به حالت پیش‌نویس تغییر دهید؟
 MailingModuleDescContactsWithThirdpartyFilter=طرف‌تماس با صافی‌های مشتری
diff --git a/htdocs/langs/fa_IR/members.lang b/htdocs/langs/fa_IR/members.lang
index 2156485109b..fc13e7de287 100644
--- a/htdocs/langs/fa_IR/members.lang
+++ b/htdocs/langs/fa_IR/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=را انتخاب کنید آمار شما می خواهی
 MenuMembersStats=ارقام
 LastMemberDate=Latest member date
 LatestSubscriptionDate=آخرین تاریخ عضویت
-Nature=طبیعت
+MemberNature=Nature of member
 Public=اطلاعات عمومی
 NewMemberbyWeb=عضو جدید اضافه شده است. در انتظار تایید
 NewMemberForm=فرم عضو جدید
diff --git a/htdocs/langs/fa_IR/products.lang b/htdocs/langs/fa_IR/products.lang
index 5e83f10881a..9dd30c1eec9 100644
--- a/htdocs/langs/fa_IR/products.lang
+++ b/htdocs/langs/fa_IR/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=قیمت‌های فروشنده
 SuppliersPricesOfProductsOrServices=قیمت‌های فروشنده (مربوط به محصولات و خدمات)
 CustomCode=گمرک / کالا / کدبندی هماهنگ کالا
 CountryOrigin=کشور مبدا
-Nature=نوع کالا (موادخام/ساخته‎شده)
+Nature=Nature of produt (material/finished)
 ShortLabel=برچسب کوتاه
 Unit=واحد
 p=واحد
diff --git a/htdocs/langs/fa_IR/salaries.lang b/htdocs/langs/fa_IR/salaries.lang
index 6a70af3f955..30a8abd15d1 100644
--- a/htdocs/langs/fa_IR/salaries.lang
+++ b/htdocs/langs/fa_IR/salaries.lang
@@ -1,18 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger 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_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
 Salary=حقوق
 Salaries=حقوق
 NewSalaryPayment=پرداخت حقوق و دستمزد جدید
+AddSalaryPayment=Add salary payment
 SalaryPayment=پرداخت حقوق و دستمزد
 SalariesPayments=حقوق پرداخت
 ShowSalaryPayment=نمایش پرداخت حقوق و دستمزد
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
-THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
-TJMDescription=This value is currently as information only and is not used for any calculation
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
-SalariesStatistics=Statistiques salaires
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/fa_IR/stocks.lang b/htdocs/langs/fa_IR/stocks.lang
index 46740ab3f79..70c0a636840 100644
--- a/htdocs/langs/fa_IR/stocks.lang
+++ b/htdocs/langs/fa_IR/stocks.lang
@@ -66,10 +66,12 @@ RuleForStockManagementIncrease=انتخاب قواعد افزایش خودکار
 DeStockOnBill=کاهش موجودی واقعی در هنگام تائیداعتبار صورت‌حساب‌مشتری/یادداشت اعتباری
 DeStockOnValidateOrder=کاهش موجودی واقعی در هنگام تائیداعتبار سفارش فروش
 DeStockOnShipment=کاهش موجودی واقعی در هنگام تائیداعتبار حمل-ارسال
-DeStockOnShipmentOnClosing=کاهش موجودی واقعی در هنگام بسته‌شدن طبقه‌بندی حمل-ارسال
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
 ReStockOnBill=افزایش موجودی واقعی در هنگام تائیداعتبار صورت‌حساب فروشنده/یادداشت اعتباری
 ReStockOnValidateOrder=افزایش موجودی واقعی در هنگام تائیداعتبار سفارش خرید
 ReStockOnDispatchOrder=افزایش موجودی واقعی در هنگام ارسال دستی و دلخواه به انبار، پس از رسید سفارش خرید کالاها
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=سفارش دیگر یا هنوز وضعیتی را دارا نیست که اجازۀ اعزام محصولات به موجودی انبارها را داشته باشد.
 StockDiffPhysicTeoric=توضیحات مربوط به اختلاف میان محصولات مجازی و حقیقی
 NoPredefinedProductToDispatch=محصول از پیش تعریف‌شده‌ای برای این شیء وجود ندارد. بنابراین نیازی به ارسال به موجودی نیست.
diff --git a/htdocs/langs/fa_IR/website.lang b/htdocs/langs/fa_IR/website.lang
index 5c1ee1d453c..8720bfb102b 100644
--- a/htdocs/langs/fa_IR/website.lang
+++ b/htdocs/langs/fa_IR/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/fa_IR/withdrawals.lang b/htdocs/langs/fa_IR/withdrawals.lang
index 2585ec4027a..097d8c7ddf7 100644
--- a/htdocs/langs/fa_IR/withdrawals.lang
+++ b/htdocs/langs/fa_IR/withdrawals.lang
@@ -69,8 +69,8 @@ WithBankUsingBANBIC=برای حساب های بانکی با استفاده از
 BankToReceiveWithdraw=Receiving Bank Account
 CreditDate=در اعتباری
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
-ShowWithdraw=نمایش برداشت
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=با این حال، اگر فاکتور حداقل یک عقب نشینی پرداخت هنوز پردازش نشده، آن را مجموعه ای به عنوان پرداخت می شود اجازه می دهد تا مدیریت خروج قبل.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=فایل برداشت
 SetToStatusSent=تنظیم به وضعیت "فایل ارسال شد"
diff --git a/htdocs/langs/fi_FI/accountancy.lang b/htdocs/langs/fi_FI/accountancy.lang
index 08cf9a7df68..a855b64b9b3 100644
--- a/htdocs/langs/fi_FI/accountancy.lang
+++ b/htdocs/langs/fi_FI/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Consult here the list of third-party customers and vendors
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third-party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
-Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Without valid dedicated account
 WithValidAccount=With valid dedicated account
 ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
 AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Range of accounting account
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
-
+DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang
index 2e51b0b2649..76c3d67dfc2 100644
--- a/htdocs/langs/fi_FI/admin.lang
+++ b/htdocs/langs/fi_FI/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Siivoa
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Poista kaikki väliaikaiset tiedostot (ei riskiä tietojen menettämisestä)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Poista väliaikaiset tiedostot
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Siivoa nyt
@@ -804,6 +804,7 @@ Permission401=Lue alennukset
 Permission402=Luoda / muuttaa alennukset
 Permission403=Validate alennukset
 Permission404=Poista alennukset
+Permission430=Use Debug Bar
 Permission511=Read payments of salaries
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
@@ -818,6 +819,9 @@ Permission532=Luoda / muuttaa palvelut
 Permission534=Poista palvelut
 Permission536=Katso / hoitaa piilotettu palvelut
 Permission538=Vienti palvelut
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Lue lahjoitukset
 Permission702=Luoda / muuttaa lahjoitusten
 Permission703=Poista lahjoitukset
@@ -837,6 +841,12 @@ Permission1101=Lue lähetysluetteloihin
 Permission1102=Luoda / muuttaa lähetysluetteloihin
 Permission1104=Validate lähetysluetteloihin
 Permission1109=Poista lähetysluetteloihin
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Lue toimittajat
 Permission1182=Read purchase orders
 Permission1183=Create/modify purchase orders
@@ -859,16 +869,6 @@ Permission1251=Suorita massa tuonnin ulkoisten tiedot tietokantaan (tiedot kuorm
 Permission1321=Vienti asiakkaan laskut, ominaisuudet ja maksut
 Permission1322=Avaa uudelleen maksettu lasku
 Permission1421=Export sales orders and attributes
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those 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)
-Permission23001=Lue Ajastettu työ
-Permission23002=Luo/päivitä Ajastettu työ
-Permission23003=Poista Ajastettu työ
-Permission23004=Suorita Ajastettu työ
 Permission2401=Lue toimet (tapahtumat tai tehtävät) liittyy hänen tilinsä
 Permission2402=Luoda / muuttaa / poistaa toimet (tapahtumat tai tehtävät) liittyy hänen tilinsä
 Permission2403=Lue toimet (tapahtumat tai tehtävät) muiden
@@ -882,9 +882,41 @@ Permission2503=Lähetä tai poistaa asiakirjoja
 Permission2515=Setup asiakirjat hakemistoja
 Permission2801=Käytä FTP ohjelmaa lukutilassa (vain selain ja lataukset)
 Permission2802=Käytä FTP ohjelmaa kirjoitustilassa (poista tai päivitä tiedostot)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those 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)
+Permission23001=Lue Ajastettu työ
+Permission23002=Luo/päivitä Ajastettu työ
+Permission23003=Poista Ajastettu työ
+Permission23004=Suorita Ajastettu työ
 Permission50101=Use Point of Sale
 Permission50201=Lue liiketoimet
 Permission50202=Tuo liiketoimet
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Tulosta
 Permission55001=Lue äänestys
 Permission55002=Luo/muokkaa äänestys
@@ -1078,7 +1110,7 @@ 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=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
-AccountantDesc=Edit the details of your accountant/bookkeeper
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Saatavilla olevat app/moduulit
@@ -1891,3 +1923,5 @@ IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute s
 UrlForIFTTT=URL endpoint for IFTTT
 YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/fi_FI/banks.lang b/htdocs/langs/fi_FI/banks.lang
index c454774b065..fe9c6b9f63f 100644
--- a/htdocs/langs/fi_FI/banks.lang
+++ b/htdocs/langs/fi_FI/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=Täsmäyttämätön
 CustomerInvoicePayment=Asiakasmaksu
 SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Tilaus maksu
-WithdrawalPayment=Hyvitysmaksu
+WithdrawalPayment=Debit payment order
 SocialContributionPayment=Social/fiscal veron maksu
 BankTransfer=Pankkisiirto
 BankTransfers=Pankkisiirrot
diff --git a/htdocs/langs/fi_FI/cashdesk.lang b/htdocs/langs/fi_FI/cashdesk.lang
index 8df3181d8d9..41d459d8efd 100644
--- a/htdocs/langs/fi_FI/cashdesk.lang
+++ b/htdocs/langs/fi_FI/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/fi_FI/mails.lang b/htdocs/langs/fi_FI/mails.lang
index b080f14d878..ecbc328fca9 100644
--- a/htdocs/langs/fi_FI/mails.lang
+++ b/htdocs/langs/fi_FI/mails.lang
@@ -19,6 +19,8 @@ MailTopic=Email topic
 MailText=Viesti
 MailFile=Liitetyt tiedostot
 MailMessage=Sähköpostiviesti
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
 ShowEMailing=Näytä sähköpostia
 ListOfEMailings=Luettelo emailings
 NewMailing=Uusi sähköpostia
@@ -76,9 +78,9 @@ GroupEmails=Group emails
 OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
 WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
 ResultOfMailSending=Result of mass Email sending
-NbSelected=No. selected
-NbIgnored=No. ignored
-NbSent=No. sent
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
diff --git a/htdocs/langs/fi_FI/members.lang b/htdocs/langs/fi_FI/members.lang
index 3f8ae9044d0..9e846481971 100644
--- a/htdocs/langs/fi_FI/members.lang
+++ b/htdocs/langs/fi_FI/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=Valitse tilastot haluat lukea ...
 MenuMembersStats=Tilasto
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
-Nature=Luonto
+MemberNature=Nature of member
 Public=Tiedot ovat julkisia
 NewMemberbyWeb=Uusi jäsen. Odottaa hyväksyntää
 NewMemberForm=Uusi jäsen lomake
diff --git a/htdocs/langs/fi_FI/products.lang b/htdocs/langs/fi_FI/products.lang
index 8a1d8416efb..d8c06ce88b4 100644
--- a/htdocs/langs/fi_FI/products.lang
+++ b/htdocs/langs/fi_FI/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Alkuperä maa
-Nature=Product Type (material/finished)
+Nature=Nature of produt (material/finished)
 ShortLabel=Short label
 Unit=Yksikkö
 p=u.
diff --git a/htdocs/langs/fi_FI/salaries.lang b/htdocs/langs/fi_FI/salaries.lang
index 26c6a7c59d6..b587227ee0a 100644
--- a/htdocs/langs/fi_FI/salaries.lang
+++ b/htdocs/langs/fi_FI/salaries.lang
@@ -1,18 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Käytetty kirjanpitotili käyttäjän sidosryhmille
-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_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Oletus kirjanpitotili palkkamaksuille
 Salary=Palkka
 Salaries=Palkat
 NewSalaryPayment=Uusi palkanmaksu
+AddSalaryPayment=Add salary payment
 SalaryPayment=Palkanmaksu
 SalariesPayments=Palkkojen maksut
 ShowSalaryPayment=Näytä palkanmaksu
 THM=Keskimääräinen tuntipalkka
 TJM=Keskimääräinen päiväpalkka
 CurrentSalary=Nykyinen palkka
-THMDescription=Jos projektimoduli on käytössä, tätä arvoa voi käyttää projektin aikakustannuksen laskemiseen käyttäjän syöttämien tuntien perusteella
-TJMDescription=Tätä arvoa ei toistaiseksi käytetä laskentaan, se on olemassa vain tiedoksi
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
 LastSalaries=Viimeisimmät %s palkkamaksut
 AllSalaries=Kaikki Palkkamaksut
-SalariesStatistics=Statistiques salaires
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/fi_FI/stocks.lang b/htdocs/langs/fi_FI/stocks.lang
index b4c7cf0800a..b0ce07b9b93 100644
--- a/htdocs/langs/fi_FI/stocks.lang
+++ b/htdocs/langs/fi_FI/stocks.lang
@@ -3,7 +3,7 @@ WarehouseCard=Warehouse-kortti
 Warehouse=Warehouse
 Warehouses=Varastot
 ParentWarehouse=Parent warehouse
-NewWarehouse=Uusi varasto / Kanta-alue
+NewWarehouse=New warehouse / Stock Location
 WarehouseEdit=Muokkaa varasto
 MenuNewWarehouse=Uusi varasto
 WarehouseSource=Lähde varasto
@@ -29,6 +29,8 @@ MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
 Location=Lieu
 LocationSummary=Lyhyt nimi sijainti
 NumberOfDifferentProducts=Number of different products
@@ -44,7 +46,6 @@ TransferStock=Transfer stock
 MassStockTransferShort=Mass stock transfer
 StockMovement=Stock movement
 StockMovements=Stock movements
-LabelMovement=Movement label
 NumberOfUnit=Kappalemäärä
 UnitPurchaseValue=Unit purchase price
 StockTooLow=Kanta liian alhainen
@@ -54,21 +55,23 @@ PMPValue=Value
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Varastot arvo
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Allow to add limit and desired stock per couple (product, warehouse) instead of per product
-IndependantSubProductStock=Product stock and subproduct stock are independant
+AllowAddLimitStockByWarehouse=Manage also values for minimum and desired stock per pairing (product-warehouse) in addition to values per product
+IndependantSubProductStock=Product stock and subproduct stock are independent
 QtyDispatched=Määrä lähetysolosuhteita
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
-RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
-DeStockOnBill=Decrease todellinen varastot laskuista / hyvityslaskuja
-DeStockOnValidateOrder=Decrease todellinen varastot tilaukset toteaa
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
 DeStockOnShipment=Decrease real stocks on shipping validation
-DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification closed
-ReStockOnBill=Lisäys todellinen varastot laskuista / hyvityslaskuja
-ReStockOnValidateOrder=Increase real stocks on purchase orders approbation
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=Tilaa ei ole vielä tai enää asema, joka mahdollistaa lähettäminen varastossa olevista tuotteista varastoissa.
 StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
 NoPredefinedProductToDispatch=Ei ennalta tuotteet tämän objektin. Joten ei lähettämistä varastossa on.
@@ -76,12 +79,12 @@ DispatchVerb=Lähettäminen
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
 StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
-PhysicalStock=Varasto
+PhysicalStock=Physical Stock
 RealStock=Real Stock
-RealStockDesc=Physical or real stock is the stock you currently have into your internal warehouses/emplacements.
-RealStockWillAutomaticallyWhen=The real stock will automatically change according to this rules (see stock module setup to change this):
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual varastossa
-VirtualStockDesc=Virtual stock is the stock you will get once all open pending actions that affect stocks will be closed (supplier order received, customer order shipped, ...)
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
 IdWarehouse=Id-varasto
 DescWareHouse=Kuvaus varasto
 LieuWareHouse=Lokalisointi varasto
@@ -101,7 +104,7 @@ ThisWarehouseIsPersonalStock=Tämä varasto edustaa henkilökohtainen kanta %s %
 SelectWarehouseForStockDecrease=Valitse varasto käyttää varastossa laskua
 SelectWarehouseForStockIncrease=Valitse varasto käyttää varastossa lisätä
 NoStockAction=No stock action
-DesiredStock=Desired optimal stock
+DesiredStock=Desired Stock
 DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
 StockToBuy=To order
 Replenishment=Replenishment
@@ -114,13 +117,13 @@ CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtual varastossa
 CurentlyUsingPhysicalStock=Varasto
 RuleForStockReplenishment=Rule for stocks replenishment
-SelectProductWithNotNullQty=Select at least one product with a qty not null and a supplier
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
 AlertOnly= Alerts only
 WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is a list of all open supplier orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,10 +133,11 @@ RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever is rule for automatic stock change)
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
+TypeMovement=Type of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -143,11 +147,11 @@ ShowWarehouse=Näytä varasto
 MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
 OpenAll=Open for all actions
 OpenInternal=Open only for internal actions
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on supplier order reception
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
 OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
 ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
 ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
@@ -171,16 +175,16 @@ inventoryValidate=Hyväksytty
 inventoryDraft=Running
 inventorySelectWarehouse=Warehouse choice
 inventoryConfirmCreate=Create
-inventoryOfWarehouse=Inventory for warehouse : %s
-inventoryErrorQtyAdd=Error : one quantity is leaser than zero
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
 inventoryMvtStock=By inventory
 inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Luokka suodatin
-SelectFournisseur=Supplier filter
+SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
 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
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement has date of inventory
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
@@ -195,12 +199,16 @@ AddInventoryProduct=Add product to inventory
 AddProduct=Lisää
 ApplyPMP=Apply PMP
 FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action ?
+ConfirmFlushInventory=Do you confirm this action?
 InventoryFlushed=Inventory flushed
 ExitEditMode=Exit edition
 inventoryDeleteLine=Poista rivi
 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"
+StockSupportServices=Stock management supports Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
 ReceiveProducts=Receive items
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
diff --git a/htdocs/langs/fi_FI/website.lang b/htdocs/langs/fi_FI/website.lang
index d45a243bc55..b84581dc8e9 100644
--- a/htdocs/langs/fi_FI/website.lang
+++ b/htdocs/langs/fi_FI/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/fi_FI/withdrawals.lang b/htdocs/langs/fi_FI/withdrawals.lang
index ed02481791b..1c301fffe55 100644
--- a/htdocs/langs/fi_FI/withdrawals.lang
+++ b/htdocs/langs/fi_FI/withdrawals.lang
@@ -12,21 +12,21 @@ 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
+NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Määrä peruuttaa
 WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
-ResponsibleUser=Vastaava käyttäjä
+ResponsibleUser=User Responsible
 WithdrawalsSetup=Direct debit payment setup
 WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
-ThirdPartyBankCode=Kolmannen osapuolen pankin koodi
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Luokittele hyvitetään
 ClassCreditedConfirm=Oletko varma, että haluat luokitella tämän vetäytymisen vastaanottamisesta kuin hyvitetty pankkitilisi?
 TransData=Päivämäärä Lähetetty
@@ -50,7 +50,7 @@ StatusMotif0=Määrittelemätön
 StatusMotif1=Säännös insuffisante
 StatusMotif2=Tirage conteste
 StatusMotif3=No direct debit payment order
-StatusMotif4=Asiakkaan tilauksen
+StatusMotif4=Sales Order
 StatusMotif5=RIB inexploitable
 StatusMotif6=Huomioon ilman tasapaino
 StatusMotif7=Ratkaisusta
@@ -66,11 +66,11 @@ NotifyCredit=Irtisanominen Credit
 NumeroNationalEmetter=Kansallinen lähetin määrä
 WithBankUsingRIB=Jos pankkitilit käyttäen RIB
 WithBankUsingBANBIC=Jos pankkitilit käyttäen IBAN / BIC / SWIFT
-BankToReceiveWithdraw=Bank account to receive direct debit
+BankToReceiveWithdraw=Receiving Bank Account
 CreditDate=Luottoa
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
-ShowWithdraw=Näytä Nosta
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Kuitenkin, jos lasku on ainakin yksi poistamista määrä ei kuitenkaan ole vielä käsitelty, sitä ei voida määrittää koska maksoivat sallimaan hallita poistettaviksi.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -87,13 +87,13 @@ 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
+CreditorName=Creditor 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
+ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
@@ -102,6 +102,10 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/fr_CA/admin.lang b/htdocs/langs/fr_CA/admin.lang
index 880dc33efe1..142fd0cec93 100644
--- a/htdocs/langs/fr_CA/admin.lang
+++ b/htdocs/langs/fr_CA/admin.lang
@@ -113,9 +113,9 @@ Permission167=Exportation de contacts
 Permission171=Lire les déplacements et les dépenses (le vôtre et vos subordonnés )
 Permission771=Lire les rapports de dépenses (le vôtre et vos subordonnés )
 Permission1322=Réouvrir une facture payée
+Permission2414=Exportation d'actions/tâches des autres
 Permission20006=Administration des demandes de congé (balance de configuration et de mise à jour )
 Permission23004=Exécuté Travail planifié
-Permission2414=Exportation d'actions/tâches des autres
 Permission59001=Consulter les propositions commerciales
 Permission63002=Créer / modifier des ressources
 Permission63004=Relier les ressources aux événements de l'agenda
diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang
index 6692c4773a4..ae89a4e57ae 100644
--- a/htdocs/langs/fr_FR/accountancy.lang
+++ b/htdocs/langs/fr_FR/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Consultez ici la liste des tiers clients et fournisseurs et
 ListAccounts=Liste des comptes comptables
 UnknownAccountForThirdparty=Compte de tiers inconnu. %s sera utilisé
 UnknownAccountForThirdpartyBlocking=Compte de tiers inconnu. Erreur bloquante.
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Compte tiers non défini ou inconnu. Erreur bloquante.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Compte tiers non défini ou inconnu. Erreur bloquante.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Compte tiers inconnu et compte d'attente non défini. Erreur blocante.
 PaymentsNotLinkedToProduct=Paiement non lié à un produit / service
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Export vers Cogilog
 Modelcsv_agiris=Export vers Agiris
 Modelcsv_openconcerto=Export pour OpenConcerto (Test)
 Modelcsv_configurable=Export configurable
-Modelcsv_FEC=Exportation FEC (Test)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export pour Sage 50 Suisse
 ChartofaccountsId=Id plan comptable
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Sans compte dédié valide
 WithValidAccount=Avec un compte dédié valide
 ValueNotIntoChartOfAccount=Cette valeur de compte comptable n'existe pas dans le plan comptable
 AccountRemovedFromGroup=Compte supprimé du groupe
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Plage de comptes
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Lignes non encore liées, utilisez le menu <a href="%
 
 ## Import
 ImportAccountingEntries=Écritures comptables
-
+DateExport=Date export
 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.
 ExpenseReportJournal=Journal des notes de frais
 InventoryJournal=Journal d'inventaire
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index a961aa8994c..7a7fcb733b9 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=Cet espace offre des fonctions d'administration diverses. Ut
 Purge=Purger
 PurgeAreaDesc=Cette page vous permet d'effacer tous les fichiers construits ou stockés par Dolibarr (fichiers temporaires ou tous les fichiers du répertoire <b>%s</b>). L'utilisation de cette fonction n'est pas nécessaire. Elle est fournie pour les utilisateurs qui hébergent Dolibarr chez un hébergeur qui n'offre pas les permissions de supprimer les fichiers sauvegardés par le serveur Web.
 PurgeDeleteLogFile=Effacer les fichiers de traces de debug, incluant <b>%s</b> défini dans le module 'Journaux et traces' (pas de risque de perte de données)
-PurgeDeleteTemporaryFiles=Effacer tous les fichiers temporaires (pas de risque de perte de données)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Effacer les fichiers temporaires
 PurgeDeleteAllFilesInDocumentsDir=Effacer tous les fichiers du répertoire <b>%s</b>. <br>Les fichiers temporaires mais aussi les fichiers «dumps» de sauvegarde de base de données, les fichiers joints aux éléments (tiers, factures, ...) ou fichiers stockés dans le module GED seront irrémédiablement effacés.
 PurgeRunNow=Lancer la purge maintenant
@@ -804,6 +804,7 @@ Permission401=Consulter les avoirs
 Permission402=Créer/modifier les avoirs
 Permission403=Valider les avoirs
 Permission404=Supprimer les avoirs
+Permission430=Use Debug Bar
 Permission511=Lire les règlements de salaires
 Permission512=Créer/modifier les règlements de salaires
 Permission514=Supprimer les paiements de salaires
@@ -818,6 +819,9 @@ Permission532=Créer/modifier les services
 Permission534=Supprimer les services
 Permission536=Voir/gérer les services cachés
 Permission538=Exporter les services
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Consulter les dons
 Permission702=Créer/modifier les dons
 Permission703=Supprimer les dons
@@ -837,6 +841,12 @@ Permission1101=Consulter les bons de livraison
 Permission1102=Créer/modifier les bons de livraison
 Permission1104=Valider les bons de livraison
 Permission1109=Supprimer les bons de livraison
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Consulter les fournisseurs
 Permission1182=Consulter les commandes fournisseurs
 Permission1183=Créer/modifier les commandes fournisseurs
@@ -859,16 +869,6 @@ Permission1251=Lancer des importations en masse dans la base (chargement de donn
 Permission1321=Exporter les factures clients, attributs et règlements
 Permission1322=Rouvrir une facture payée
 Permission1421=Exporter les commandes clients et attributs
-Permission20001=Lire les demandes de congé (les vôtres et celle de vos subordonnés)
-Permission20002=Créer/modifier vos demandes de congé (les vôtres et celle de vos subordonnés)
-Permission20003=Supprimer les demandes de congé
-Permission20004=Lire toutes les demandes de congé (même celle des utilisateurs non subordonnés)
-Permission20005=Créer/modifier des demandes de congé pour tout le monde (même des utilisateur non subordonnés)
-Permission20006=Administration des demandes de congés (configuration et mise à jour du solde)
-Permission23001=Voir les travaux planifiés
-Permission23002=Créer/Modifier des travaux planifiées
-Permission23003=Effacer travail planifié
-Permission23004=Exécuter travail planifié
 Permission2401=Lire les actions (événements ou tâches) liées à son compte
 Permission2402=Créer/modifier les actions (événements ou tâches) liées à son compte
 Permission2403=Supprimer les actions (événements ou tâches) liées à son compte
@@ -882,9 +882,41 @@ Permission2503=Soumettre ou supprimer des documents
 Permission2515=Administrer les rubriques de documents
 Permission2801=Utiliser un client FTP en mode lecture (parcours et téléchargement de fichiers)
 Permission2802=Utiliser un client FTP en mode écriture (suppression et envoi de fichiers)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Lire les demandes de congé (les vôtres et celle de vos subordonnés)
+Permission20002=Créer/modifier vos demandes de congé (les vôtres et celle de vos subordonnés)
+Permission20003=Supprimer les demandes de congé
+Permission20004=Lire toutes les demandes de congé (même celle des utilisateurs non subordonnés)
+Permission20005=Créer/modifier des demandes de congé pour tout le monde (même des utilisateur non subordonnés)
+Permission20006=Administration des demandes de congés (configuration et mise à jour du solde)
+Permission23001=Voir les travaux planifiés
+Permission23002=Créer/Modifier des travaux planifiées
+Permission23003=Effacer travail planifié
+Permission23004=Exécuter travail planifié
 Permission50101=Utiliser le point de vente
 Permission50201=Consulter les transactions
 Permission50202=Importer les transactions
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Imprimer
 Permission55001=Lire sondages
 Permission55002=Créer/modifier les sondages
@@ -1078,7 +1110,7 @@ AreaForAdminOnly=Les paramètres d'installation ne peuvent être remplis que par
 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 "%s" ou "%s" en bas de page.
-AccountantDesc=Renseignez sur cette page toutes les informations connues sur votre comptable
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Code comptable
 DisplayDesc=Vous pouvez choisir ici tous les paramètres liés à l'apparence de Dolibarr
 AvailableModules=Modules/applications installés
@@ -1891,3 +1923,5 @@ IFTTTDesc=Ce module est conçu pour déclencher des événements sur IFTTT et/ou
 UrlForIFTTT=URL endpoint pour IFTTT
 YouWillFindItOnYourIFTTTAccount=Vous le trouverez sur votre compte IFTTT
 EndPointFor=Endpoint pour %s: %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/fr_FR/banks.lang b/htdocs/langs/fr_FR/banks.lang
index d7aaabbc2dc..c87bf67ad9d 100644
--- a/htdocs/langs/fr_FR/banks.lang
+++ b/htdocs/langs/fr_FR/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=Non rapproché
 CustomerInvoicePayment=Règlement client
 SupplierInvoicePayment=Paiement fournisseur
 SubscriptionPayment=Paiement cotisation
-WithdrawalPayment=Règlement bon de prélèvement
+WithdrawalPayment=Ordre de prélèvement
 SocialContributionPayment=Paiement de charge fiscale/sociale
 BankTransfer=Virement bancaire
 BankTransfers=Virements bancaire
diff --git a/htdocs/langs/fr_FR/cashdesk.lang b/htdocs/langs/fr_FR/cashdesk.lang
index c3bd8f8ce72..52a6eb863a9 100644
--- a/htdocs/langs/fr_FR/cashdesk.lang
+++ b/htdocs/langs/fr_FR/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Nombre de terminaux
 TerminalSelect=Sélectionnez le terminal que vous souhaitez utiliser:
 POSTicket=Ticket POS
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/fr_FR/mails.lang b/htdocs/langs/fr_FR/mails.lang
index 459a02a91a7..1e4bb836708 100644
--- a/htdocs/langs/fr_FR/mails.lang
+++ b/htdocs/langs/fr_FR/mails.lang
@@ -78,9 +78,9 @@ GroupEmails=Regroupement emails
 OneEmailPerRecipient=Un e-mail par destinataire (par défaut, un e-mail par enregistrement sélectionné)
 WarningIfYouCheckOneRecipientPerEmail=Attention, si vous cochez cette case, cela signifie qu'un seul email sera envoyé pour plusieurs enregistrements différents, donc, si votre message contient des variables de substitution qui se réfèrent aux données d'un enregistrement, il devient impossible de les remplacer.
 ResultOfMailSending=Résultat de l'envoi d'EMail en masse
-NbSelected=Nb sélectionné
-NbIgnored=Nb ignoré
-NbSent=Nb envoyé
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s message(s) envoyé(s).
 ConfirmUnvalidateEmailing=Êtes-vous sûr de vouloir repasser l'emailing <b>%s</b> au statut brouillon ?
 MailingModuleDescContactsWithThirdpartyFilter=Contact avec filtres des tiers
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index 55efc9dbcf7..0f6e7ecb589 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=Choisissez les statistiques que vous désirez consulter...
 MenuMembersStats=Statistiques
 LastMemberDate=Date dernier adhérent
 LatestSubscriptionDate=Date de dernière adhésion
-Nature=Nature
+MemberNature=Nature of member
 Public=Informations publiques
 NewMemberbyWeb=Nouvel adhérent ajouté. En attente de validation
 NewMemberForm=Nouvel Adhérent form
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index f8b0aa1d005..d4135c2273e 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Prix fournisseurs
 SuppliersPricesOfProductsOrServices=Prix fournisseurs (des produits ou services)
 CustomCode=Nomenclature douanière / Code SH
 CountryOrigin=Pays d'origine
-Nature=Nature
+Nature=Nature of produt (material/finished)
 ShortLabel=Libellé court
 Unit=Unité
 p=u.
diff --git a/htdocs/langs/fr_FR/salaries.lang b/htdocs/langs/fr_FR/salaries.lang
index 2745a118b94..dc2ff783ed9 100644
--- a/htdocs/langs/fr_FR/salaries.lang
+++ b/htdocs/langs/fr_FR/salaries.lang
@@ -17,3 +17,5 @@ TJMDescription=Cette valeur est actuellement seulement une information et n'est
 LastSalaries=Les %s derniers règlements de salaires
 AllSalaries=Tous les règlements de salaires
 SalariesStatistics=Statistiques
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang
index 224b81c9b8c..13367adcc31 100644
--- a/htdocs/langs/fr_FR/stocks.lang
+++ b/htdocs/langs/fr_FR/stocks.lang
@@ -60,16 +60,18 @@ IndependantSubProductStock=Le stock du produit et le stock des sous-produits son
 QtyDispatched=Quantité ventilée
 QtyDispatchedShort=Qté ventilée
 QtyToDispatchShort=Qté à ventiler
-OrderDispatch=Réceptions d'articles
+OrderDispatch=Réceptions
 RuleForStockManagementDecrease=Règle de gestion des décrémentations automatiques de stock (la décrémentation manuelle est toujours possible, même si une décrémentation automatique est activée)
 RuleForStockManagementIncrease=Règle de gestion des incrémentations de stock (l'incrémentation manuelle est toujours possible, même si une incrémentation automatique est activée)
 DeStockOnBill=Décrémenter les stocks physiques sur validation des factures/avoirs clients
 DeStockOnValidateOrder=Décrémenterr les stocks physiques sur validation des commandes clients
 DeStockOnShipment=Décrémenter les stocks physiques sur validation des expéditions
-DeStockOnShipmentOnClosing=Décrémenter les stocks physiques au classement "clôturée" de l'expédition
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
 ReStockOnBill=Incrémenter les stocks physiques sur validation des factures/avoirs fournisseurs
 ReStockOnValidateOrder=Incrémenter les stocks physiques sur approbation des commandes fournisseurs
 ReStockOnDispatchOrder=Incrémenter les stocks physiques sur ventilation manuelle dans les entrepôts, après réception de la marchandise
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=La commande n'a pas encore ou n'a plus un statut permettant une ventilation en stock.
 StockDiffPhysicTeoric=Explication de l'écart stock physique-virtuel
 NoPredefinedProductToDispatch=Pas de produits prédéfinis dans cet objet. Aucune ventilation en stock n'est donc à faire.
diff --git a/htdocs/langs/fr_FR/website.lang b/htdocs/langs/fr_FR/website.lang
index 5891408a2a2..e52f9f2f955 100644
--- a/htdocs/langs/fr_FR/website.lang
+++ b/htdocs/langs/fr_FR/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=Vous n'êtes pas autorisé à ajouter ou modifier
 ReplaceWebsiteContent=Remplacer un contenu du site
 DeleteAlsoJs=Supprimer également tous les fichiers javascript spécifiques à ce site?
 DeleteAlsoMedias=Supprimer également tous les fichiers médias spécifiques à ce site?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/fr_FR/withdrawals.lang b/htdocs/langs/fr_FR/withdrawals.lang
index ecbc1aa93b6..d3ee922f75a 100644
--- a/htdocs/langs/fr_FR/withdrawals.lang
+++ b/htdocs/langs/fr_FR/withdrawals.lang
@@ -69,8 +69,8 @@ WithBankUsingBANBIC=Pour les comptes bancaires utilisant le code BAN/BIC/SWIFT
 BankToReceiveWithdraw=Compte bancaire pour recevoir les prélèvements
 CreditDate=Crédité le
 WithdrawalFileNotCapable=Impossible de générer le fichier de reçu des prélèvement pour votre pays %s (Votre pays n'est pas supporté)
-ShowWithdraw=Voir prélèvement
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Toutefois, si la facture a au moins un paiement par prélèvement non traité, elle ne le sera pas afin de permettre la gestion du prélèvement d'abord.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=Cet onglet vous permet de demander un prélèvement. Une fois la demande faite, allez dans le menu Banque->Prélèvement pour gérer l'ordre de prélèvement. Lorsque l'ordre de paiement est fermé, le paiement sur la facture sera automatiquement enregistrée, et la facture fermée si le reste à payer est nul.
 WithdrawalFile=Fichier de prélèvement
 SetToStatusSent=Mettre au statut "Fichier envoyé"
diff --git a/htdocs/langs/he_IL/accountancy.lang b/htdocs/langs/he_IL/accountancy.lang
index daa5b4ef413..bb141cb9eb0 100644
--- a/htdocs/langs/he_IL/accountancy.lang
+++ b/htdocs/langs/he_IL/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Consult here the list of third-party customers and vendors
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third-party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
-Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Without valid dedicated account
 WithValidAccount=With valid dedicated account
 ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
 AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Range of accounting account
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
-
+DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang
index df3604c5d92..168e49e5d72 100644
--- a/htdocs/langs/he_IL/admin.lang
+++ b/htdocs/langs/he_IL/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=לטהר עכשיו
@@ -804,6 +804,7 @@ Permission401=קרא הנחות
 Permission402=יצירה / שינוי הנחות
 Permission403=אמת הנחות
 Permission404=מחק את הנחות
+Permission430=Use Debug Bar
 Permission511=Read payments of salaries
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
@@ -818,6 +819,9 @@ Permission532=יצירה / שינוי שירותים
 Permission534=מחק את השירותים
 Permission536=ראה / ניהול שירותים נסתרים
 Permission538=יצוא שירותים
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=לקרוא תרומות
 Permission702=צור / לשנות תרומות
 Permission703=מחק תרומות
@@ -837,6 +841,12 @@ Permission1101=לקרוא הזמנות משלוחים
 Permission1102=צור / לשנות הזמנות משלוחים
 Permission1104=תוקף צווי המסירה
 Permission1109=מחק הזמנות משלוחים
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=קרא ספקים
 Permission1182=Read purchase orders
 Permission1183=Create/modify purchase orders
@@ -859,16 +869,6 @@ Permission1251=הפעל יבוא המוני של נתונים חיצוניים 
 Permission1321=יצוא חשבוניות הלקוח, תכונות ותשלומים
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those 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)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
 Permission2401=קרא פעולות או משימות (אירועים) מקושר לחשבון שלו
 Permission2402=ליצור / לשנות את פעולות או משימות (אירועים) היא מקושרת לחשבון שלו
 Permission2403=מחק פעולות או משימות (אירועים) מקושר לחשבון שלו
@@ -882,9 +882,41 @@ Permission2503=שלח או למחוק מסמכים
 Permission2515=מסמכים הגדרת ספריות
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those 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)
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale
 Permission50201=לקרוא עסקאות
 Permission50202=ייבוא ​​עסקאות
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Print
 Permission55001=Read polls
 Permission55002=Create/modify polls
@@ -1078,7 +1110,7 @@ AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=מערכת מידע הוא מידע טכני שונות נכנסת למצב קריאה בלבד ונראה לעין עבור מנהלי בלבד.
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
-AccountantDesc=Edit the details of your accountant/bookkeeper
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
@@ -1891,3 +1923,5 @@ IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute s
 UrlForIFTTT=URL endpoint for IFTTT
 YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/he_IL/banks.lang b/htdocs/langs/he_IL/banks.lang
index cb39150b627..c77158e07b7 100644
--- a/htdocs/langs/he_IL/banks.lang
+++ b/htdocs/langs/he_IL/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
 SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Subscription payment
-WithdrawalPayment=Withdrawal payment
+WithdrawalPayment=Debit payment order
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
diff --git a/htdocs/langs/he_IL/cashdesk.lang b/htdocs/langs/he_IL/cashdesk.lang
index 7424d8ba1e5..dde83bb7d61 100644
--- a/htdocs/langs/he_IL/cashdesk.lang
+++ b/htdocs/langs/he_IL/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/he_IL/mails.lang b/htdocs/langs/he_IL/mails.lang
index 0b6f771e69e..97db492d7e8 100644
--- a/htdocs/langs/he_IL/mails.lang
+++ b/htdocs/langs/he_IL/mails.lang
@@ -19,6 +19,8 @@ MailTopic=Email topic
 MailText=Message
 MailFile=Attached files
 MailMessage=Email body
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
 ShowEMailing=Show emailing
 ListOfEMailings=List of emailings
 NewMailing=New emailing
@@ -76,9 +78,9 @@ GroupEmails=Group emails
 OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
 WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
 ResultOfMailSending=Result of mass Email sending
-NbSelected=No. selected
-NbIgnored=No. ignored
-NbSent=No. sent
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
diff --git a/htdocs/langs/he_IL/members.lang b/htdocs/langs/he_IL/members.lang
index 5a4f4aa7c05..f644cc3afcd 100644
--- a/htdocs/langs/he_IL/members.lang
+++ b/htdocs/langs/he_IL/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
-Nature=Nature
+MemberNature=Nature of member
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
diff --git a/htdocs/langs/he_IL/products.lang b/htdocs/langs/he_IL/products.lang
index 7202cfefc43..304814e958e 100644
--- a/htdocs/langs/he_IL/products.lang
+++ b/htdocs/langs/he_IL/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
-Nature=Product Type (material/finished)
+Nature=Nature of produt (material/finished)
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/he_IL/salaries.lang b/htdocs/langs/he_IL/salaries.lang
index 6a82354edae..7c3c08a65bd 100644
--- a/htdocs/langs/he_IL/salaries.lang
+++ b/htdocs/langs/he_IL/salaries.lang
@@ -1,18 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger 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_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
 Salary=Salary
 Salaries=Salaries
 NewSalaryPayment=New salary payment
+AddSalaryPayment=Add salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
 ShowSalaryPayment=Show salary payment
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
-THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
-TJMDescription=This value is currently as information only and is not used for any calculation
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
-SalariesStatistics=Statistiques salaires
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/he_IL/stocks.lang b/htdocs/langs/he_IL/stocks.lang
index b3fb63de3c5..d7d194d1fe5 100644
--- a/htdocs/langs/he_IL/stocks.lang
+++ b/htdocs/langs/he_IL/stocks.lang
@@ -3,7 +3,7 @@ WarehouseCard=Warehouse card
 Warehouse=Warehouse
 Warehouses=Warehouses
 ParentWarehouse=Parent warehouse
-NewWarehouse=New warehouse / Stock area
+NewWarehouse=New warehouse / Stock Location
 WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
 WarehouseSource=Source warehouse
@@ -29,6 +29,8 @@ MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
 LocationSummary=Short name location
 NumberOfDifferentProducts=Number of different products
@@ -44,7 +46,6 @@ TransferStock=Transfer stock
 MassStockTransferShort=Mass stock transfer
 StockMovement=Stock movement
 StockMovements=Stock movements
-LabelMovement=Movement label
 NumberOfUnit=Number of units
 UnitPurchaseValue=Unit purchase price
 StockTooLow=Stock too low
@@ -54,21 +55,23 @@ PMPValue=Weighted average price
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Allow to add limit and desired stock per couple (product, warehouse) instead of per product
-IndependantSubProductStock=Product stock and subproduct stock are independant
+AllowAddLimitStockByWarehouse=Manage also values for minimum and desired stock per pairing (product-warehouse) in addition to values per product
+IndependantSubProductStock=Product stock and subproduct stock are independent
 QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
-RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
-DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
-DeStockOnValidateOrder=Decrease real stocks on customers orders validation
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
 DeStockOnShipment=Decrease real stocks on shipping validation
-DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification closed
-ReStockOnBill=Increase real stocks on suppliers invoices/credit notes validation
-ReStockOnValidateOrder=Increase real stocks on purchase orders approbation
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows dispatching of products in stock warehouses.
 StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
 NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required.
@@ -76,12 +79,12 @@ DispatchVerb=Dispatch
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
 StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
-PhysicalStock=Physical stock
+PhysicalStock=Physical Stock
 RealStock=Real Stock
-RealStockDesc=Physical or real stock is the stock you currently have into your internal warehouses/emplacements.
-RealStockWillAutomaticallyWhen=The real stock will automatically change according to this rules (see stock module setup to change this):
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
-VirtualStockDesc=Virtual stock is the stock you will get once all open pending actions that affect stocks will be closed (supplier order received, customer order shipped, ...)
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
@@ -101,7 +104,7 @@ ThisWarehouseIsPersonalStock=This warehouse represents personal stock of %s %s
 SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
 SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
 NoStockAction=No stock action
-DesiredStock=Desired optimal stock
+DesiredStock=Desired Stock
 DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
 StockToBuy=To order
 Replenishment=Replenishment
@@ -114,13 +117,13 @@ CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtual stock
 CurentlyUsingPhysicalStock=Physical stock
 RuleForStockReplenishment=Rule for stocks replenishment
-SelectProductWithNotNullQty=Select at least one product with a qty not null and a supplier
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
 AlertOnly= Alerts only
 WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is a list of all open supplier orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,10 +133,11 @@ RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever is rule for automatic stock change)
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
+TypeMovement=Type of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -143,11 +147,11 @@ ShowWarehouse=Show warehouse
 MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
 OpenAll=Open for all actions
 OpenInternal=Open only for internal actions
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on supplier order reception
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
 OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
 ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
 ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
@@ -171,16 +175,16 @@ inventoryValidate=Validated
 inventoryDraft=Running
 inventorySelectWarehouse=Warehouse choice
 inventoryConfirmCreate=Create
-inventoryOfWarehouse=Inventory for warehouse : %s
-inventoryErrorQtyAdd=Error : one quantity is leaser than zero
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
 inventoryMvtStock=By inventory
 inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
-SelectFournisseur=Supplier filter
+SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
 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
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement has date of inventory
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
@@ -195,12 +199,16 @@ AddInventoryProduct=Add product to inventory
 AddProduct=Add
 ApplyPMP=Apply PMP
 FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action ?
+ConfirmFlushInventory=Do you confirm this action?
 InventoryFlushed=Inventory flushed
 ExitEditMode=Exit edition
 inventoryDeleteLine=מחק את השורה
 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"
+StockSupportServices=Stock management supports Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
 ReceiveProducts=Receive items
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
diff --git a/htdocs/langs/he_IL/website.lang b/htdocs/langs/he_IL/website.lang
index b4d894f55d7..534756ac932 100644
--- a/htdocs/langs/he_IL/website.lang
+++ b/htdocs/langs/he_IL/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/he_IL/withdrawals.lang b/htdocs/langs/he_IL/withdrawals.lang
index 3defcec975a..cbca2b2f103 100644
--- a/htdocs/langs/he_IL/withdrawals.lang
+++ b/htdocs/langs/he_IL/withdrawals.lang
@@ -12,21 +12,21 @@ 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
+NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Amount to withdraw
 WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
-ResponsibleUser=Responsible user
+ResponsibleUser=User Responsible
 WithdrawalsSetup=Direct debit payment setup
 WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
-ThirdPartyBankCode=Third party bank code
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Classify credited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
@@ -50,7 +50,7 @@ StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
 StatusMotif2=Request contested
 StatusMotif3=No direct debit payment order
-StatusMotif4=Customer Order
+StatusMotif4=Sales Order
 StatusMotif5=RIB unusable
 StatusMotif6=Account without balance
 StatusMotif7=Judicial Decision
@@ -66,11 +66,11 @@ NotifyCredit=Withdrawal Credit
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=For bank accounts using RIB
 WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
-BankToReceiveWithdraw=Bank account to receive direct debit
+BankToReceiveWithdraw=Receiving Bank Account
 CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
-ShowWithdraw=Show Withdraw
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -87,13 +87,13 @@ 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
+CreditorName=Creditor 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
+ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
@@ -102,6 +102,10 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/hr_HR/accountancy.lang b/htdocs/langs/hr_HR/accountancy.lang
index 94a9277408a..93dd454abfc 100644
--- a/htdocs/langs/hr_HR/accountancy.lang
+++ b/htdocs/langs/hr_HR/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Consult here the list of third-party customers and vendors
 ListAccounts=Popis obračunskih računa
 UnknownAccountForThirdparty=Unknown third-party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
-Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Without valid dedicated account
 WithValidAccount=With valid dedicated account
 ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
 AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Raspon obračunskog računa
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
-
+DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang
index 5da7ac83e36..bf0af08078e 100644
--- a/htdocs/langs/hr_HR/admin.lang
+++ b/htdocs/langs/hr_HR/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Trajno izbriši
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Obriši sve privremene datotek (bez rizika od gubitka podataka)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Obriši privremene datoteke
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Izbriši sada
@@ -804,6 +804,7 @@ Permission401=Čitaj popuste
 Permission402=Kreiraj/izmjeni popuste
 Permission403=Ovjeri popuste
 Permission404=Obriši popuste
+Permission430=Use Debug Bar
 Permission511=Read payments of salaries
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
@@ -818,6 +819,9 @@ Permission532=Kreiraj/izmjeni usluge
 Permission534=Obriši usluge
 Permission536=Vidi/upravljaj skrivenim uslugama
 Permission538=Izvezi usluge
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Čitaj donacije
 Permission702=Kreiraj/izmjeni donacije
 Permission703=Obriši donacije
@@ -837,6 +841,12 @@ Permission1101=Čitaj naloge isporuka
 Permission1102=Kreiraj/izmjeni naloge isporuka
 Permission1104=Ovjeri naloge isporuka
 Permission1109=Obriši naloge isporuka
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Čitaj dobavljače
 Permission1182=Read purchase orders
 Permission1183=Create/modify purchase orders
@@ -859,16 +869,6 @@ Permission1251=Pokreni masovni uvoz vanjskih podataka u bazu (učitavanje podata
 Permission1321=Izvezi račune kupaca, atribute i plačanja
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
-Permission20003=Obriši zahtjeve odsutnosti
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Admin zahtjevi odsutnosti ( podešavanje i saldo ) 
-Permission23001=Pročitaj planirani posao
-Permission23002=Kreiraj/izmjeni Planirani posao
-Permission23003=Obriši planirani posao
-Permission23004=Izvrši planirani posao
 Permission2401=Čitaj akcije (događaje ili zadatke) povezanih s njegovim računom
 Permission2402=Kreiraj/izmjeni akcije (događaje ili zadatke) povezanih s njegovim računom
 Permission2403=Obriši akcije (događaje ili zadatke) povezanih s njegovim računom
@@ -882,9 +882,41 @@ Permission2503=Pošalji ili obriši dokumente
 Permission2515=Postavi mape dokumenata
 Permission2801=Koristi FTP klijent u načinu čitanja (samo pregled i download)
 Permission2802=Koristi FTP klijent u načinu pisanja (brisanje ili upload)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
+Permission20003=Obriši zahtjeve odsutnosti
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
+Permission20006=Admin zahtjevi odsutnosti ( podešavanje i saldo ) 
+Permission23001=Pročitaj planirani posao
+Permission23002=Kreiraj/izmjeni Planirani posao
+Permission23003=Obriši planirani posao
+Permission23004=Izvrši planirani posao
 Permission50101=Use Point of Sale
 Permission50201=Čitaj transakcije
 Permission50202=Uvezi transakcije
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Ispis
 Permission55001=Čitaj ankete
 Permission55002=Kreiraj/izmjeni ankete
@@ -1078,7 +1110,7 @@ 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 to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
-AccountantDesc=Edit the details of your accountant/bookkeeper
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Dostupne aplikacije/moduli
@@ -1891,3 +1923,5 @@ IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute s
 UrlForIFTTT=URL endpoint for IFTTT
 YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/hr_HR/banks.lang b/htdocs/langs/hr_HR/banks.lang
index e29a7c6fc56..8c6708b063c 100644
--- a/htdocs/langs/hr_HR/banks.lang
+++ b/htdocs/langs/hr_HR/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=Not reconciled
 CustomerInvoicePayment=Plaćanje kupca
 SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Plaćanje pretplate
-WithdrawalPayment=Isplata
+WithdrawalPayment=Debit payment order
 SocialContributionPayment=Plaćanje društveni/fiskalni porez
 BankTransfer=Bankovni transfer
 BankTransfers=Bankovni transferi
diff --git a/htdocs/langs/hr_HR/cashdesk.lang b/htdocs/langs/hr_HR/cashdesk.lang
index b1d91dfb8b5..3d9b2c69662 100644
--- a/htdocs/langs/hr_HR/cashdesk.lang
+++ b/htdocs/langs/hr_HR/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/hr_HR/mails.lang b/htdocs/langs/hr_HR/mails.lang
index 50ec607b8dc..89ef9388cf4 100644
--- a/htdocs/langs/hr_HR/mails.lang
+++ b/htdocs/langs/hr_HR/mails.lang
@@ -19,6 +19,8 @@ MailTopic=Email topic
 MailText=Poruka
 MailFile=Attached files
 MailMessage=Tijelo e-pošte
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
 ShowEMailing=Show emailing
 ListOfEMailings=List of emailings
 NewMailing=New emailing
@@ -76,9 +78,9 @@ GroupEmails=Group emails
 OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
 WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
 ResultOfMailSending=Result of mass Email sending
-NbSelected=No. selected
-NbIgnored=No. ignored
-NbSent=No. sent
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
diff --git a/htdocs/langs/hr_HR/members.lang b/htdocs/langs/hr_HR/members.lang
index ed6754593f7..49945d46b38 100644
--- a/htdocs/langs/hr_HR/members.lang
+++ b/htdocs/langs/hr_HR/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=Odaberite statistiku koju želite vidjeti...
 MenuMembersStats=Statistika
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
-Nature=Vrsta
+MemberNature=Nature of member
 Public=Informacije su javne
 NewMemberbyWeb=Novi član je dodan. Čeka odobrenje
 NewMemberForm=Obrazac novog člana
diff --git a/htdocs/langs/hr_HR/products.lang b/htdocs/langs/hr_HR/products.lang
index fe064bd6b90..4d43f08396a 100644
--- a/htdocs/langs/hr_HR/products.lang
+++ b/htdocs/langs/hr_HR/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Zemlja porijekla
-Nature=Product Type (material/finished)
+Nature=Nature of produt (material/finished)
 ShortLabel=Kratka oznaka
 Unit=Jedinica
 p=j.
diff --git a/htdocs/langs/hr_HR/salaries.lang b/htdocs/langs/hr_HR/salaries.lang
index 4eb47319af2..f80c2d8ace4 100644
--- a/htdocs/langs/hr_HR/salaries.lang
+++ b/htdocs/langs/hr_HR/salaries.lang
@@ -1,18 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger 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_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
 Salary=Plaća
 Salaries=Plaće
 NewSalaryPayment=Nova isplata plaće
+AddSalaryPayment=Add salary payment
 SalaryPayment=Isplata plaće
 SalariesPayments=Isplate plaća
 ShowSalaryPayment=Prikaži isplatu plaće
 THM=Prosječna satnica
 TJM=Prosječna dnevnica
 CurrentSalary=Trenutna plaća
-THMDescription=Ova vrijednost može se koristiti za izračun troškova utrošenog vremena na projektu unesenog od korisnika ako se korisit modul projekt
-TJMDescription=Ova vrijednost je informativna i ne koristi se niti u jednom izračunu
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
-SalariesStatistics=Statistiques salaires
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/hr_HR/stocks.lang b/htdocs/langs/hr_HR/stocks.lang
index 27d0316c768..0287a36c807 100644
--- a/htdocs/langs/hr_HR/stocks.lang
+++ b/htdocs/langs/hr_HR/stocks.lang
@@ -3,7 +3,7 @@ WarehouseCard=Kartica skladišta
 Warehouse=Skladište
 Warehouses=Skladišta
 ParentWarehouse=Parent warehouse
-NewWarehouse=Novo skladište
+NewWarehouse=New warehouse / Stock Location
 WarehouseEdit=Promjeni skladište
 MenuNewWarehouse=Novo skladište
 WarehouseSource=Izvorno skladište
@@ -28,7 +28,9 @@ ListOfInventories=List of inventories
 MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
-StocksArea=Sučelje skladišta
+StocksArea=Skladište
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
 Location=Lokacija
 LocationSummary=Kratki naziv lokacije
 NumberOfDifferentProducts=Broj različitih proizvoda
@@ -44,7 +46,6 @@ TransferStock=Prebaci zalihu
 MassStockTransferShort=Masovni prijenos zaliha
 StockMovement=Kretanje zalihe
 StockMovements=Kretanje zaliha
-LabelMovement=Oznaka kretanja
 NumberOfUnit=Broj jedinica
 UnitPurchaseValue=Jed. nabavna cijena 
 StockTooLow=Preniska zaliha
@@ -54,21 +55,23 @@ PMPValue=Procjenjena prosječna cijena
 PMPValueShort=PPC
 EnhancedValueOfWarehouses=Vrijednost skladišta
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Allow to add limit and desired stock per couple (product, warehouse) instead of per product
-IndependantSubProductStock=Zaliha proizvoda i podproizvoda su nezavisne
+AllowAddLimitStockByWarehouse=Manage also values for minimum and desired stock per pairing (product-warehouse) in addition to values per product
+IndependantSubProductStock=Product stock and subproduct stock are independent
 QtyDispatched=Otpremljena količina
 QtyDispatchedShort=Otpremljena količina
 QtyToDispatchShort=Količina za otpremu
 OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Pravilo za automatsko smanjivanje zaliha (ručno smanjivanje je uvjek moguće iako je automatsko smanjivanje aktivirano)
-RuleForStockManagementIncrease=Pravilo za automatsko povečavanje zaliha (ručno povečavanje je uvjek moguće iako je automatsko povečavanje aktivirano)
-DeStockOnBill=Smanji stvarne zalihe kod potvrde računa kupaca/odobrenja
-DeStockOnValidateOrder=Smanji stvarnu zalihu kod potvrde narudžbe kupca
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
 DeStockOnShipment=Smanji stvarnu zaligu kod potvrde otpreme
-DeStockOnShipmentOnClosing=Smanji stvarnu zalihu kod zatvaranja slanja
-ReStockOnBill=Povečaj stvarnu zalihu kod potvrde računa dobavljača/odobrenja
-ReStockOnValidateOrder=Increase real stocks on purchase orders approbation
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=Narudžba nije stigla ili nema status koji dozvoljava stavljanje proizvoda na zalihu skladišta.
 StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
 NoPredefinedProductToDispatch=Nema predefiniranih proizvoda za ovaj objekt. Potrebno je staviti robu na zalihu.
@@ -76,12 +79,12 @@ DispatchVerb=Otpremi
 StockLimitShort=Razina za obavijest
 StockLimit=Stanje zaliha za obavjest
 StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
-PhysicalStock=Fizička zaliha
+PhysicalStock=Physical Stock
 RealStock=Stvarna zaliha
-RealStockDesc=Physical or real stock is the stock you currently have into your internal warehouses/emplacements.
-RealStockWillAutomaticallyWhen=The real stock will automatically change according to this rules (see stock module setup to change this):
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Umjetna zaliha
-VirtualStockDesc=Virtual stock is the stock you will get once all open pending actions that affect stocks will be closed (supplier order received, customer order shipped, ...)
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
 IdWarehouse=ID skladišta
 DescWareHouse=Opis skladišta
 LieuWareHouse=Lokalizacija skladišta
@@ -101,7 +104,7 @@ ThisWarehouseIsPersonalStock=Ovo skladište predstavlja osobnu zalihu %s %s
 SelectWarehouseForStockDecrease=Odaberite skladište za korištenje smanjenje zaliha
 SelectWarehouseForStockIncrease=Odaberite skladište za smanjenje zaliha
 NoStockAction=Nema akcije zaliha
-DesiredStock=Željena optimalna zaliha
+DesiredStock=Desired Stock
 DesiredStockDesc=Ovaj iznos zalihe će biti vrijednost korištena a popunjavanje zaliha kod mogučnosti popunjavanja.
 StockToBuy=Za naručiti
 Replenishment=Popunjavanje
@@ -114,13 +117,13 @@ CurentSelectionMode=Trenutno odabrani način
 CurentlyUsingVirtualStock=Umjetna zaliha
 CurentlyUsingPhysicalStock=Fizička zaliha
 RuleForStockReplenishment=Pravila za popunjavanje zaliha
-SelectProductWithNotNullQty=Odaberite barem jedan proizvod s količinom i dobavljača
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
 AlertOnly= Samo obavijesti
 WarehouseForStockDecrease=Skladište <b>%s</b> će biti korišteno za smanjenje zalihe
 WarehouseForStockIncrease=Skladište <b>%s</b> će biti korišteno za povečavanje zalihe
 ForThisWarehouse=Za ovo skladište
-ReplenishmentStatusDesc=Ovo je popis svih proizvoda s zalihom manjom od željene zalihe (ili manjom od vrijednosti za obavjest ako je označeno "samo obavijest"). Koristeći to, možete kreirati narudžbe dobavljaču za popunjavanje razlika.
-ReplenishmentOrdersDesc=Ovo je popis svih otvorenih narudžba dobavljaču uključujući predefinirane proizvode. Samo otvorene narudžbe s predefiniranim proizvodima, narudžbe koje mogu utjecati na zalihe, su prikazane ovdje.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Popunjavanje
 NbOfProductBeforePeriod=Količina proizvoda %s na zalihi prije odabranog perioda (< %s)
 NbOfProductAfterPeriod=Količina proizvoda %s na zalihi nakon odabranog perioda (> %s)
@@ -130,10 +133,11 @@ RecordMovement=Record transfer
 ReceivingForSameOrder=Primke za narudžbu
 StockMovementRecorded=Kretanja zaliha zabilježeno
 RuleForStockAvailability=Pravila potrebnih zaliha
-StockMustBeEnoughForInvoice=Stanje zaliha mora biti dovoljna za dodavanje proizvoda/usluga na račun (provjera se radi na trenutnoj stvarnoj zalihi kod dodavanja stavke na račun bez obzira koje je pravilo za automatsku promjenu zalihe)
-StockMustBeEnoughForOrder=Stanje zaliha mora biti dovoljna za dodavanje proizvoda/usluga na narudžbu (provjera se radi na trenutnoj stvarnoj zalihi kod dodavanja stavke na narudžbu bez obzira koje je pravilo za automatsku promjenu zalihe)
-StockMustBeEnoughForShipment= Stanje zaliha mora biti dovoljna za dodavanje proizvoda/usluga na otpremincu (provjera se radi na trenutnoj stvarnoj zalihi kod dodavanja stavke na otpremnicu bez obzira koje je pravilo za automatsku promjenu zalihe)
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Oznaka kretanja
+TypeMovement=Type of movement
 DateMovement=Date of movement
 InventoryCode=Kretanje ili inventarni kod
 IsInPackage=Sadržane u grupiranim proizvodima
@@ -143,11 +147,11 @@ ShowWarehouse=Prikaži skladište
 MovementCorrectStock=Ispravak zalihe za proizvod %s
 MovementTransferStock=Prebacivanje zalihe za proizvod %s u drugo skladište
 InventoryCodeShort=Inv./Kret. kod
-NoPendingReceptionOnSupplierOrder=Nema prijema u tijeku za otvaranje narudžbe dobavljaču
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
 ThisSerialAlreadyExistWithDifferentDate=Ovaj lot/serijski broj (<strong>%s</strong>) već postoji ali sa različitim rokom upotrbljivosti ili valjanosti ( pronađen <strong>%s</strong> a uneseno je <strong>%s</strong>).
 OpenAll=Otvoreno za sve akcije
 OpenInternal=Open only for internal actions
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on supplier order reception
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
 OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
 ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
 ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
@@ -171,16 +175,16 @@ inventoryValidate=Ovjereno
 inventoryDraft=U tijeku
 inventorySelectWarehouse=Warehouse choice
 inventoryConfirmCreate=Create
-inventoryOfWarehouse=Inventory for warehouse : %s
-inventoryErrorQtyAdd=Error : one quantity is leaser than zero
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
 inventoryMvtStock=By inventory
 inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Filter po kategoriji
-SelectFournisseur=Supplier filter
+SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
 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
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement has date of inventory
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
@@ -195,12 +199,16 @@ AddInventoryProduct=Add product to inventory
 AddProduct=Dodaj
 ApplyPMP=Apply PMP
 FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action ?
+ConfirmFlushInventory=Do you confirm this action?
 InventoryFlushed=Inventory flushed
 ExitEditMode=Exit edition
 inventoryDeleteLine=Obriši stavku
 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"
+StockSupportServices=Stock management supports Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
 ReceiveProducts=Receive items
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
diff --git a/htdocs/langs/hr_HR/website.lang b/htdocs/langs/hr_HR/website.lang
index 9cf9587f97d..e0b26a0ac1b 100644
--- a/htdocs/langs/hr_HR/website.lang
+++ b/htdocs/langs/hr_HR/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/hr_HR/withdrawals.lang b/htdocs/langs/hr_HR/withdrawals.lang
index a46f2041ab1..784d9f2ba53 100644
--- a/htdocs/langs/hr_HR/withdrawals.lang
+++ b/htdocs/langs/hr_HR/withdrawals.lang
@@ -12,21 +12,21 @@ WithdrawalsLines=Direct debit order lines
 RequestStandingOrderToTreat=Request for direct debit payment order to process
 RequestStandingOrderTreated=Request for direct debit payment order processed
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Još nije moguće. Status isplate mora biti postavljen na 'kerditirano' prije objave odbitka na određenim stavkama.
-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
+NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Iznos za isplatu
 WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
-ResponsibleUser=Ovlaštena osoba
+ResponsibleUser=User Responsible
 WithdrawalsSetup=Direct debit payment setup
 WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
-ThirdPartyBankCode=Kod banke komitenta
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Označi kao kreditirano
 ClassCreditedConfirm=Jeste li sigurni da želite svrstati račun za isplatu kao knjiženje na svoj bankovni račun ?
 TransData=Datum prijenosa
@@ -50,7 +50,7 @@ StatusMotif0=Nedefinirano
 StatusMotif1=Nedovoljno sredstva
 StatusMotif2=Zahtjev osporen
 StatusMotif3=No direct debit payment order
-StatusMotif4=Narudžba kupca
+StatusMotif4=Sales Order
 StatusMotif5=RIB neupotrebljiv
 StatusMotif6=Račun bez stanja
 StatusMotif7=Sudska odluka
@@ -66,11 +66,11 @@ NotifyCredit=Kredit isplate
 NumeroNationalEmetter=Nacionalni broj pošiljatelja
 WithBankUsingRIB=Za bankovne račune koji koriste RIB
 WithBankUsingBANBIC=Za bankovne račune koji koriste IBAN/BIC/SWIFT
-BankToReceiveWithdraw=Bank account to receive direct debit
+BankToReceiveWithdraw=Receiving Bank Account
 CreditDate=Kreditiraj
 WithdrawalFileNotCapable=Nemoguće generirati isplatnu potvrdu za vašu zemlju %s ( Vaša zemlja nije podržana)
-ShowWithdraw=Prikaži isplatu
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Međutim, ako račun ima najmanje jednu plaćenu isplatu koja nije obrađena, neće biti postavljen kao plaćen kako bi se omogućilo prethodno upravljanje isplatama. 
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Isplatna datoteka
 SetToStatusSent=Postavi status "Datoteka poslana"
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistika statusa stavki
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -87,13 +87,13 @@ 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
+CreditorName=Creditor 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
+ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
@@ -102,6 +102,10 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/hu_HU/accountancy.lang b/htdocs/langs/hu_HU/accountancy.lang
index fe1ebe17679..fe4a3421bb3 100644
--- a/htdocs/langs/hu_HU/accountancy.lang
+++ b/htdocs/langs/hu_HU/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Consult here the list of third-party customers and vendors
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third-party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
-Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Without valid dedicated account
 WithValidAccount=With valid dedicated account
 ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
 AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Range of accounting account
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
-
+DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang
index e2d3b2c9f99..78f0003530f 100644
--- a/htdocs/langs/hu_HU/admin.lang
+++ b/htdocs/langs/hu_HU/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Tisztítsd
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Töröljön minden ideiglenes fájlt (nincs adatvesztés lehetősége)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Ideiglenes fájlok törlése
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Ürítsd ki most
@@ -804,6 +804,7 @@ Permission401=Olvassa kedvezmények
 Permission402=Létrehozza / módosítja kedvezmények
 Permission403=Kedvezmények érvényesítése
 Permission404=Törlés kedvezmények
+Permission430=Use Debug Bar
 Permission511=Read payments of salaries
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
@@ -818,6 +819,9 @@ Permission532=Létrehozza / módosítja szolgáltatások
 Permission534=Törlés szolgáltatások
 Permission536=Lásd még: / szolgáltatások kezelésére rejtett
 Permission538=Export szolgáltatások
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Olvassa el adományokat
 Permission702=Létrehozza / módosítja adományok
 Permission703=Törlés adományok
@@ -837,6 +841,12 @@ Permission1101=Olvassa el szállítási megrendelések
 Permission1102=Létrehozza / módosítja szállítóleveleket
 Permission1104=Érvényesítés szállítóleveleket
 Permission1109=Törlés szállítóleveleket
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Olvassa beszállítók
 Permission1182=Read purchase orders
 Permission1183=Create/modify purchase orders
@@ -859,16 +869,6 @@ Permission1251=Fuss tömeges import a külső adatok adatbázisba (adatok terhel
 Permission1321=Export vevői számlák, attribútumok és kifizetések
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those 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)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
 Permission2401=Olvassa tevékenységek (rendezvények, vagy feladatok) kapcsolódik a számláját
 Permission2402=Létrehozza / módosítja tevékenységek (rendezvények, vagy feladatok) kapcsolódik a számláját
 Permission2403=Törlés tevékenységek (rendezvények, vagy feladatok) kapcsolódik a számláját
@@ -882,9 +882,41 @@ Permission2503=Beküldése vagy törlése dokumentumok
 Permission2515=Beállítás dokumentumok könyvtárak
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those 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)
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale
 Permission50201=Olvassa tranzakciók
 Permission50202=Import ügyletek
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Nyomtatás
 Permission55001=Read polls
 Permission55002=Create/modify polls
@@ -1078,7 +1110,7 @@ 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=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
-AccountantDesc=Edit the details of your accountant/bookkeeper
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
@@ -1891,3 +1923,5 @@ IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute s
 UrlForIFTTT=URL endpoint for IFTTT
 YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/hu_HU/banks.lang b/htdocs/langs/hu_HU/banks.lang
index d3fbbcf468c..1f802f6e0bd 100644
--- a/htdocs/langs/hu_HU/banks.lang
+++ b/htdocs/langs/hu_HU/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=Not reconciled
 CustomerInvoicePayment=Vásárlói fizetés
 SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Előfizetés kiegyenlítése
-WithdrawalPayment=Visszavont fizetés
+WithdrawalPayment=Debit payment order
 SocialContributionPayment=Szociális/költségvetési adó fizetés
 BankTransfer=Banki átutalás
 BankTransfers=Banki átutalások
diff --git a/htdocs/langs/hu_HU/cashdesk.lang b/htdocs/langs/hu_HU/cashdesk.lang
index a078c9fa3e9..582ceb6fd2c 100644
--- a/htdocs/langs/hu_HU/cashdesk.lang
+++ b/htdocs/langs/hu_HU/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/hu_HU/mails.lang b/htdocs/langs/hu_HU/mails.lang
index caa624247a4..c488433d117 100644
--- a/htdocs/langs/hu_HU/mails.lang
+++ b/htdocs/langs/hu_HU/mails.lang
@@ -19,6 +19,8 @@ MailTopic=Email topic
 MailText=Üzenet
 MailFile=Csatolt fájlok
 MailMessage=Email tartalma
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
 ShowEMailing=eLevelezés mutatása
 ListOfEMailings=eLevelezések mutatása
 NewMailing=Új eLevelezés
@@ -76,9 +78,9 @@ GroupEmails=Group emails
 OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
 WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
 ResultOfMailSending=Result of mass Email sending
-NbSelected=No. selected
-NbIgnored=No. ignored
-NbSent=No. sent
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
diff --git a/htdocs/langs/hu_HU/members.lang b/htdocs/langs/hu_HU/members.lang
index eb88a606de1..26bf3cc1072 100644
--- a/htdocs/langs/hu_HU/members.lang
+++ b/htdocs/langs/hu_HU/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=Válassza ki a kívánt statisztikákat olvasni ...
 MenuMembersStats=Statisztika
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Utolsó feliratkozási dátum
-Nature=Természet
+MemberNature=Nature of member
 Public=Információ nyilvánosak
 NewMemberbyWeb=Új tag hozzá. Jóváhagyásra váró
 NewMemberForm=Új tag formában
diff --git a/htdocs/langs/hu_HU/products.lang b/htdocs/langs/hu_HU/products.lang
index 6c19140d4a9..4045450ea37 100644
--- a/htdocs/langs/hu_HU/products.lang
+++ b/htdocs/langs/hu_HU/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Származási ország
-Nature=Product Type (material/finished)
+Nature=Nature of produt (material/finished)
 ShortLabel=Rövid címke
 Unit=Egység
 p=db.
diff --git a/htdocs/langs/hu_HU/salaries.lang b/htdocs/langs/hu_HU/salaries.lang
index 6a82354edae..7c3c08a65bd 100644
--- a/htdocs/langs/hu_HU/salaries.lang
+++ b/htdocs/langs/hu_HU/salaries.lang
@@ -1,18 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger 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_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
 Salary=Salary
 Salaries=Salaries
 NewSalaryPayment=New salary payment
+AddSalaryPayment=Add salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
 ShowSalaryPayment=Show salary payment
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
-THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
-TJMDescription=This value is currently as information only and is not used for any calculation
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
-SalariesStatistics=Statistiques salaires
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/hu_HU/stocks.lang b/htdocs/langs/hu_HU/stocks.lang
index bdf476af89a..7ebbe5c0eaf 100644
--- a/htdocs/langs/hu_HU/stocks.lang
+++ b/htdocs/langs/hu_HU/stocks.lang
@@ -3,7 +3,7 @@ WarehouseCard=Raktár kártya
 Warehouse=Raktár
 Warehouses=Raktárak
 ParentWarehouse=Parent warehouse
-NewWarehouse=Új raktár / Készletezési terület
+NewWarehouse=New warehouse / Stock Location
 WarehouseEdit=Raktár módosítása
 MenuNewWarehouse=Új raktár
 WarehouseSource=Forrás raktár
@@ -29,6 +29,8 @@ MovementId=Movement ID
 StockMovementForId=Mozgatás azonosítója %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Raktárak
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
 Location=Hely
 LocationSummary=Hely rövid neve
 NumberOfDifferentProducts=Termékek száma összesen
@@ -44,7 +46,6 @@ TransferStock=Készlet mozgatása
 MassStockTransferShort=Tömeges készletmozgatás
 StockMovement=Készletmozgás
 StockMovements=Készletmozgás
-LabelMovement=Mozgás címkéje
 NumberOfUnit=Egységek száma
 UnitPurchaseValue=Vételár
 StockTooLow=Készlet alacsony
@@ -54,21 +55,23 @@ PMPValue=Súlyozott átlagár
 PMPValueShort=SÁÉ
 EnhancedValueOfWarehouses=Raktárak értéke
 UserWarehouseAutoCreate=Felhasználói raktár automatikus létrehozása felhasználó hozzáadásakor
-AllowAddLimitStockByWarehouse=Allow to add limit and desired stock per couple (product, warehouse) instead of per product
-IndependantSubProductStock=A termék és származtatott elemeinek készlete egymástól függetlenek
+AllowAddLimitStockByWarehouse=Manage also values for minimum and desired stock per pairing (product-warehouse) in addition to values per product
+IndependantSubProductStock=Product stock and subproduct stock are independent
 QtyDispatched=Mennyiség kiküldése
 QtyDispatchedShort=Kiadott mennyiség
 QtyToDispatchShort=Kiadásra vár
 OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Automatikus készletcsökkenés szabályának beállítása (a kézzel történő csökkentés továbbra is elérhető, az automatikus készletcsökkentés aktiválása esetén is)
-RuleForStockManagementIncrease=Automatikus készletnövelés szabályának beállítása (a kézzel történő növelés továbbra is elérhető, az automatikus készletnövelés aktiválása esetén is)
-DeStockOnBill=Tényleges készlet csökkentése számla/hitel jóváhagyásakor
-DeStockOnValidateOrder=Tényleges készlet csökkentése ügyfél rendelés jóváhagyásakor
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
 DeStockOnShipment=Tényleges készlet csökkentése kiszállítás jóváhagyásakor
-DeStockOnShipmentOnClosing=Csökkentse a valós készletet a "kiszállítás megtörtént" beállítása után
-ReStockOnBill=Tényleges készlet növelése számla/hitel jóváhagyásakor
-ReStockOnValidateOrder=Increase real stocks on purchase orders approbation
-ReStockOnDispatchOrder=Tényleges készlet növelése manuális raktárba való feladáskor miután a beszállítói rendelés beérkezett
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=A rendelés még nincs olyan állapotban, hogy kiküldhető legyen a raktárba.
 StockDiffPhysicTeoric=Magyarázat a fizikai és elméleti készlet közötti eltérésről
 NoPredefinedProductToDispatch=Nincs előredefiniált termék ehhez az objektumhoz. Tehát nincs szükség raktárba küldésre.
@@ -76,12 +79,12 @@ DispatchVerb=Kiküldés
 StockLimitShort=Figyelmeztetés küszöbértéke
 StockLimit=A készlet figyelmeztetési határértéke
 StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
-PhysicalStock=Fizikai készlet
+PhysicalStock=Physical Stock
 RealStock=Igazi készlet
-RealStockDesc=Physical or real stock is the stock you currently have into your internal warehouses/emplacements.
-RealStockWillAutomaticallyWhen=The real stock will automatically change according to this rules (see stock module setup to change this):
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtuális készlet
-VirtualStockDesc=Virtual stock is the stock you will get once all open pending actions that affect stocks will be closed (supplier order received, customer order shipped, ...)
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
 IdWarehouse=Raktár azon.
 DescWareHouse=Raktár leírás
 LieuWareHouse=Raktár helye
@@ -101,7 +104,7 @@ ThisWarehouseIsPersonalStock=Ez a raktár %s %s személyes készletet képvisel
 SelectWarehouseForStockDecrease=Válassza ki melyik raktár készlete csökkenjen
 SelectWarehouseForStockIncrease=Válassza ki melyik raktár készlete növekedjen
 NoStockAction=Nincs készletmozgás
-DesiredStock=Kívánt készletmennyiség
+DesiredStock=Desired Stock
 DesiredStockDesc=Ez a készlet mennyiség lesz használatos a pótlási funkcióban az alapértelmezett értéknek
 StockToBuy=Rendelésre
 Replenishment=Feltöltés
@@ -114,13 +117,13 @@ CurentSelectionMode=Jelenlegi kiválasztási mód
 CurentlyUsingVirtualStock=Virtuális készlet
 CurentlyUsingPhysicalStock=Fizikai készlet
 RuleForStockReplenishment=A készletek pótlásának szabálya
-SelectProductWithNotNullQty=Válasszon legalább egy készleten lévő terméket és beszállítót
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
 AlertOnly= Csak figyelmeztetések
 WarehouseForStockDecrease=A <b>%s</b> raktár készlete lesz csökkentve
 WarehouseForStockIncrease=A <b>%s</b> raktár készlete lesz növelve
 ForThisWarehouse=Az aktuális raktár részére
-ReplenishmentStatusDesc=Azon termékek listája melyek készlete alacsonyabb a kívánt értéknél (vagy a figyelmeztetési küszöb értékénél, ha a jelölőnégyzet be van jelölve) A jelölőnégyzet használatával beszállítói rendeléseket készíthet a hiány pótlására.
-ReplenishmentOrdersDesc=Azon termékek megrendelői listája melyek folyamatban lévő megrendeléseken szerepelnek és közvetlenül befolyásolják a készletek alakulását.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Készletek pótlása
 NbOfProductBeforePeriod=A %s termékből rendelkezésre álló mennyiség a kiválasztott periódusban (%s előtt)
 NbOfProductAfterPeriod=A %s termékből rendelkezésre álló mennyiség a kiválasztott periódusban (%s után)
@@ -130,10 +133,11 @@ RecordMovement=Mozgatás rögzítése
 ReceivingForSameOrder=Megrendelés nyugtái
 StockMovementRecorded=Rögzített készletmozgások
 RuleForStockAvailability=A készlet tartásának szabályai
-StockMustBeEnoughForInvoice=A készletnek elegendőnek kell lennie a termék/szolgáltatás kiszámlázásához (ellenőrzés végrehajtva a jelenlegi tényleges készlettel, ha sort ad a számlához, bármely automatikus készlet változtató szabály mellett)
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Mozgás címkéje
+TypeMovement=Type of movement
 DateMovement=Date of movement
 InventoryCode=Mozgás vagy leltár kód
 IsInPackage=Csomag tartalmazza
@@ -143,11 +147,11 @@ ShowWarehouse=Raktár részletei
 MovementCorrectStock=A %s termék készlet-módosítása
 MovementTransferStock=A %s termék készletének mozgatása másik raktárba
 InventoryCodeShort=Lelt./Mozg. kód
-NoPendingReceptionOnSupplierOrder=Nincs függőben lévő bevételezés mivel létezik nyitott beszállítói megrendelés
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
 ThisSerialAlreadyExistWithDifferentDate=A (<strong>%s</strong>) tétel/cikkszám már létezik de eltérő lejárati/eladási határidővel (jelenleg <strong>%s</strong> az imént  felvitt érték ellenben <strong>%s</strong>).
 OpenAll=Nyitott minden műveletre
 OpenInternal=Nyitott csak belső műveletek számára
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on supplier order reception
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
 OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
 ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
 ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
@@ -171,16 +175,16 @@ inventoryValidate=Hitelesítetve
 inventoryDraft=Folyamatban
 inventorySelectWarehouse=Warehouse choice
 inventoryConfirmCreate=Készít
-inventoryOfWarehouse=Inventory for warehouse : %s
-inventoryErrorQtyAdd=Error : one quantity is leaser than zero
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
 inventoryMvtStock=By inventory
 inventoryWarningProductAlreadyExists=Ez a termék már szerepel a listában
 SelectCategory=Kategória szűrés
-SelectFournisseur=Supplier filter
+SelectFournisseur=Vendor filter
 inventoryOnDate=Készletnyilvántartás
-INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
 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
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement has date of inventory
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
@@ -195,12 +199,16 @@ AddInventoryProduct=Add product to inventory
 AddProduct=Hozzáadás
 ApplyPMP=Apply PMP
 FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action ?
+ConfirmFlushInventory=Do you confirm this action?
 InventoryFlushed=Inventory flushed
 ExitEditMode=Exit edition
 inventoryDeleteLine=Sor törlése
 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"
+StockSupportServices=Stock management supports Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
 ReceiveProducts=Receive items
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
diff --git a/htdocs/langs/hu_HU/website.lang b/htdocs/langs/hu_HU/website.lang
index 46887e0bb84..e84a4c5aa47 100644
--- a/htdocs/langs/hu_HU/website.lang
+++ b/htdocs/langs/hu_HU/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/hu_HU/withdrawals.lang b/htdocs/langs/hu_HU/withdrawals.lang
index 619a99d9cd2..1455787b6b5 100644
--- a/htdocs/langs/hu_HU/withdrawals.lang
+++ b/htdocs/langs/hu_HU/withdrawals.lang
@@ -12,21 +12,21 @@ 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
+NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Visszavonási mennyiség
 WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
-ResponsibleUser=Felelős felhasználó
+ResponsibleUser=User Responsible
 WithdrawalsSetup=Direct debit payment setup
 WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
-ThirdPartyBankCode=Harmadik fél Bank kód
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Jóváírtan osztályozva
 ClassCreditedConfirm=Biztos, hogy jóvírtan akarja osztályozni a visszavonást a bankszámlájáról?
 TransData=Dátum Átviteli
@@ -50,7 +50,7 @@ StatusMotif0=Meghatározatlan
 StatusMotif1=Rendelkezni insuffisante
 StatusMotif2=Conteste tirázs
 StatusMotif3=No direct debit payment order
-StatusMotif4=Az ügyfelek érdekében
+StatusMotif4=Sales Order
 StatusMotif5=RIB inexploitable
 StatusMotif6=Számla nélküli egyenleg
 StatusMotif7=Bírósági határozat
@@ -66,11 +66,11 @@ NotifyCredit=Felmondás Hitel
 NumeroNationalEmetter=Nemzeti Adó száma
 WithBankUsingRIB=A bankszámlák segítségével RIB
 WithBankUsingBANBIC=A bankszámlák segítségével IBAN / BIC / SWIFT
-BankToReceiveWithdraw=Bank account to receive direct debit
+BankToReceiveWithdraw=Receiving Bank Account
 CreditDate=Hitelt
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
-ShowWithdraw=Mutasd Kifizetés
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Azonban, ha számlát legalább egy fizetési visszavonása még nem feldolgozott, akkor nem kell beállítani, hogy fizetni kell kezelni visszavonása előtt.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -87,13 +87,13 @@ 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
+CreditorName=Creditor 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
+ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
@@ -102,6 +102,10 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/id_ID/accountancy.lang b/htdocs/langs/id_ID/accountancy.lang
index eefd889636f..87a4ab6c61b 100644
--- a/htdocs/langs/id_ID/accountancy.lang
+++ b/htdocs/langs/id_ID/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Consult here the list of third-party customers and vendors
 ListAccounts=Daftar akun-akun akunting
 UnknownAccountForThirdparty=Unknown third-party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
-Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Without valid dedicated account
 WithValidAccount=With valid dedicated account
 ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
 AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Rentang akun-akun akuntansi
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
-
+DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang
index bb2bad50407..6287fa067bc 100644
--- a/htdocs/langs/id_ID/admin.lang
+++ b/htdocs/langs/id_ID/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Perbersihan
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Bersihkan sekarang
@@ -804,6 +804,7 @@ Permission401=Read discounts
 Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
+Permission430=Use Debug Bar
 Permission511=Read payments of salaries
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
@@ -818,6 +819,9 @@ Permission532=Membuat/Merubah Jasa
 Permission534=Menghapus Jasa
 Permission536=See/manage hidden services
 Permission538=Export services
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Membaca Sumbangan
 Permission702=Membuat/Merubah Sumbangan
 Permission703=Menghapus Sumbangan
@@ -837,6 +841,12 @@ Permission1101=Read delivery orders
 Permission1102=Create/modify delivery orders
 Permission1104=Validate delivery orders
 Permission1109=Delete delivery orders
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Mambaca Pemasok
 Permission1182=Read purchase orders
 Permission1183=Create/modify purchase orders
@@ -859,16 +869,6 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those 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)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
 Permission2401=Read actions (events or tasks) linked to his account
 Permission2402=Create/modify actions (events or tasks) linked to his account
 Permission2403=Delete actions (events or tasks) linked to his account
@@ -882,9 +882,41 @@ Permission2503=Submit or delete documents
 Permission2515=Setup documents directories
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those 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)
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale
 Permission50201=Membaca Data Transaksi
 Permission50202=Import transactions
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Print
 Permission55001=Read polls
 Permission55002=Create/modify polls
@@ -1078,7 +1110,7 @@ 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 to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
-AccountantDesc=Edit the details of your accountant/bookkeeper
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
@@ -1891,3 +1923,5 @@ IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute s
 UrlForIFTTT=URL endpoint for IFTTT
 YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/id_ID/banks.lang b/htdocs/langs/id_ID/banks.lang
index 1f78da4c52d..2f255f7d905 100644
--- a/htdocs/langs/id_ID/banks.lang
+++ b/htdocs/langs/id_ID/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
 SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Subscription payment
-WithdrawalPayment=Withdrawal payment
+WithdrawalPayment=Debit payment order
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
diff --git a/htdocs/langs/id_ID/cashdesk.lang b/htdocs/langs/id_ID/cashdesk.lang
index bed57965e41..0f02416b5de 100644
--- a/htdocs/langs/id_ID/cashdesk.lang
+++ b/htdocs/langs/id_ID/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/id_ID/mails.lang b/htdocs/langs/id_ID/mails.lang
index c0ab2695fd7..c02d383c4fb 100644
--- a/htdocs/langs/id_ID/mails.lang
+++ b/htdocs/langs/id_ID/mails.lang
@@ -19,6 +19,8 @@ MailTopic=Email topic
 MailText=Message
 MailFile=Attached files
 MailMessage=Email body
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
 ShowEMailing=Show emailing
 ListOfEMailings=List of emailings
 NewMailing=New emailing
@@ -76,9 +78,9 @@ GroupEmails=Group emails
 OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
 WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
 ResultOfMailSending=Result of mass Email sending
-NbSelected=No. selected
-NbIgnored=No. ignored
-NbSent=No. sent
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
diff --git a/htdocs/langs/id_ID/members.lang b/htdocs/langs/id_ID/members.lang
index 509f7c9bb14..56fcf716b4b 100644
--- a/htdocs/langs/id_ID/members.lang
+++ b/htdocs/langs/id_ID/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
-Nature=Nature
+MemberNature=Nature of member
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
diff --git a/htdocs/langs/id_ID/products.lang b/htdocs/langs/id_ID/products.lang
index 74e7fff9faf..e36e3d80ff7 100644
--- a/htdocs/langs/id_ID/products.lang
+++ b/htdocs/langs/id_ID/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
-Nature=Product Type (material/finished)
+Nature=Nature of produt (material/finished)
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/id_ID/salaries.lang b/htdocs/langs/id_ID/salaries.lang
index 55f007ecfeb..88a213891e3 100644
--- a/htdocs/langs/id_ID/salaries.lang
+++ b/htdocs/langs/id_ID/salaries.lang
@@ -1,18 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger 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_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
 Salary=Gaji
 Salaries=Gaji
 NewSalaryPayment=Pembayaran Gaji Baru
+AddSalaryPayment=Add salary payment
 SalaryPayment=Pembayaran Gaji
 SalariesPayments=Pembayaran Gaji
 ShowSalaryPayment=Menampilkan Pembayaran Gaji
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
-THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
-TJMDescription=This value is currently as information only and is not used for any calculation
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
-SalariesStatistics=Statistiques salaires
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/id_ID/stocks.lang b/htdocs/langs/id_ID/stocks.lang
index bbb30fe12e6..e1195546d98 100644
--- a/htdocs/langs/id_ID/stocks.lang
+++ b/htdocs/langs/id_ID/stocks.lang
@@ -3,7 +3,7 @@ WarehouseCard=Warehouse card
 Warehouse=Warehouse
 Warehouses=Warehouses
 ParentWarehouse=Parent warehouse
-NewWarehouse=New warehouse / Stock area
+NewWarehouse=New warehouse / Stock Location
 WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
 WarehouseSource=Source warehouse
@@ -29,6 +29,8 @@ MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
 Location=Tempat
 LocationSummary=Short name location
 NumberOfDifferentProducts=Number of different products
@@ -44,7 +46,6 @@ TransferStock=Transfer stock
 MassStockTransferShort=Mass stock transfer
 StockMovement=Stock movement
 StockMovements=Stock movements
-LabelMovement=Movement label
 NumberOfUnit=Number of units
 UnitPurchaseValue=Unit purchase price
 StockTooLow=Stock too low
@@ -54,21 +55,23 @@ PMPValue=Weighted average price
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Allow to add limit and desired stock per couple (product, warehouse) instead of per product
-IndependantSubProductStock=Product stock and subproduct stock are independant
+AllowAddLimitStockByWarehouse=Manage also values for minimum and desired stock per pairing (product-warehouse) in addition to values per product
+IndependantSubProductStock=Product stock and subproduct stock are independent
 QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
-RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
-DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
-DeStockOnValidateOrder=Decrease real stocks on customers orders validation
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
 DeStockOnShipment=Decrease real stocks on shipping validation
-DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification closed
-ReStockOnBill=Increase real stocks on suppliers invoices/credit notes validation
-ReStockOnValidateOrder=Increase real stocks on purchase orders approbation
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows dispatching of products in stock warehouses.
 StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
 NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required.
@@ -76,12 +79,12 @@ DispatchVerb=Dispatch
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
 StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
-PhysicalStock=Physical stock
+PhysicalStock=Physical Stock
 RealStock=Real Stock
-RealStockDesc=Physical or real stock is the stock you currently have into your internal warehouses/emplacements.
-RealStockWillAutomaticallyWhen=The real stock will automatically change according to this rules (see stock module setup to change this):
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
-VirtualStockDesc=Virtual stock is the stock you will get once all open pending actions that affect stocks will be closed (supplier order received, customer order shipped, ...)
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
@@ -101,7 +104,7 @@ ThisWarehouseIsPersonalStock=This warehouse represents personal stock of %s %s
 SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
 SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
 NoStockAction=No stock action
-DesiredStock=Desired optimal stock
+DesiredStock=Desired Stock
 DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
 StockToBuy=To order
 Replenishment=Replenishment
@@ -114,13 +117,13 @@ CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtual stock
 CurentlyUsingPhysicalStock=Physical stock
 RuleForStockReplenishment=Rule for stocks replenishment
-SelectProductWithNotNullQty=Select at least one product with a qty not null and a supplier
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
 AlertOnly= Alerts only
 WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is a list of all open supplier orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,10 +133,11 @@ RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever is rule for automatic stock change)
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
+TypeMovement=Type of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -143,11 +147,11 @@ ShowWarehouse=Show warehouse
 MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
 OpenAll=Open for all actions
 OpenInternal=Open only for internal actions
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on supplier order reception
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
 OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
 ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
 ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
@@ -171,16 +175,16 @@ inventoryValidate=Divalidasi
 inventoryDraft=Running
 inventorySelectWarehouse=Warehouse choice
 inventoryConfirmCreate=Buat
-inventoryOfWarehouse=Inventory for warehouse : %s
-inventoryErrorQtyAdd=Error : one quantity is leaser than zero
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
 inventoryMvtStock=By inventory
 inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
-SelectFournisseur=Supplier filter
+SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
 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
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement has date of inventory
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
@@ -195,12 +199,16 @@ AddInventoryProduct=Add product to inventory
 AddProduct=Add
 ApplyPMP=Apply PMP
 FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action ?
+ConfirmFlushInventory=Do you confirm this action?
 InventoryFlushed=Inventory flushed
 ExitEditMode=Exit edition
 inventoryDeleteLine=Delete line
 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"
+StockSupportServices=Stock management supports Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
 ReceiveProducts=Receive items
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
diff --git a/htdocs/langs/id_ID/website.lang b/htdocs/langs/id_ID/website.lang
index b4d894f55d7..534756ac932 100644
--- a/htdocs/langs/id_ID/website.lang
+++ b/htdocs/langs/id_ID/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/id_ID/withdrawals.lang b/htdocs/langs/id_ID/withdrawals.lang
index e3f72670cb5..a243902eaf8 100644
--- a/htdocs/langs/id_ID/withdrawals.lang
+++ b/htdocs/langs/id_ID/withdrawals.lang
@@ -12,21 +12,21 @@ 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
+NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Amount to withdraw
 WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
-ResponsibleUser=Responsible user
+ResponsibleUser=User Responsible
 WithdrawalsSetup=Direct debit payment setup
 WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
-ThirdPartyBankCode=Third party bank code
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Classify credited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
@@ -50,7 +50,7 @@ StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
 StatusMotif2=Request contested
 StatusMotif3=No direct debit payment order
-StatusMotif4=Customer Order
+StatusMotif4=Sales Order
 StatusMotif5=RIB unusable
 StatusMotif6=Account without balance
 StatusMotif7=Judicial Decision
@@ -66,11 +66,11 @@ NotifyCredit=Withdrawal Credit
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=For bank accounts using RIB
 WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
-BankToReceiveWithdraw=Bank account to receive direct debit
+BankToReceiveWithdraw=Receiving Bank Account
 CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
-ShowWithdraw=Show Withdraw
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -87,13 +87,13 @@ 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
+CreditorName=Creditor 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
+ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
@@ -102,6 +102,10 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/is_IS/accountancy.lang b/htdocs/langs/is_IS/accountancy.lang
index 328eb1f21e7..c15b5f30176 100644
--- a/htdocs/langs/is_IS/accountancy.lang
+++ b/htdocs/langs/is_IS/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Consult here the list of third-party customers and vendors
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third-party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
-Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Without valid dedicated account
 WithValidAccount=With valid dedicated account
 ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
 AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Range of accounting account
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
-
+DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang
index 2d3bc7d8260..6492046725e 100644
--- a/htdocs/langs/is_IS/admin.lang
+++ b/htdocs/langs/is_IS/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Hreinsa nú
@@ -804,6 +804,7 @@ Permission401=Lesa afsláttur
 Permission402=Búa til / breyta afsláttur
 Permission403=Staðfesta afsláttur
 Permission404=Eyða afsláttur
+Permission430=Use Debug Bar
 Permission511=Read payments of salaries
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
@@ -818,6 +819,9 @@ Permission532=Búa til / breyta þjónusta
 Permission534=Eyða þjónustu
 Permission536=Sjá / stjórna falinn þjónusta
 Permission538=Útflutningur þjónustu
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Lesa Fjárframlög
 Permission702=Búa til / breyta framlög
 Permission703=Eyða Fjárframlög
@@ -837,6 +841,12 @@ Permission1101=Lesa afhendingu pantana
 Permission1102=Búa til / breyta afhendingu pantana
 Permission1104=Staðfesta afhendingu pantana
 Permission1109=Eyða pantanir sending
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Lesa birgja
 Permission1182=Read purchase orders
 Permission1183=Create/modify purchase orders
@@ -859,16 +869,6 @@ Permission1251=Setja massa innflutningi af ytri gögn inn í gagnagrunn (gögn 
 Permission1321=Útflutningur viðskiptavina reikninga, eiginleika og greiðslur
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those 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)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
 Permission2401=Lesa aðgerða (atburðum eða verkefni) tengd reikningnum hans
 Permission2402=Búa til / breyta aðgerðum (atburðum eða verkefni) tengd reikningnum hans
 Permission2403=Eyða aðgerða (atburðum eða verkefni) tengd reikningnum hans
@@ -882,9 +882,41 @@ Permission2503=Senda eða eyða skjölum
 Permission2515=Skipulag skjöl framkvæmdarstjóra
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those 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)
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale
 Permission50201=Lesa viðskipti
 Permission50202=Flytja viðskipti
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Print
 Permission55001=Read polls
 Permission55002=Create/modify polls
@@ -1078,7 +1110,7 @@ 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=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
-AccountantDesc=Edit the details of your accountant/bookkeeper
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
@@ -1891,3 +1923,5 @@ IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute s
 UrlForIFTTT=URL endpoint for IFTTT
 YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/is_IS/banks.lang b/htdocs/langs/is_IS/banks.lang
index d89bb9d4f26..efa120a0412 100644
--- a/htdocs/langs/is_IS/banks.lang
+++ b/htdocs/langs/is_IS/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=Not reconciled
 CustomerInvoicePayment=Viðskiptavinur greiðslu
 SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Áskrift greiðslu
-WithdrawalPayment=Afturköllun greiðslu
+WithdrawalPayment=Debit payment order
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Millifærslu
 BankTransfers=Millifærslur
diff --git a/htdocs/langs/is_IS/cashdesk.lang b/htdocs/langs/is_IS/cashdesk.lang
index 88a37f77ca0..e1add432dcf 100644
--- a/htdocs/langs/is_IS/cashdesk.lang
+++ b/htdocs/langs/is_IS/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/is_IS/mails.lang b/htdocs/langs/is_IS/mails.lang
index fcec5b4c5e1..23de4f9fad2 100644
--- a/htdocs/langs/is_IS/mails.lang
+++ b/htdocs/langs/is_IS/mails.lang
@@ -19,6 +19,8 @@ MailTopic=Email topic
 MailText=Message
 MailFile=Meðfylgjandi skrá
 MailMessage=Email líkami
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
 ShowEMailing=Sýna póst
 ListOfEMailings=Listi yfir emailings
 NewMailing=New póst
@@ -76,9 +78,9 @@ GroupEmails=Group emails
 OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
 WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
 ResultOfMailSending=Result of mass Email sending
-NbSelected=No. selected
-NbIgnored=No. ignored
-NbSent=No. sent
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
diff --git a/htdocs/langs/is_IS/members.lang b/htdocs/langs/is_IS/members.lang
index 22b88908648..da75176581e 100644
--- a/htdocs/langs/is_IS/members.lang
+++ b/htdocs/langs/is_IS/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=Veldu tölfræði sem þú vilt lesa ...
 MenuMembersStats=Tölfræði
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
-Nature=Náttúra
+MemberNature=Nature of member
 Public=Upplýsingar eru almenningi
 NewMemberbyWeb=Nýr meðlimur bætt. Beðið eftir samþykki
 NewMemberForm=Nýr meðlimur mynd
diff --git a/htdocs/langs/is_IS/products.lang b/htdocs/langs/is_IS/products.lang
index 960b9f12451..563abacb975 100644
--- a/htdocs/langs/is_IS/products.lang
+++ b/htdocs/langs/is_IS/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Uppruni land
-Nature=Product Type (material/finished)
+Nature=Nature of produt (material/finished)
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/is_IS/salaries.lang b/htdocs/langs/is_IS/salaries.lang
index 6a82354edae..7c3c08a65bd 100644
--- a/htdocs/langs/is_IS/salaries.lang
+++ b/htdocs/langs/is_IS/salaries.lang
@@ -1,18 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger 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_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
 Salary=Salary
 Salaries=Salaries
 NewSalaryPayment=New salary payment
+AddSalaryPayment=Add salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
 ShowSalaryPayment=Show salary payment
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
-THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
-TJMDescription=This value is currently as information only and is not used for any calculation
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
-SalariesStatistics=Statistiques salaires
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/is_IS/stocks.lang b/htdocs/langs/is_IS/stocks.lang
index cae9fa98dcf..59e93e1799c 100644
--- a/htdocs/langs/is_IS/stocks.lang
+++ b/htdocs/langs/is_IS/stocks.lang
@@ -3,7 +3,7 @@ WarehouseCard=Lager-kort
 Warehouse=Lager
 Warehouses=Vöruhús
 ParentWarehouse=Parent warehouse
-NewWarehouse=Nýr lager / lager area
+NewWarehouse=New warehouse / Stock Location
 WarehouseEdit=Breyta vörugeymsla
 MenuNewWarehouse=Nýr lager
 WarehouseSource=Heimild vörugeymsla
@@ -29,6 +29,8 @@ MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
 Location=Staðsetning
 LocationSummary=Stutt nafn staðsetning
 NumberOfDifferentProducts=Number of different products
@@ -44,7 +46,6 @@ TransferStock=Transfer stock
 MassStockTransferShort=Mass stock transfer
 StockMovement=Stock movement
 StockMovements=Stock movements
-LabelMovement=Movement label
 NumberOfUnit=Fjöldi eininga
 UnitPurchaseValue=Unit purchase price
 StockTooLow=Stock of lágt
@@ -54,21 +55,23 @@ PMPValue=Vegið meðalverð
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Vöruhús gildi
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Allow to add limit and desired stock per couple (product, warehouse) instead of per product
-IndependantSubProductStock=Product stock and subproduct stock are independant
+AllowAddLimitStockByWarehouse=Manage also values for minimum and desired stock per pairing (product-warehouse) in addition to values per product
+IndependantSubProductStock=Product stock and subproduct stock are independent
 QtyDispatched=Magn send
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
-RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
-DeStockOnBill=Minnka raunverulegur birgðir á viðskiptavini reikningum / kredit athugasemdir löggilding
-DeStockOnValidateOrder=Minnka raunverulegur birgðir á viðskiptavini pantanir löggilding
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
 DeStockOnShipment=Decrease real stocks on shipping validation
-DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification closed
-ReStockOnBill=Auka raunverulegur birgðir birgja reikningum / kredit athugasemdir löggilding
-ReStockOnValidateOrder=Increase real stocks on purchase orders approbation
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=Panta hefur ekki enn eða ekki meira stöðu sem gerir dispatching af vörum í vöruhús lager.
 StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
 NoPredefinedProductToDispatch=Engar fyrirfram skilgreindum vörum fyrir þennan hlut. Svo neitun dispatching til á lager er krafist.
@@ -76,12 +79,12 @@ DispatchVerb=Senda
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
 StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
-PhysicalStock=Líkamleg lager
+PhysicalStock=Physical Stock
 RealStock=Real lager
-RealStockDesc=Physical or real stock is the stock you currently have into your internal warehouses/emplacements.
-RealStockWillAutomaticallyWhen=The real stock will automatically change according to this rules (see stock module setup to change this):
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual Stock
-VirtualStockDesc=Virtual stock is the stock you will get once all open pending actions that affect stocks will be closed (supplier order received, customer order shipped, ...)
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
 IdWarehouse=Auðkenni vörugeymsla
 DescWareHouse=Lýsing vörugeymsla
 LieuWareHouse=Staðsetning lager
@@ -101,7 +104,7 @@ ThisWarehouseIsPersonalStock=Þetta vöruhús táknar persónulegt birgðir af %
 SelectWarehouseForStockDecrease=Veldu vöruhús að nota til lækkunar hlutabréfa
 SelectWarehouseForStockIncrease=Veldu vöruhús að nota fyrir hækkun hlutabréfa
 NoStockAction=No stock action
-DesiredStock=Desired optimal stock
+DesiredStock=Desired Stock
 DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
 StockToBuy=To order
 Replenishment=Replenishment
@@ -114,13 +117,13 @@ CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtual Stock
 CurentlyUsingPhysicalStock=Líkamleg lager
 RuleForStockReplenishment=Rule for stocks replenishment
-SelectProductWithNotNullQty=Select at least one product with a qty not null and a supplier
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
 AlertOnly= Alerts only
 WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is a list of all open supplier orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,10 +133,11 @@ RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever is rule for automatic stock change)
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
+TypeMovement=Type of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -143,11 +147,11 @@ ShowWarehouse=Sýna vöruhús
 MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
 OpenAll=Open for all actions
 OpenInternal=Open only for internal actions
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on supplier order reception
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
 OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
 ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
 ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
@@ -171,16 +175,16 @@ inventoryValidate=Staðfest
 inventoryDraft=Running
 inventorySelectWarehouse=Warehouse choice
 inventoryConfirmCreate=Create
-inventoryOfWarehouse=Inventory for warehouse : %s
-inventoryErrorQtyAdd=Error : one quantity is leaser than zero
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
 inventoryMvtStock=By inventory
 inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Flokkur sía
-SelectFournisseur=Supplier filter
+SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
 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
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement has date of inventory
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
@@ -195,12 +199,16 @@ AddInventoryProduct=Add product to inventory
 AddProduct=Bæta við
 ApplyPMP=Apply PMP
 FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action ?
+ConfirmFlushInventory=Do you confirm this action?
 InventoryFlushed=Inventory flushed
 ExitEditMode=Exit edition
 inventoryDeleteLine=Eyða línu
 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"
+StockSupportServices=Stock management supports Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
 ReceiveProducts=Receive items
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
diff --git a/htdocs/langs/is_IS/website.lang b/htdocs/langs/is_IS/website.lang
index 0a95039abff..e5fe3f05d8a 100644
--- a/htdocs/langs/is_IS/website.lang
+++ b/htdocs/langs/is_IS/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/is_IS/withdrawals.lang b/htdocs/langs/is_IS/withdrawals.lang
index 85eec887369..dafb7abf728 100644
--- a/htdocs/langs/is_IS/withdrawals.lang
+++ b/htdocs/langs/is_IS/withdrawals.lang
@@ -12,21 +12,21 @@ 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
+NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Upphæð til baka
 WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
-ResponsibleUser=Ábyrg notanda
+ResponsibleUser=User Responsible
 WithdrawalsSetup=Direct debit payment setup
 WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
-ThirdPartyBankCode=Í þriðja aðila bankakóði
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Flokka fært
 ClassCreditedConfirm=Ertu viss um að þú viljir að flokka þessa afturköllun berst sem lögð á bankareikning þinn?
 TransData=Date Sending
@@ -50,7 +50,7 @@ StatusMotif0=Ótilgreint
 StatusMotif1=Kveða insuffisante
 StatusMotif2=Tirage conteste
 StatusMotif3=No direct debit payment order
-StatusMotif4=Customer Order
+StatusMotif4=Sales Order
 StatusMotif5=RIB inexploitable
 StatusMotif6=Reikningur án jafnvægi
 StatusMotif7=Dómstóla ákvörðun
@@ -66,11 +66,11 @@ NotifyCredit=Uppsögn Credit
 NumeroNationalEmetter=National Sendandi Fjöldi
 WithBankUsingRIB=Fyrir bankareikninga með RIB
 WithBankUsingBANBIC=Fyrir bankareikninga með IBAN / BIC / Swift
-BankToReceiveWithdraw=Bank account to receive direct debit
+BankToReceiveWithdraw=Receiving Bank Account
 CreditDate=Útlán á
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
-ShowWithdraw=Sýna Dragið
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Hins vegar, ef reikningur hefur að minnsta kosti einn hætt greiðslu ekki enn afgreidd, mun það ekki vera eins og borgað til að leyfa að stjórna afturköllun áður.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -87,13 +87,13 @@ 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
+CreditorName=Creditor 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
+ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
@@ -102,6 +102,10 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/it_IT/accountancy.lang b/htdocs/langs/it_IT/accountancy.lang
index 58380fbc5a1..d48ef981c48 100644
--- a/htdocs/langs/it_IT/accountancy.lang
+++ b/htdocs/langs/it_IT/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Consult here the list of third-party customers and vendors
 ListAccounts=Lista delle voci del piano dei conti
 UnknownAccountForThirdparty=Unknown third-party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
-Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Id Piano dei Conti
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Without valid dedicated account
 WithValidAccount=With valid dedicated account
 ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
 AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Range of accounting account
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
-
+DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang
index 5d82e047d07..76561fafefa 100644
--- a/htdocs/langs/it_IT/admin.lang
+++ b/htdocs/langs/it_IT/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=Questa area fornisce funzioni di amministrazione. Usa il men
 Purge=Pulizia
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Eliminia il file log, compreso <b>%s</b> definito per il modulo Syslog (nessun rischio di perdita di dati)
-PurgeDeleteTemporaryFiles=Elimina tutti i file temporanei (nessun rischio di perdere dati)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Cancella fle temporanei
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Procedo all'eliminazione
@@ -804,6 +804,7 @@ Permission401=Vedere sconti
 Permission402=Creare/modificare sconti
 Permission403=Convalidare sconti
 Permission404=Eliminare sconti
+Permission430=Use Debug Bar
 Permission511=Read payments of salaries
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
@@ -818,6 +819,9 @@ Permission532=Creare/modificare servizi
 Permission534=Eliminare servizi
 Permission536=Vedere/gestire servizi nascosti
 Permission538=Esportare servizi
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Vedere donazioni
 Permission702=Creare/modificare donazioni
 Permission703=Eliminare donazioni
@@ -837,6 +841,12 @@ Permission1101=Vedere documenti di consegna
 Permission1102=Creare/modificare documenti di consegna
 Permission1104=Convalidare documenti di consegna
 Permission1109=Eliminare documenti di consegna
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Vedere fornitori
 Permission1182=Read purchase orders
 Permission1183=Create/modify purchase orders
@@ -859,16 +869,6 @@ Permission1251=Eseguire importazioni di massa di dati esterni nel database (data
 Permission1321=Esportare fatture attive, attributi e pagamenti
 Permission1322=Riaprire le fatture pagate
 Permission1421=Export sales orders and attributes
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
-Permission20003=Eliminare le richieste di ferie
-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)
-Permission23001=Leggi lavoro pianificato
-Permission23002=Crea / Aggiorna lavoro pianificato
-Permission23003=Elimina lavoro pianificato
-Permission23004=Esegui lavoro pianificato
 Permission2401=Vedere azioni (eventi o compiti) personali
 Permission2402=Creare/modificare azioni (eventi o compiti) personali
 Permission2403=Cancellare azioni (eventi o compiti) personali
@@ -882,9 +882,41 @@ Permission2503=Proporre o cancellare documenti
 Permission2515=Impostare directory documenti
 Permission2801=Client FTP in sola lettura (solo download e navigazione dei file)
 Permission2802=Client FTP in lettura e scrittura (caricamento e eliminazione dei file)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
+Permission20003=Eliminare le richieste di ferie
+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)
+Permission23001=Leggi lavoro pianificato
+Permission23002=Crea / Aggiorna lavoro pianificato
+Permission23003=Elimina lavoro pianificato
+Permission23004=Esegui lavoro pianificato
 Permission50101=Use Point of Sale
 Permission50201=Vedere transazioni
 Permission50202=Importare transazioni
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Stampa
 Permission55001=Leggi sondaggi
 Permission55002=Crea/modifica sondaggi
@@ -1078,7 +1110,7 @@ AreaForAdminOnly=I parametri di setup possono essere definiti solo da utenti di
 SystemInfoDesc=Le informazioni di sistema sono dati tecnici visibili in sola lettura e solo dagli amministratori.
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
-AccountantDesc=Edit the details of your accountant/bookkeeper
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Moduli disponibili
@@ -1891,3 +1923,5 @@ IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute s
 UrlForIFTTT=URL endpoint for IFTTT
 YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/it_IT/banks.lang b/htdocs/langs/it_IT/banks.lang
index b0e55d658a0..9195288e505 100644
--- a/htdocs/langs/it_IT/banks.lang
+++ b/htdocs/langs/it_IT/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=Non conciliata
 CustomerInvoicePayment=Pagamento fattura attiva
 SupplierInvoicePayment=Pagamento fornitore
 SubscriptionPayment=Pagamento adesione
-WithdrawalPayment=Ritiro pagamento
+WithdrawalPayment=Domicil. banc.
 SocialContributionPayment=Pagamento delle imposte sociali/fiscali
 BankTransfer=Bonifico bancario
 BankTransfers=Bonifici e giroconti
diff --git a/htdocs/langs/it_IT/cashdesk.lang b/htdocs/langs/it_IT/cashdesk.lang
index 77fe9d692c5..0a796faf9ab 100644
--- a/htdocs/langs/it_IT/cashdesk.lang
+++ b/htdocs/langs/it_IT/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/it_IT/mails.lang b/htdocs/langs/it_IT/mails.lang
index b58b9a81da4..306ba1f5a22 100644
--- a/htdocs/langs/it_IT/mails.lang
+++ b/htdocs/langs/it_IT/mails.lang
@@ -19,6 +19,8 @@ MailTopic=Email topic
 MailText=Testo
 MailFile=Allegati
 MailMessage=Testo dell'email
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
 ShowEMailing=Mostra invii massivi
 ListOfEMailings=Elenco degli invii
 NewMailing=Nuovo invio di massa
@@ -76,9 +78,9 @@ GroupEmails=Group emails
 OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
 WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
 ResultOfMailSending=Result of mass Email sending
-NbSelected=No. selected
-NbIgnored=No. ignored
-NbSent=No. sent
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
diff --git a/htdocs/langs/it_IT/members.lang b/htdocs/langs/it_IT/members.lang
index 27e76b53393..40f41c18a6c 100644
--- a/htdocs/langs/it_IT/members.lang
+++ b/htdocs/langs/it_IT/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=Scegli quali statistiche visualizzare...
 MenuMembersStats=Statistiche
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Data della sottoscrizione più recente
-Nature=Natura
+MemberNature=Nature of member
 Public=Pubblico
 NewMemberbyWeb=Nuovo membro aggiunto. In attesa di approvazione
 NewMemberForm=Nuova modulo membri
diff --git a/htdocs/langs/it_IT/products.lang b/htdocs/langs/it_IT/products.lang
index d01d0497973..55901af6281 100644
--- a/htdocs/langs/it_IT/products.lang
+++ b/htdocs/langs/it_IT/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Prezzi fornitore
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Paese di origine
-Nature=Product Type (material/finished)
+Nature=Nature of produt (material/finished)
 ShortLabel=Etichetta breve
 Unit=Unità
 p=u.
diff --git a/htdocs/langs/it_IT/salaries.lang b/htdocs/langs/it_IT/salaries.lang
index 42a5be0d3c0..c650bd0b313 100644
--- a/htdocs/langs/it_IT/salaries.lang
+++ b/htdocs/langs/it_IT/salaries.lang
@@ -1,18 +1,21 @@
 # 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=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_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Codice contabile predefinito per i pagamenti degli stipendi
 Salary=Stipendio
 Salaries=Stipendi
 NewSalaryPayment=Nuovo pagamento stipendio
+AddSalaryPayment=Add salary payment
 SalaryPayment=Pagamento stipendio
 SalariesPayments=Pagamento stipendi
 ShowSalaryPayment=Mostra i pagamenti stipendio
 THM=€/h
 TJM=€/g
 CurrentSalary=Stipendio attuale
-THMDescription=Questo valore viene usato per calcolare il costo delle ore spese in un progetto inserite dagli utenti se il modulo progetti è attivo
-TJMDescription=Attualmente il valore è solo un dato informativo e non viene usato per alcun calcolo automatico
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
 LastSalaries=Ultimo %s pagamento dello stipendio
 AllSalaries=Tutti i pagamenti degli stipendi
-SalariesStatistics=Statistiche stipendi
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/it_IT/stocks.lang b/htdocs/langs/it_IT/stocks.lang
index 63b6c80c403..b663e064c87 100644
--- a/htdocs/langs/it_IT/stocks.lang
+++ b/htdocs/langs/it_IT/stocks.lang
@@ -66,10 +66,12 @@ RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual
 DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
 DeStockOnValidateOrder=Decrease real stocks on validation of sales order
 DeStockOnShipment=Diminuire stock reali sulla validazione di spedizione
-DeStockOnShipmentOnClosing=Diminuire stock reali alla chiusura della spedizione
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
 ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
 ReStockOnValidateOrder=Increase real stocks on purchase order approval
 ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=Lo stato dell'ordine non ne consente la spedizione dei prodotti a magazzino.
 StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
 NoPredefinedProductToDispatch=Per l'oggetto non ci sono prodotti predefiniti. Quindi non è necessario alterare le scorte.
diff --git a/htdocs/langs/it_IT/website.lang b/htdocs/langs/it_IT/website.lang
index e01c49ecf3d..8f9b03f504a 100644
--- a/htdocs/langs/it_IT/website.lang
+++ b/htdocs/langs/it_IT/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/it_IT/withdrawals.lang b/htdocs/langs/it_IT/withdrawals.lang
index 03ef473a663..366383c6284 100644
--- a/htdocs/langs/it_IT/withdrawals.lang
+++ b/htdocs/langs/it_IT/withdrawals.lang
@@ -11,22 +11,22 @@ LastWithdrawalReceipts=Latest %s direct debit files
 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
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Non ancora possibile. Lo stato dell'ordine deve essere "accreditato" prima di poter dichiarare la singola riga "rifiutata"
+NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Importo da prelevare
 WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
-ResponsibleUser=Utente responsabile
+ResponsibleUser=User Responsible
 WithdrawalsSetup=Direct debit payment setup
 WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
-ThirdPartyBankCode=Codice bancario di soggetti terzi
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Classifica come accreditata
 ClassCreditedConfirm=Vuoi davvero classificare questa ricevuta di domiciliazione come accreditata sul vostro conto bancario?
 TransData=Data di trasmissione
@@ -50,7 +50,7 @@ StatusMotif0=Imprecisato
 StatusMotif1=Disponibilità insufficiente
 StatusMotif2=Bonifico contestato
 StatusMotif3=No direct debit payment order
-StatusMotif4=Ordine del cliente
+StatusMotif4=Sales Order
 StatusMotif5=IBAN non valido
 StatusMotif6=Conto in rosso
 StatusMotif7=Decisione giudiziaria
@@ -66,35 +66,35 @@ NotifyCredit=Credito
 NumeroNationalEmetter=Numero nazionale dell'inviante
 WithBankUsingRIB=Per i conti correnti bancari che utilizzano RIB
 WithBankUsingBANBIC=Per conti bancari che utilizzano IBAN/BIC/SWIFT
-BankToReceiveWithdraw=Bank account to receive direct debit
+BankToReceiveWithdraw=Receiving Bank Account
 CreditDate=Data di accredito
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
-ShowWithdraw=Mostra domiciliazione
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Tuttavia, se per la fattura ci sono ancora pagamenti da elaborare, non sarà impostata come pagata per consentire prima la gestione dei domiciliazioni.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Ricevuta bancaria
 SetToStatusSent=Imposta stato come "file inviato"
-ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
+ThisWillAlsoAddPaymentOnInvoice=Questo inserirà i pagamenti relativi alle fatture e le classificherà come "Pagate" se il restante da pagare sarà uguale a 0
 StatisticsByLineStatus=Statistics by status of lines
-RUM=UMR
-RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
-WithdrawMode=Direct debit mode (FRST or RECUR)
+RUM=RUM
+RUMLong=Riferimento Unico Mandato
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
+WithdrawMode=Tipologia sequenza d'incasso (FRST o 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
+SepaMandate=Mandato per addebito diretto SEPA
+SepaMandateShort=Mandato SEPA
+PleaseReturnMandate=Si prega di ritornare il mandato tramite email a %s o tramite mail a
 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=Nome del creditore
-SEPAFillForm=(B) Please complete all the fields marked *
+CreditorIdentifier=Id Creditore SEPA
+CreditorName=Creditor Name
+SEPAFillForm=(B) Completare tutti i campi contrassegnati da *
 SEPAFormYourName=Il tuo nome
-SEPAFormYourBAN=Your Bank Account Name (IBAN)
-SEPAFormYourBIC=Your Bank Identifier Code (BIC)
+SEPAFormYourBAN=Numero conto corrente (IBAN)
+SEPAFormYourBIC=Codice BIC (Swift)
 SEPAFrstOrRecur=Tipo di pagamento
-ModeRECUR=Pagamento ricorrente
-ModeFRST=One-off payment
+ModeRECUR=Recurring payment
+ModeFRST=Pagamento una tantum
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
@@ -102,6 +102,10 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/ja_JP/accountancy.lang b/htdocs/langs/ja_JP/accountancy.lang
index dd6193d2333..e24f3e5506c 100644
--- a/htdocs/langs/ja_JP/accountancy.lang
+++ b/htdocs/langs/ja_JP/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Consult here the list of third-party customers and vendors
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third-party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
-Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Without valid dedicated account
 WithValidAccount=With valid dedicated account
 ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
 AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Range of accounting account
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
-
+DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
index dd1754ffbfb..201227b6b2c 100644
--- a/htdocs/langs/ja_JP/admin.lang
+++ b/htdocs/langs/ja_JP/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=今パージ
@@ -804,6 +804,7 @@ Permission401=割引を読む
 Permission402=割引を作成/変更
 Permission403=割引を検証する
 Permission404=割引を削除します。
+Permission430=Use Debug Bar
 Permission511=Read payments of salaries
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
@@ -818,6 +819,9 @@ Permission532=サービスを作成/変更
 Permission534=サービスを削除する
 Permission536=隠されたサービスを参照してください/管理
 Permission538=輸出サービス
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=寄付を読む
 Permission702=寄付を作成/変更
 Permission703=寄付を削除します。
@@ -837,6 +841,12 @@ Permission1101=配信の注文をお読みください
 Permission1102=配信の注文を作成/変更
 Permission1104=配信の注文を検証する
 Permission1109=配信の注文を削除します。
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=仕入先を読む
 Permission1182=Read purchase orders
 Permission1183=Create/modify purchase orders
@@ -859,16 +869,6 @@ Permission1251=データベース（データロード）に外部データの
 Permission1321=顧客の請求書、属性、および支払いをエクスポートする
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those 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)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
 Permission2401=自分のアカウントにリンクされたアクション（イベントまたはタスク）を読む
 Permission2402=作成/変更するアクション（イベントまたはタスク）が自分のアカウントにリンクされている
 Permission2403=自分のアカウントにリンクされたアクション（イベントまたはタスク）を削除
@@ -882,9 +882,41 @@ Permission2503=書類の提出または削除
 Permission2515=セットアップのドキュメントディレクトリ
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those 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)
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale
 Permission50201=トランザクションを読む
 Permission50202=輸入取引
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Print
 Permission55001=Read polls
 Permission55002=Create/modify polls
@@ -1078,7 +1110,7 @@ AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=システム情報では、読み取り専用モードでのみ管理者の目に見える得るその他の技術情報です。
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
-AccountantDesc=Edit the details of your accountant/bookkeeper
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
@@ -1891,3 +1923,5 @@ IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute s
 UrlForIFTTT=URL endpoint for IFTTT
 YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/ja_JP/banks.lang b/htdocs/langs/ja_JP/banks.lang
index 90e847b4888..5dcef149672 100644
--- a/htdocs/langs/ja_JP/banks.lang
+++ b/htdocs/langs/ja_JP/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=Not reconciled
 CustomerInvoicePayment=顧客の支払い
 SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=サブスクリプション費用の支払い
-WithdrawalPayment=撤退の支払い
+WithdrawalPayment=Debit payment order
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=銀行の転送
 BankTransfers=銀行振込
diff --git a/htdocs/langs/ja_JP/cashdesk.lang b/htdocs/langs/ja_JP/cashdesk.lang
index 25fa015b170..9b64d349fd6 100644
--- a/htdocs/langs/ja_JP/cashdesk.lang
+++ b/htdocs/langs/ja_JP/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/ja_JP/mails.lang b/htdocs/langs/ja_JP/mails.lang
index c99889c0aae..4c1dd54d0d4 100644
--- a/htdocs/langs/ja_JP/mails.lang
+++ b/htdocs/langs/ja_JP/mails.lang
@@ -19,6 +19,8 @@ MailTopic=Email topic
 MailText=メッセージ
 MailFile=添付ファイル
 MailMessage=電子メールの本文
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
 ShowEMailing=電子メールで表示
 ListOfEMailings=emailingsのリスト
 NewMailing=新しいメール送信
@@ -76,9 +78,9 @@ GroupEmails=Group emails
 OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
 WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
 ResultOfMailSending=Result of mass Email sending
-NbSelected=No. selected
-NbIgnored=No. ignored
-NbSent=No. sent
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
diff --git a/htdocs/langs/ja_JP/members.lang b/htdocs/langs/ja_JP/members.lang
index 1e1cef63c04..ed9b3c6c98f 100644
--- a/htdocs/langs/ja_JP/members.lang
+++ b/htdocs/langs/ja_JP/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=読みたい統計を選択...
 MenuMembersStats=統計
 LastMemberDate=Latest member date
 LatestSubscriptionDate=最後のサブスクリプションの日付
-Nature=自然
+MemberNature=Nature of member
 Public=情報が公開されている
 NewMemberbyWeb=新しいメンバーが追加されました。承認を待っている
 NewMemberForm=新しいメンバーフォーム
diff --git a/htdocs/langs/ja_JP/products.lang b/htdocs/langs/ja_JP/products.lang
index 8ea4e97ec1a..fe9fa2eb27d 100644
--- a/htdocs/langs/ja_JP/products.lang
+++ b/htdocs/langs/ja_JP/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=原産国
-Nature=Product Type (material/finished)
+Nature=Nature of produt (material/finished)
 ShortLabel=Short label
 Unit=ユニット
 p=u.
diff --git a/htdocs/langs/ja_JP/salaries.lang b/htdocs/langs/ja_JP/salaries.lang
index 6a82354edae..7c3c08a65bd 100644
--- a/htdocs/langs/ja_JP/salaries.lang
+++ b/htdocs/langs/ja_JP/salaries.lang
@@ -1,18 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger 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_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
 Salary=Salary
 Salaries=Salaries
 NewSalaryPayment=New salary payment
+AddSalaryPayment=Add salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
 ShowSalaryPayment=Show salary payment
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
-THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
-TJMDescription=This value is currently as information only and is not used for any calculation
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
-SalariesStatistics=Statistiques salaires
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/ja_JP/stocks.lang b/htdocs/langs/ja_JP/stocks.lang
index 2cad2d534a4..2d5f5d88663 100644
--- a/htdocs/langs/ja_JP/stocks.lang
+++ b/htdocs/langs/ja_JP/stocks.lang
@@ -3,7 +3,7 @@ WarehouseCard=倉庫カード
 Warehouse=倉庫
 Warehouses=倉庫
 ParentWarehouse=Parent warehouse
-NewWarehouse=新倉庫/ストックエリア
+NewWarehouse=New warehouse / Stock Location
 WarehouseEdit=倉庫を変更する
 MenuNewWarehouse=新倉庫
 WarehouseSource=ソースの倉庫
@@ -29,6 +29,8 @@ MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
 Location=場所
 LocationSummary=短い名前の場所
 NumberOfDifferentProducts=Number of different products
@@ -44,7 +46,6 @@ TransferStock=Transfer stock
 MassStockTransferShort=Mass stock transfer
 StockMovement=Stock movement
 StockMovements=Stock movements
-LabelMovement=Movement label
 NumberOfUnit=ユニット数
 UnitPurchaseValue=Unit purchase price
 StockTooLow=低すぎると株式
@@ -54,21 +55,23 @@ PMPValue=加重平均価格
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=倉庫の値
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Allow to add limit and desired stock per couple (product, warehouse) instead of per product
-IndependantSubProductStock=Product stock and subproduct stock are independant
+AllowAddLimitStockByWarehouse=Manage also values for minimum and desired stock per pairing (product-warehouse) in addition to values per product
+IndependantSubProductStock=Product stock and subproduct stock are independent
 QtyDispatched=数量派遣
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
-RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
-DeStockOnBill=お客様の請求書/クレジットメモの検証で本物の株式を減少させる
-DeStockOnValidateOrder=お客様の注文検証上の実在庫を減らす
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
 DeStockOnShipment=Decrease real stocks on shipping validation
-DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification closed
-ReStockOnBill=仕入先請求書/クレジットメモの検証で本物の株式を増加させる
-ReStockOnValidateOrder=Increase real stocks on purchase orders approbation
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=ご注文はまだないか、またはこれ以上の在庫倉庫の製品の派遣ができますステータスを持っていません。
 StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
 NoPredefinedProductToDispatch=このオブジェクト用に事前定義された製品がありません。そうは在庫に派遣する必要はありません。
@@ -76,12 +79,12 @@ DispatchVerb=派遣
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
 StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
-PhysicalStock=物理的な在庫
+PhysicalStock=Physical Stock
 RealStock=実在庫
-RealStockDesc=Physical or real stock is the stock you currently have into your internal warehouses/emplacements.
-RealStockWillAutomaticallyWhen=The real stock will automatically change according to this rules (see stock module setup to change this):
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=仮想在庫
-VirtualStockDesc=Virtual stock is the stock you will get once all open pending actions that affect stocks will be closed (supplier order received, customer order shipped, ...)
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
 IdWarehouse=イド倉庫
 DescWareHouse=説明倉庫
 LieuWareHouse=ローカリゼーション倉庫
@@ -101,7 +104,7 @@ ThisWarehouseIsPersonalStock=この倉庫は%s %sの個人的な株式を表す
 SelectWarehouseForStockDecrease=株式の減少のために使用するために倉庫を選択します。
 SelectWarehouseForStockIncrease=在庫の増加に使用する倉庫を選択します。
 NoStockAction=No stock action
-DesiredStock=Desired optimal stock
+DesiredStock=Desired Stock
 DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
 StockToBuy=To order
 Replenishment=Replenishment
@@ -114,13 +117,13 @@ CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=仮想在庫
 CurentlyUsingPhysicalStock=物理的な在庫
 RuleForStockReplenishment=Rule for stocks replenishment
-SelectProductWithNotNullQty=Select at least one product with a qty not null and a supplier
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
 AlertOnly= Alerts only
 WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is a list of all open supplier orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,10 +133,11 @@ RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever is rule for automatic stock change)
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
+TypeMovement=Type of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -143,11 +147,11 @@ ShowWarehouse=倉庫を表示
 MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
 OpenAll=Open for all actions
 OpenInternal=Open only for internal actions
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on supplier order reception
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
 OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
 ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
 ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
@@ -171,16 +175,16 @@ inventoryValidate=検証
 inventoryDraft=ランニング
 inventorySelectWarehouse=Warehouse choice
 inventoryConfirmCreate=Create
-inventoryOfWarehouse=Inventory for warehouse : %s
-inventoryErrorQtyAdd=Error : one quantity is leaser than zero
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
 inventoryMvtStock=By inventory
 inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=カテゴリフィルタ
-SelectFournisseur=Supplier filter
+SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
 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
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement has date of inventory
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
@@ -195,12 +199,16 @@ AddInventoryProduct=Add product to inventory
 AddProduct=加える
 ApplyPMP=Apply PMP
 FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action ?
+ConfirmFlushInventory=Do you confirm this action?
 InventoryFlushed=Inventory flushed
 ExitEditMode=Exit edition
 inventoryDeleteLine=行を削除します
 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"
+StockSupportServices=Stock management supports Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
 ReceiveProducts=Receive items
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
diff --git a/htdocs/langs/ja_JP/website.lang b/htdocs/langs/ja_JP/website.lang
index 35d7a2587a9..a923caf67b7 100644
--- a/htdocs/langs/ja_JP/website.lang
+++ b/htdocs/langs/ja_JP/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/ja_JP/withdrawals.lang b/htdocs/langs/ja_JP/withdrawals.lang
index e6a0521345e..96559a7dfad 100644
--- a/htdocs/langs/ja_JP/withdrawals.lang
+++ b/htdocs/langs/ja_JP/withdrawals.lang
@@ -12,21 +12,21 @@ 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
+NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=撤回する金額
 WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
-ResponsibleUser=担当ユーザー
+ResponsibleUser=User Responsible
 WithdrawalsSetup=Direct debit payment setup
 WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
-ThirdPartyBankCode=サードパーティの銀行コード
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=入金分類
 ClassCreditedConfirm=あなたの銀行口座に入金、この撤退の領収書を分類してもよろしいですか？
 TransData=日付伝送
@@ -50,7 +50,7 @@ StatusMotif0=特定されていない
 StatusMotif1=提供insuffisante
 StatusMotif2=ティラージュconteste
 StatusMotif3=No direct debit payment order
-StatusMotif4=顧客注文
+StatusMotif4=Sales Order
 StatusMotif5=inexploitable RIB
 StatusMotif6=バランスせずにアカウント
 StatusMotif7=裁判
@@ -66,11 +66,11 @@ NotifyCredit=撤退クレジット
 NumeroNationalEmetter=国立トランスミッタ数
 WithBankUsingRIB=RIBを使用した銀行口座
 WithBankUsingBANBIC=IBAN / BIC / SWIFTを使用した銀行口座
-BankToReceiveWithdraw=Bank account to receive direct debit
+BankToReceiveWithdraw=Receiving Bank Account
 CreditDate=クレジットで
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
-ShowWithdraw=引き出しを表示
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=請求書は、まだ少なくとも一つの引き出しの支払いを処理していない場合、前に撤退を管理できるようにするために支払ったとして、しかし、それが設定されません。
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -87,13 +87,13 @@ 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
+CreditorName=Creditor 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
+ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
@@ -102,6 +102,10 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/ka_GE/accountancy.lang b/htdocs/langs/ka_GE/accountancy.lang
index daa5b4ef413..bb141cb9eb0 100644
--- a/htdocs/langs/ka_GE/accountancy.lang
+++ b/htdocs/langs/ka_GE/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Consult here the list of third-party customers and vendors
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third-party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
-Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Without valid dedicated account
 WithValidAccount=With valid dedicated account
 ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
 AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Range of accounting account
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
-
+DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/ka_GE/admin.lang b/htdocs/langs/ka_GE/admin.lang
index e8a5dda7efb..9eaa12ec9be 100644
--- a/htdocs/langs/ka_GE/admin.lang
+++ b/htdocs/langs/ka_GE/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
@@ -804,6 +804,7 @@ Permission401=Read discounts
 Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
+Permission430=Use Debug Bar
 Permission511=Read payments of salaries
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
@@ -818,6 +819,9 @@ Permission532=Create/modify services
 Permission534=Delete services
 Permission536=See/manage hidden services
 Permission538=Export services
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
@@ -837,6 +841,12 @@ Permission1101=Read delivery orders
 Permission1102=Create/modify delivery orders
 Permission1104=Validate delivery orders
 Permission1109=Delete delivery orders
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Read suppliers
 Permission1182=Read purchase orders
 Permission1183=Create/modify purchase orders
@@ -859,16 +869,6 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those 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)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
 Permission2401=Read actions (events or tasks) linked to his account
 Permission2402=Create/modify actions (events or tasks) linked to his account
 Permission2403=Delete actions (events or tasks) linked to his account
@@ -882,9 +882,41 @@ Permission2503=Submit or delete documents
 Permission2515=Setup documents directories
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those 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)
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale
 Permission50201=Read transactions
 Permission50202=Import transactions
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Print
 Permission55001=Read polls
 Permission55002=Create/modify polls
@@ -1078,7 +1110,7 @@ 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 to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
-AccountantDesc=Edit the details of your accountant/bookkeeper
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
@@ -1891,3 +1923,5 @@ IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute s
 UrlForIFTTT=URL endpoint for IFTTT
 YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/ka_GE/banks.lang b/htdocs/langs/ka_GE/banks.lang
index cb39150b627..c77158e07b7 100644
--- a/htdocs/langs/ka_GE/banks.lang
+++ b/htdocs/langs/ka_GE/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
 SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Subscription payment
-WithdrawalPayment=Withdrawal payment
+WithdrawalPayment=Debit payment order
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
diff --git a/htdocs/langs/ka_GE/cashdesk.lang b/htdocs/langs/ka_GE/cashdesk.lang
index 006097b7e82..ea0e660ed2d 100644
--- a/htdocs/langs/ka_GE/cashdesk.lang
+++ b/htdocs/langs/ka_GE/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/ka_GE/mails.lang b/htdocs/langs/ka_GE/mails.lang
index b50faffe2fa..8b92cef3103 100644
--- a/htdocs/langs/ka_GE/mails.lang
+++ b/htdocs/langs/ka_GE/mails.lang
@@ -19,6 +19,8 @@ MailTopic=Email topic
 MailText=Message
 MailFile=Attached files
 MailMessage=Email body
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
 ShowEMailing=Show emailing
 ListOfEMailings=List of emailings
 NewMailing=New emailing
@@ -76,9 +78,9 @@ GroupEmails=Group emails
 OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
 WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
 ResultOfMailSending=Result of mass Email sending
-NbSelected=No. selected
-NbIgnored=No. ignored
-NbSent=No. sent
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
diff --git a/htdocs/langs/ka_GE/members.lang b/htdocs/langs/ka_GE/members.lang
index 9517568846c..9993e05428f 100644
--- a/htdocs/langs/ka_GE/members.lang
+++ b/htdocs/langs/ka_GE/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
-Nature=Nature
+MemberNature=Nature of member
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
diff --git a/htdocs/langs/ka_GE/products.lang b/htdocs/langs/ka_GE/products.lang
index 402779cb00f..7b68f5b3ebd 100644
--- a/htdocs/langs/ka_GE/products.lang
+++ b/htdocs/langs/ka_GE/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
-Nature=Product Type (material/finished)
+Nature=Nature of produt (material/finished)
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/ka_GE/salaries.lang b/htdocs/langs/ka_GE/salaries.lang
index 6a82354edae..7c3c08a65bd 100644
--- a/htdocs/langs/ka_GE/salaries.lang
+++ b/htdocs/langs/ka_GE/salaries.lang
@@ -1,18 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger 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_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
 Salary=Salary
 Salaries=Salaries
 NewSalaryPayment=New salary payment
+AddSalaryPayment=Add salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
 ShowSalaryPayment=Show salary payment
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
-THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
-TJMDescription=This value is currently as information only and is not used for any calculation
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
-SalariesStatistics=Statistiques salaires
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/ka_GE/stocks.lang b/htdocs/langs/ka_GE/stocks.lang
index 8178a8918b7..d42f1a82243 100644
--- a/htdocs/langs/ka_GE/stocks.lang
+++ b/htdocs/langs/ka_GE/stocks.lang
@@ -3,7 +3,7 @@ WarehouseCard=Warehouse card
 Warehouse=Warehouse
 Warehouses=Warehouses
 ParentWarehouse=Parent warehouse
-NewWarehouse=New warehouse / Stock area
+NewWarehouse=New warehouse / Stock Location
 WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
 WarehouseSource=Source warehouse
@@ -29,6 +29,8 @@ MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
 LocationSummary=Short name location
 NumberOfDifferentProducts=Number of different products
@@ -44,7 +46,6 @@ TransferStock=Transfer stock
 MassStockTransferShort=Mass stock transfer
 StockMovement=Stock movement
 StockMovements=Stock movements
-LabelMovement=Movement label
 NumberOfUnit=Number of units
 UnitPurchaseValue=Unit purchase price
 StockTooLow=Stock too low
@@ -54,21 +55,23 @@ PMPValue=Weighted average price
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Allow to add limit and desired stock per couple (product, warehouse) instead of per product
-IndependantSubProductStock=Product stock and subproduct stock are independant
+AllowAddLimitStockByWarehouse=Manage also values for minimum and desired stock per pairing (product-warehouse) in addition to values per product
+IndependantSubProductStock=Product stock and subproduct stock are independent
 QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
-RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
-DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
-DeStockOnValidateOrder=Decrease real stocks on customers orders validation
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
 DeStockOnShipment=Decrease real stocks on shipping validation
-DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification closed
-ReStockOnBill=Increase real stocks on suppliers invoices/credit notes validation
-ReStockOnValidateOrder=Increase real stocks on purchase orders approbation
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows dispatching of products in stock warehouses.
 StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
 NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required.
@@ -76,12 +79,12 @@ DispatchVerb=Dispatch
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
 StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
-PhysicalStock=Physical stock
+PhysicalStock=Physical Stock
 RealStock=Real Stock
-RealStockDesc=Physical or real stock is the stock you currently have into your internal warehouses/emplacements.
-RealStockWillAutomaticallyWhen=The real stock will automatically change according to this rules (see stock module setup to change this):
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
-VirtualStockDesc=Virtual stock is the stock you will get once all open pending actions that affect stocks will be closed (supplier order received, customer order shipped, ...)
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
@@ -101,7 +104,7 @@ ThisWarehouseIsPersonalStock=This warehouse represents personal stock of %s %s
 SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
 SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
 NoStockAction=No stock action
-DesiredStock=Desired optimal stock
+DesiredStock=Desired Stock
 DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
 StockToBuy=To order
 Replenishment=Replenishment
@@ -114,13 +117,13 @@ CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtual stock
 CurentlyUsingPhysicalStock=Physical stock
 RuleForStockReplenishment=Rule for stocks replenishment
-SelectProductWithNotNullQty=Select at least one product with a qty not null and a supplier
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
 AlertOnly= Alerts only
 WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is a list of all open supplier orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,10 +133,11 @@ RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever is rule for automatic stock change)
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
+TypeMovement=Type of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -143,11 +147,11 @@ ShowWarehouse=Show warehouse
 MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
 OpenAll=Open for all actions
 OpenInternal=Open only for internal actions
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on supplier order reception
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
 OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
 ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
 ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
@@ -171,16 +175,16 @@ inventoryValidate=Validated
 inventoryDraft=Running
 inventorySelectWarehouse=Warehouse choice
 inventoryConfirmCreate=Create
-inventoryOfWarehouse=Inventory for warehouse : %s
-inventoryErrorQtyAdd=Error : one quantity is leaser than zero
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
 inventoryMvtStock=By inventory
 inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
-SelectFournisseur=Supplier filter
+SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
 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
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement has date of inventory
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
@@ -195,12 +199,16 @@ AddInventoryProduct=Add product to inventory
 AddProduct=Add
 ApplyPMP=Apply PMP
 FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action ?
+ConfirmFlushInventory=Do you confirm this action?
 InventoryFlushed=Inventory flushed
 ExitEditMode=Exit edition
 inventoryDeleteLine=Delete line
 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"
+StockSupportServices=Stock management supports Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
 ReceiveProducts=Receive items
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
diff --git a/htdocs/langs/ka_GE/website.lang b/htdocs/langs/ka_GE/website.lang
index b4d894f55d7..534756ac932 100644
--- a/htdocs/langs/ka_GE/website.lang
+++ b/htdocs/langs/ka_GE/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/ka_GE/withdrawals.lang b/htdocs/langs/ka_GE/withdrawals.lang
index 3defcec975a..cbca2b2f103 100644
--- a/htdocs/langs/ka_GE/withdrawals.lang
+++ b/htdocs/langs/ka_GE/withdrawals.lang
@@ -12,21 +12,21 @@ 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
+NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Amount to withdraw
 WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
-ResponsibleUser=Responsible user
+ResponsibleUser=User Responsible
 WithdrawalsSetup=Direct debit payment setup
 WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
-ThirdPartyBankCode=Third party bank code
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Classify credited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
@@ -50,7 +50,7 @@ StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
 StatusMotif2=Request contested
 StatusMotif3=No direct debit payment order
-StatusMotif4=Customer Order
+StatusMotif4=Sales Order
 StatusMotif5=RIB unusable
 StatusMotif6=Account without balance
 StatusMotif7=Judicial Decision
@@ -66,11 +66,11 @@ NotifyCredit=Withdrawal Credit
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=For bank accounts using RIB
 WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
-BankToReceiveWithdraw=Bank account to receive direct debit
+BankToReceiveWithdraw=Receiving Bank Account
 CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
-ShowWithdraw=Show Withdraw
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -87,13 +87,13 @@ 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
+CreditorName=Creditor 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
+ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
@@ -102,6 +102,10 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/kn_IN/accountancy.lang b/htdocs/langs/kn_IN/accountancy.lang
index daa5b4ef413..bb141cb9eb0 100644
--- a/htdocs/langs/kn_IN/accountancy.lang
+++ b/htdocs/langs/kn_IN/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Consult here the list of third-party customers and vendors
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third-party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
-Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Without valid dedicated account
 WithValidAccount=With valid dedicated account
 ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
 AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Range of accounting account
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
-
+DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/kn_IN/admin.lang b/htdocs/langs/kn_IN/admin.lang
index 67c9bb77a9e..c2ac3d4bc8e 100644
--- a/htdocs/langs/kn_IN/admin.lang
+++ b/htdocs/langs/kn_IN/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
@@ -804,6 +804,7 @@ Permission401=Read discounts
 Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
+Permission430=Use Debug Bar
 Permission511=Read payments of salaries
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
@@ -818,6 +819,9 @@ Permission532=Create/modify services
 Permission534=Delete services
 Permission536=See/manage hidden services
 Permission538=Export services
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
@@ -837,6 +841,12 @@ Permission1101=Read delivery orders
 Permission1102=Create/modify delivery orders
 Permission1104=Validate delivery orders
 Permission1109=Delete delivery orders
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Read suppliers
 Permission1182=Read purchase orders
 Permission1183=Create/modify purchase orders
@@ -859,16 +869,6 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those 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)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
 Permission2401=Read actions (events or tasks) linked to his account
 Permission2402=Create/modify actions (events or tasks) linked to his account
 Permission2403=Delete actions (events or tasks) linked to his account
@@ -882,9 +882,41 @@ Permission2503=Submit or delete documents
 Permission2515=Setup documents directories
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those 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)
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale
 Permission50201=Read transactions
 Permission50202=Import transactions
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Print
 Permission55001=Read polls
 Permission55002=Create/modify polls
@@ -1078,7 +1110,7 @@ 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 to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
-AccountantDesc=Edit the details of your accountant/bookkeeper
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
@@ -1891,3 +1923,5 @@ IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute s
 UrlForIFTTT=URL endpoint for IFTTT
 YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/kn_IN/banks.lang b/htdocs/langs/kn_IN/banks.lang
index 4421ca5411e..4d19a8d2fda 100644
--- a/htdocs/langs/kn_IN/banks.lang
+++ b/htdocs/langs/kn_IN/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
 SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Subscription payment
-WithdrawalPayment=Withdrawal payment
+WithdrawalPayment=Debit payment order
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
diff --git a/htdocs/langs/kn_IN/cashdesk.lang b/htdocs/langs/kn_IN/cashdesk.lang
index cf0908f3739..5af2778e374 100644
--- a/htdocs/langs/kn_IN/cashdesk.lang
+++ b/htdocs/langs/kn_IN/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/kn_IN/mails.lang b/htdocs/langs/kn_IN/mails.lang
index b50faffe2fa..8b92cef3103 100644
--- a/htdocs/langs/kn_IN/mails.lang
+++ b/htdocs/langs/kn_IN/mails.lang
@@ -19,6 +19,8 @@ MailTopic=Email topic
 MailText=Message
 MailFile=Attached files
 MailMessage=Email body
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
 ShowEMailing=Show emailing
 ListOfEMailings=List of emailings
 NewMailing=New emailing
@@ -76,9 +78,9 @@ GroupEmails=Group emails
 OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
 WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
 ResultOfMailSending=Result of mass Email sending
-NbSelected=No. selected
-NbIgnored=No. ignored
-NbSent=No. sent
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
diff --git a/htdocs/langs/kn_IN/members.lang b/htdocs/langs/kn_IN/members.lang
index 9517568846c..9993e05428f 100644
--- a/htdocs/langs/kn_IN/members.lang
+++ b/htdocs/langs/kn_IN/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
-Nature=Nature
+MemberNature=Nature of member
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
diff --git a/htdocs/langs/kn_IN/products.lang b/htdocs/langs/kn_IN/products.lang
index 67ad4ef03c0..0dc770ad9e5 100644
--- a/htdocs/langs/kn_IN/products.lang
+++ b/htdocs/langs/kn_IN/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
-Nature=Product Type (material/finished)
+Nature=Nature of produt (material/finished)
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/kn_IN/salaries.lang b/htdocs/langs/kn_IN/salaries.lang
index 6a82354edae..7c3c08a65bd 100644
--- a/htdocs/langs/kn_IN/salaries.lang
+++ b/htdocs/langs/kn_IN/salaries.lang
@@ -1,18 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger 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_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
 Salary=Salary
 Salaries=Salaries
 NewSalaryPayment=New salary payment
+AddSalaryPayment=Add salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
 ShowSalaryPayment=Show salary payment
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
-THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
-TJMDescription=This value is currently as information only and is not used for any calculation
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
-SalariesStatistics=Statistiques salaires
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/kn_IN/stocks.lang b/htdocs/langs/kn_IN/stocks.lang
index 8178a8918b7..d42f1a82243 100644
--- a/htdocs/langs/kn_IN/stocks.lang
+++ b/htdocs/langs/kn_IN/stocks.lang
@@ -3,7 +3,7 @@ WarehouseCard=Warehouse card
 Warehouse=Warehouse
 Warehouses=Warehouses
 ParentWarehouse=Parent warehouse
-NewWarehouse=New warehouse / Stock area
+NewWarehouse=New warehouse / Stock Location
 WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
 WarehouseSource=Source warehouse
@@ -29,6 +29,8 @@ MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
 LocationSummary=Short name location
 NumberOfDifferentProducts=Number of different products
@@ -44,7 +46,6 @@ TransferStock=Transfer stock
 MassStockTransferShort=Mass stock transfer
 StockMovement=Stock movement
 StockMovements=Stock movements
-LabelMovement=Movement label
 NumberOfUnit=Number of units
 UnitPurchaseValue=Unit purchase price
 StockTooLow=Stock too low
@@ -54,21 +55,23 @@ PMPValue=Weighted average price
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Allow to add limit and desired stock per couple (product, warehouse) instead of per product
-IndependantSubProductStock=Product stock and subproduct stock are independant
+AllowAddLimitStockByWarehouse=Manage also values for minimum and desired stock per pairing (product-warehouse) in addition to values per product
+IndependantSubProductStock=Product stock and subproduct stock are independent
 QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
-RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
-DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
-DeStockOnValidateOrder=Decrease real stocks on customers orders validation
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
 DeStockOnShipment=Decrease real stocks on shipping validation
-DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification closed
-ReStockOnBill=Increase real stocks on suppliers invoices/credit notes validation
-ReStockOnValidateOrder=Increase real stocks on purchase orders approbation
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows dispatching of products in stock warehouses.
 StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
 NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required.
@@ -76,12 +79,12 @@ DispatchVerb=Dispatch
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
 StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
-PhysicalStock=Physical stock
+PhysicalStock=Physical Stock
 RealStock=Real Stock
-RealStockDesc=Physical or real stock is the stock you currently have into your internal warehouses/emplacements.
-RealStockWillAutomaticallyWhen=The real stock will automatically change according to this rules (see stock module setup to change this):
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
-VirtualStockDesc=Virtual stock is the stock you will get once all open pending actions that affect stocks will be closed (supplier order received, customer order shipped, ...)
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
@@ -101,7 +104,7 @@ ThisWarehouseIsPersonalStock=This warehouse represents personal stock of %s %s
 SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
 SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
 NoStockAction=No stock action
-DesiredStock=Desired optimal stock
+DesiredStock=Desired Stock
 DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
 StockToBuy=To order
 Replenishment=Replenishment
@@ -114,13 +117,13 @@ CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtual stock
 CurentlyUsingPhysicalStock=Physical stock
 RuleForStockReplenishment=Rule for stocks replenishment
-SelectProductWithNotNullQty=Select at least one product with a qty not null and a supplier
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
 AlertOnly= Alerts only
 WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is a list of all open supplier orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,10 +133,11 @@ RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever is rule for automatic stock change)
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
+TypeMovement=Type of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -143,11 +147,11 @@ ShowWarehouse=Show warehouse
 MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
 OpenAll=Open for all actions
 OpenInternal=Open only for internal actions
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on supplier order reception
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
 OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
 ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
 ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
@@ -171,16 +175,16 @@ inventoryValidate=Validated
 inventoryDraft=Running
 inventorySelectWarehouse=Warehouse choice
 inventoryConfirmCreate=Create
-inventoryOfWarehouse=Inventory for warehouse : %s
-inventoryErrorQtyAdd=Error : one quantity is leaser than zero
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
 inventoryMvtStock=By inventory
 inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
-SelectFournisseur=Supplier filter
+SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
 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
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement has date of inventory
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
@@ -195,12 +199,16 @@ AddInventoryProduct=Add product to inventory
 AddProduct=Add
 ApplyPMP=Apply PMP
 FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action ?
+ConfirmFlushInventory=Do you confirm this action?
 InventoryFlushed=Inventory flushed
 ExitEditMode=Exit edition
 inventoryDeleteLine=Delete line
 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"
+StockSupportServices=Stock management supports Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
 ReceiveProducts=Receive items
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
diff --git a/htdocs/langs/kn_IN/website.lang b/htdocs/langs/kn_IN/website.lang
index b4d894f55d7..534756ac932 100644
--- a/htdocs/langs/kn_IN/website.lang
+++ b/htdocs/langs/kn_IN/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/kn_IN/withdrawals.lang b/htdocs/langs/kn_IN/withdrawals.lang
index 3defcec975a..cbca2b2f103 100644
--- a/htdocs/langs/kn_IN/withdrawals.lang
+++ b/htdocs/langs/kn_IN/withdrawals.lang
@@ -12,21 +12,21 @@ 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
+NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Amount to withdraw
 WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
-ResponsibleUser=Responsible user
+ResponsibleUser=User Responsible
 WithdrawalsSetup=Direct debit payment setup
 WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
-ThirdPartyBankCode=Third party bank code
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Classify credited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
@@ -50,7 +50,7 @@ StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
 StatusMotif2=Request contested
 StatusMotif3=No direct debit payment order
-StatusMotif4=Customer Order
+StatusMotif4=Sales Order
 StatusMotif5=RIB unusable
 StatusMotif6=Account without balance
 StatusMotif7=Judicial Decision
@@ -66,11 +66,11 @@ NotifyCredit=Withdrawal Credit
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=For bank accounts using RIB
 WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
-BankToReceiveWithdraw=Bank account to receive direct debit
+BankToReceiveWithdraw=Receiving Bank Account
 CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
-ShowWithdraw=Show Withdraw
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -87,13 +87,13 @@ 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
+CreditorName=Creditor 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
+ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
@@ -102,6 +102,10 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/ko_KR/accountancy.lang b/htdocs/langs/ko_KR/accountancy.lang
index e1805e19592..734271adbf0 100644
--- a/htdocs/langs/ko_KR/accountancy.lang
+++ b/htdocs/langs/ko_KR/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Consult here the list of third-party customers and vendors
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third-party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
-Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Without valid dedicated account
 WithValidAccount=With valid dedicated account
 ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
 AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Range of accounting account
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
-
+DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang
index aebb5974443..5b2ce325260 100644
--- a/htdocs/langs/ko_KR/admin.lang
+++ b/htdocs/langs/ko_KR/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Syslog 모듈(데이타 손실 위험 없음) <b>%s</b>에 의해 정읜된 돌리바 로그파일
-PurgeDeleteTemporaryFiles=모든 임시파일 삭제(데이터손실위험 없음)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=지금 제거하기
@@ -804,6 +804,7 @@ Permission401=Read discounts
 Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
+Permission430=Use Debug Bar
 Permission511=Read payments of salaries
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
@@ -818,6 +819,9 @@ Permission532=Create/modify services
 Permission534=Delete services
 Permission536=See/manage hidden services
 Permission538=Export services
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
@@ -837,6 +841,12 @@ Permission1101=Read delivery orders
 Permission1102=Create/modify delivery orders
 Permission1104=Validate delivery orders
 Permission1109=Delete delivery orders
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Read suppliers
 Permission1182=Read purchase orders
 Permission1183=Create/modify purchase orders
@@ -859,16 +869,6 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those 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)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
 Permission2401=Read actions (events or tasks) linked to his account
 Permission2402=Create/modify actions (events or tasks) linked to his account
 Permission2403=Delete actions (events or tasks) linked to his account
@@ -882,9 +882,41 @@ Permission2503=Submit or delete documents
 Permission2515=Setup documents directories
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those 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)
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale
 Permission50201=Read transactions
 Permission50202=Import transactions
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Print
 Permission55001=Read polls
 Permission55002=Create/modify polls
@@ -1078,7 +1110,7 @@ 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 to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
-AccountantDesc=Edit the details of your accountant/bookkeeper
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
@@ -1891,3 +1923,5 @@ IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute s
 UrlForIFTTT=URL endpoint for IFTTT
 YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/ko_KR/banks.lang b/htdocs/langs/ko_KR/banks.lang
index f75794817ce..0444805d5d2 100644
--- a/htdocs/langs/ko_KR/banks.lang
+++ b/htdocs/langs/ko_KR/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
 SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Subscription payment
-WithdrawalPayment=Withdrawal payment
+WithdrawalPayment=Debit payment order
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
diff --git a/htdocs/langs/ko_KR/cashdesk.lang b/htdocs/langs/ko_KR/cashdesk.lang
index 995e84db455..12c39ff8a70 100644
--- a/htdocs/langs/ko_KR/cashdesk.lang
+++ b/htdocs/langs/ko_KR/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/ko_KR/mails.lang b/htdocs/langs/ko_KR/mails.lang
index 329bcf4915a..afe98d7ed4b 100644
--- a/htdocs/langs/ko_KR/mails.lang
+++ b/htdocs/langs/ko_KR/mails.lang
@@ -19,6 +19,8 @@ MailTopic=Email topic
 MailText=Message
 MailFile=Attached files
 MailMessage=Email body
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
 ShowEMailing=Show emailing
 ListOfEMailings=List of emailings
 NewMailing=New emailing
@@ -76,9 +78,9 @@ GroupEmails=Group emails
 OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
 WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
 ResultOfMailSending=Result of mass Email sending
-NbSelected=No. selected
-NbIgnored=No. ignored
-NbSent=No. sent
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
diff --git a/htdocs/langs/ko_KR/members.lang b/htdocs/langs/ko_KR/members.lang
index 7aafa62597d..fd2f0bfb255 100644
--- a/htdocs/langs/ko_KR/members.lang
+++ b/htdocs/langs/ko_KR/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=통계
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
-Nature=Nature
+MemberNature=Nature of member
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
diff --git a/htdocs/langs/ko_KR/products.lang b/htdocs/langs/ko_KR/products.lang
index b68dd7a8657..5951c9bcae9 100644
--- a/htdocs/langs/ko_KR/products.lang
+++ b/htdocs/langs/ko_KR/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
-Nature=Product Type (material/finished)
+Nature=Nature of produt (material/finished)
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/ko_KR/salaries.lang b/htdocs/langs/ko_KR/salaries.lang
index 6a82354edae..7c3c08a65bd 100644
--- a/htdocs/langs/ko_KR/salaries.lang
+++ b/htdocs/langs/ko_KR/salaries.lang
@@ -1,18 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger 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_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
 Salary=Salary
 Salaries=Salaries
 NewSalaryPayment=New salary payment
+AddSalaryPayment=Add salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
 ShowSalaryPayment=Show salary payment
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
-THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
-TJMDescription=This value is currently as information only and is not used for any calculation
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
-SalariesStatistics=Statistiques salaires
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/ko_KR/stocks.lang b/htdocs/langs/ko_KR/stocks.lang
index 4d853b37538..edc921f7fa2 100644
--- a/htdocs/langs/ko_KR/stocks.lang
+++ b/htdocs/langs/ko_KR/stocks.lang
@@ -3,7 +3,7 @@ WarehouseCard=Warehouse card
 Warehouse=Warehouse
 Warehouses=Warehouses
 ParentWarehouse=Parent warehouse
-NewWarehouse=New warehouse / Stock area
+NewWarehouse=New warehouse / Stock Location
 WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
 WarehouseSource=Source warehouse
@@ -29,6 +29,8 @@ MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
 Location=위치
 LocationSummary=Short name location
 NumberOfDifferentProducts=Number of different products
@@ -44,7 +46,6 @@ TransferStock=Transfer stock
 MassStockTransferShort=Mass stock transfer
 StockMovement=Stock movement
 StockMovements=Stock movements
-LabelMovement=Movement label
 NumberOfUnit=Number of units
 UnitPurchaseValue=Unit purchase price
 StockTooLow=Stock too low
@@ -54,21 +55,23 @@ PMPValue=Weighted average price
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Allow to add limit and desired stock per couple (product, warehouse) instead of per product
-IndependantSubProductStock=Product stock and subproduct stock are independant
+AllowAddLimitStockByWarehouse=Manage also values for minimum and desired stock per pairing (product-warehouse) in addition to values per product
+IndependantSubProductStock=Product stock and subproduct stock are independent
 QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
-RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
-DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
-DeStockOnValidateOrder=Decrease real stocks on customers orders validation
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
 DeStockOnShipment=Decrease real stocks on shipping validation
-DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification closed
-ReStockOnBill=Increase real stocks on suppliers invoices/credit notes validation
-ReStockOnValidateOrder=Increase real stocks on purchase orders approbation
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows dispatching of products in stock warehouses.
 StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
 NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required.
@@ -76,12 +79,12 @@ DispatchVerb=Dispatch
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
 StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
-PhysicalStock=Physical stock
+PhysicalStock=Physical Stock
 RealStock=Real Stock
-RealStockDesc=Physical or real stock is the stock you currently have into your internal warehouses/emplacements.
-RealStockWillAutomaticallyWhen=The real stock will automatically change according to this rules (see stock module setup to change this):
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
-VirtualStockDesc=Virtual stock is the stock you will get once all open pending actions that affect stocks will be closed (supplier order received, customer order shipped, ...)
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
@@ -101,7 +104,7 @@ ThisWarehouseIsPersonalStock=This warehouse represents personal stock of %s %s
 SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
 SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
 NoStockAction=No stock action
-DesiredStock=Desired optimal stock
+DesiredStock=Desired Stock
 DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
 StockToBuy=To order
 Replenishment=Replenishment
@@ -114,13 +117,13 @@ CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtual stock
 CurentlyUsingPhysicalStock=Physical stock
 RuleForStockReplenishment=Rule for stocks replenishment
-SelectProductWithNotNullQty=Select at least one product with a qty not null and a supplier
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
 AlertOnly= Alerts only
 WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is a list of all open supplier orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,10 +133,11 @@ RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever is rule for automatic stock change)
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
+TypeMovement=Type of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -143,11 +147,11 @@ ShowWarehouse=Show warehouse
 MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
 OpenAll=Open for all actions
 OpenInternal=Open only for internal actions
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on supplier order reception
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
 OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
 ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
 ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
@@ -171,16 +175,16 @@ inventoryValidate=확인 됨
 inventoryDraft=Running
 inventorySelectWarehouse=Warehouse choice
 inventoryConfirmCreate=Create
-inventoryOfWarehouse=Inventory for warehouse : %s
-inventoryErrorQtyAdd=Error : one quantity is leaser than zero
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
 inventoryMvtStock=By inventory
 inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
-SelectFournisseur=Supplier filter
+SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
 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
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement has date of inventory
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
@@ -195,12 +199,16 @@ AddInventoryProduct=Add product to inventory
 AddProduct=더하다
 ApplyPMP=Apply PMP
 FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action ?
+ConfirmFlushInventory=Do you confirm this action?
 InventoryFlushed=Inventory flushed
 ExitEditMode=Exit edition
 inventoryDeleteLine=행 삭제
 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"
+StockSupportServices=Stock management supports Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
 ReceiveProducts=Receive items
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
diff --git a/htdocs/langs/ko_KR/website.lang b/htdocs/langs/ko_KR/website.lang
index 51cba6a8855..09d273e28e7 100644
--- a/htdocs/langs/ko_KR/website.lang
+++ b/htdocs/langs/ko_KR/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/ko_KR/withdrawals.lang b/htdocs/langs/ko_KR/withdrawals.lang
index 2929c8f5a83..94d4de3b91d 100644
--- a/htdocs/langs/ko_KR/withdrawals.lang
+++ b/htdocs/langs/ko_KR/withdrawals.lang
@@ -12,21 +12,21 @@ 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
+NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Amount to withdraw
 WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
-ResponsibleUser=Responsible user
+ResponsibleUser=User Responsible
 WithdrawalsSetup=Direct debit payment setup
 WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
-ThirdPartyBankCode=Third party bank code
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Classify credited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
@@ -50,7 +50,7 @@ StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
 StatusMotif2=Request contested
 StatusMotif3=No direct debit payment order
-StatusMotif4=Customer Order
+StatusMotif4=Sales Order
 StatusMotif5=RIB unusable
 StatusMotif6=Account without balance
 StatusMotif7=Judicial Decision
@@ -66,11 +66,11 @@ NotifyCredit=Withdrawal Credit
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=For bank accounts using RIB
 WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
-BankToReceiveWithdraw=Bank account to receive direct debit
+BankToReceiveWithdraw=Receiving Bank Account
 CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
-ShowWithdraw=Show Withdraw
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -87,13 +87,13 @@ 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
+CreditorName=Creditor 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
+ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
@@ -102,6 +102,10 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/lo_LA/accountancy.lang b/htdocs/langs/lo_LA/accountancy.lang
index c14cc4de907..54ff1f68337 100644
--- a/htdocs/langs/lo_LA/accountancy.lang
+++ b/htdocs/langs/lo_LA/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Consult here the list of third-party customers and vendors
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third-party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
-Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Without valid dedicated account
 WithValidAccount=With valid dedicated account
 ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
 AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Range of accounting account
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
-
+DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/lo_LA/admin.lang b/htdocs/langs/lo_LA/admin.lang
index edcb2f39aaf..9da8cc7c37b 100644
--- a/htdocs/langs/lo_LA/admin.lang
+++ b/htdocs/langs/lo_LA/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
@@ -804,6 +804,7 @@ Permission401=Read discounts
 Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
+Permission430=Use Debug Bar
 Permission511=Read payments of salaries
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
@@ -818,6 +819,9 @@ Permission532=Create/modify services
 Permission534=Delete services
 Permission536=See/manage hidden services
 Permission538=Export services
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
@@ -837,6 +841,12 @@ Permission1101=Read delivery orders
 Permission1102=Create/modify delivery orders
 Permission1104=Validate delivery orders
 Permission1109=Delete delivery orders
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Read suppliers
 Permission1182=Read purchase orders
 Permission1183=Create/modify purchase orders
@@ -859,16 +869,6 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those 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)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
 Permission2401=Read actions (events or tasks) linked to his account
 Permission2402=Create/modify actions (events or tasks) linked to his account
 Permission2403=Delete actions (events or tasks) linked to his account
@@ -882,9 +882,41 @@ Permission2503=Submit or delete documents
 Permission2515=Setup documents directories
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those 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)
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale
 Permission50201=Read transactions
 Permission50202=Import transactions
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Print
 Permission55001=Read polls
 Permission55002=Create/modify polls
@@ -1078,7 +1110,7 @@ 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 to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
-AccountantDesc=Edit the details of your accountant/bookkeeper
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
@@ -1891,3 +1923,5 @@ IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute s
 UrlForIFTTT=URL endpoint for IFTTT
 YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/lo_LA/banks.lang b/htdocs/langs/lo_LA/banks.lang
index 62b17bbcb9e..c57942bbef8 100644
--- a/htdocs/langs/lo_LA/banks.lang
+++ b/htdocs/langs/lo_LA/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
 SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Subscription payment
-WithdrawalPayment=Withdrawal payment
+WithdrawalPayment=Debit payment order
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
diff --git a/htdocs/langs/lo_LA/cashdesk.lang b/htdocs/langs/lo_LA/cashdesk.lang
index 006097b7e82..ea0e660ed2d 100644
--- a/htdocs/langs/lo_LA/cashdesk.lang
+++ b/htdocs/langs/lo_LA/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/lo_LA/mails.lang b/htdocs/langs/lo_LA/mails.lang
index b50faffe2fa..8b92cef3103 100644
--- a/htdocs/langs/lo_LA/mails.lang
+++ b/htdocs/langs/lo_LA/mails.lang
@@ -19,6 +19,8 @@ MailTopic=Email topic
 MailText=Message
 MailFile=Attached files
 MailMessage=Email body
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
 ShowEMailing=Show emailing
 ListOfEMailings=List of emailings
 NewMailing=New emailing
@@ -76,9 +78,9 @@ GroupEmails=Group emails
 OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
 WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
 ResultOfMailSending=Result of mass Email sending
-NbSelected=No. selected
-NbIgnored=No. ignored
-NbSent=No. sent
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
diff --git a/htdocs/langs/lo_LA/members.lang b/htdocs/langs/lo_LA/members.lang
index d64ca7bef95..4f6335ca347 100644
--- a/htdocs/langs/lo_LA/members.lang
+++ b/htdocs/langs/lo_LA/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
-Nature=Nature
+MemberNature=Nature of member
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
diff --git a/htdocs/langs/lo_LA/products.lang b/htdocs/langs/lo_LA/products.lang
index 4c8de042e5c..cba53debed1 100644
--- a/htdocs/langs/lo_LA/products.lang
+++ b/htdocs/langs/lo_LA/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
-Nature=Product Type (material/finished)
+Nature=Nature of produt (material/finished)
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/lo_LA/salaries.lang b/htdocs/langs/lo_LA/salaries.lang
index 6a82354edae..7c3c08a65bd 100644
--- a/htdocs/langs/lo_LA/salaries.lang
+++ b/htdocs/langs/lo_LA/salaries.lang
@@ -1,18 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger 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_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
 Salary=Salary
 Salaries=Salaries
 NewSalaryPayment=New salary payment
+AddSalaryPayment=Add salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
 ShowSalaryPayment=Show salary payment
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
-THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
-TJMDescription=This value is currently as information only and is not used for any calculation
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
-SalariesStatistics=Statistiques salaires
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/lo_LA/stocks.lang b/htdocs/langs/lo_LA/stocks.lang
index 06c23bab474..ae50b1f2a81 100644
--- a/htdocs/langs/lo_LA/stocks.lang
+++ b/htdocs/langs/lo_LA/stocks.lang
@@ -3,7 +3,7 @@ WarehouseCard=Warehouse card
 Warehouse=Warehouse
 Warehouses=Warehouses
 ParentWarehouse=Parent warehouse
-NewWarehouse=New warehouse / Stock area
+NewWarehouse=New warehouse / Stock Location
 WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
 WarehouseSource=Source warehouse
@@ -29,6 +29,8 @@ MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
 LocationSummary=Short name location
 NumberOfDifferentProducts=Number of different products
@@ -44,7 +46,6 @@ TransferStock=Transfer stock
 MassStockTransferShort=Mass stock transfer
 StockMovement=Stock movement
 StockMovements=Stock movements
-LabelMovement=Movement label
 NumberOfUnit=Number of units
 UnitPurchaseValue=Unit purchase price
 StockTooLow=Stock too low
@@ -54,21 +55,23 @@ PMPValue=Weighted average price
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Allow to add limit and desired stock per couple (product, warehouse) instead of per product
-IndependantSubProductStock=Product stock and subproduct stock are independant
+AllowAddLimitStockByWarehouse=Manage also values for minimum and desired stock per pairing (product-warehouse) in addition to values per product
+IndependantSubProductStock=Product stock and subproduct stock are independent
 QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
-RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
-DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
-DeStockOnValidateOrder=Decrease real stocks on customers orders validation
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
 DeStockOnShipment=Decrease real stocks on shipping validation
-DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification closed
-ReStockOnBill=Increase real stocks on suppliers invoices/credit notes validation
-ReStockOnValidateOrder=Increase real stocks on purchase orders approbation
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows dispatching of products in stock warehouses.
 StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
 NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required.
@@ -76,12 +79,12 @@ DispatchVerb=Dispatch
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
 StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
-PhysicalStock=Physical stock
+PhysicalStock=Physical Stock
 RealStock=Real Stock
-RealStockDesc=Physical or real stock is the stock you currently have into your internal warehouses/emplacements.
-RealStockWillAutomaticallyWhen=The real stock will automatically change according to this rules (see stock module setup to change this):
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
-VirtualStockDesc=Virtual stock is the stock you will get once all open pending actions that affect stocks will be closed (supplier order received, customer order shipped, ...)
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
@@ -101,7 +104,7 @@ ThisWarehouseIsPersonalStock=This warehouse represents personal stock of %s %s
 SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
 SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
 NoStockAction=No stock action
-DesiredStock=Desired optimal stock
+DesiredStock=Desired Stock
 DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
 StockToBuy=To order
 Replenishment=Replenishment
@@ -114,13 +117,13 @@ CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtual stock
 CurentlyUsingPhysicalStock=Physical stock
 RuleForStockReplenishment=Rule for stocks replenishment
-SelectProductWithNotNullQty=Select at least one product with a qty not null and a supplier
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
 AlertOnly= Alerts only
 WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is a list of all open supplier orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,10 +133,11 @@ RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever is rule for automatic stock change)
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
+TypeMovement=Type of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -143,11 +147,11 @@ ShowWarehouse=Show warehouse
 MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
 OpenAll=Open for all actions
 OpenInternal=Open only for internal actions
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on supplier order reception
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
 OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
 ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
 ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
@@ -171,16 +175,16 @@ inventoryValidate=Validated
 inventoryDraft=Running
 inventorySelectWarehouse=Warehouse choice
 inventoryConfirmCreate=ສ້າງ
-inventoryOfWarehouse=Inventory for warehouse : %s
-inventoryErrorQtyAdd=Error : one quantity is leaser than zero
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
 inventoryMvtStock=By inventory
 inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
-SelectFournisseur=Supplier filter
+SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
 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
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement has date of inventory
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
@@ -195,12 +199,16 @@ AddInventoryProduct=Add product to inventory
 AddProduct=Add
 ApplyPMP=Apply PMP
 FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action ?
+ConfirmFlushInventory=Do you confirm this action?
 InventoryFlushed=Inventory flushed
 ExitEditMode=Exit edition
 inventoryDeleteLine=Delete line
 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"
+StockSupportServices=Stock management supports Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
 ReceiveProducts=Receive items
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
diff --git a/htdocs/langs/lo_LA/website.lang b/htdocs/langs/lo_LA/website.lang
index b4d894f55d7..534756ac932 100644
--- a/htdocs/langs/lo_LA/website.lang
+++ b/htdocs/langs/lo_LA/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/lo_LA/withdrawals.lang b/htdocs/langs/lo_LA/withdrawals.lang
index 3defcec975a..cbca2b2f103 100644
--- a/htdocs/langs/lo_LA/withdrawals.lang
+++ b/htdocs/langs/lo_LA/withdrawals.lang
@@ -12,21 +12,21 @@ 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
+NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Amount to withdraw
 WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
-ResponsibleUser=Responsible user
+ResponsibleUser=User Responsible
 WithdrawalsSetup=Direct debit payment setup
 WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
-ThirdPartyBankCode=Third party bank code
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Classify credited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
@@ -50,7 +50,7 @@ StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
 StatusMotif2=Request contested
 StatusMotif3=No direct debit payment order
-StatusMotif4=Customer Order
+StatusMotif4=Sales Order
 StatusMotif5=RIB unusable
 StatusMotif6=Account without balance
 StatusMotif7=Judicial Decision
@@ -66,11 +66,11 @@ NotifyCredit=Withdrawal Credit
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=For bank accounts using RIB
 WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
-BankToReceiveWithdraw=Bank account to receive direct debit
+BankToReceiveWithdraw=Receiving Bank Account
 CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
-ShowWithdraw=Show Withdraw
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -87,13 +87,13 @@ 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
+CreditorName=Creditor 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
+ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
@@ -102,6 +102,10 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/lt_LT/accountancy.lang b/htdocs/langs/lt_LT/accountancy.lang
index ed797f13bcc..e95f36b0abd 100644
--- a/htdocs/langs/lt_LT/accountancy.lang
+++ b/htdocs/langs/lt_LT/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Consult here the list of third-party customers and vendors
 ListAccounts=Apskaitos sąskaitų sąrašas
 UnknownAccountForThirdparty=Unknown third-party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
-Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Without valid dedicated account
 WithValidAccount=With valid dedicated account
 ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
 AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Range of accounting account
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
-
+DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Išlaidų ataskaitos žurnalas
 InventoryJournal=Inventoriaus žurnalas
diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang
index 06bd56d55a5..2a4945d9fae 100644
--- a/htdocs/langs/lt_LT/admin.lang
+++ b/htdocs/langs/lt_LT/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Išvalyti
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Išvalyti dabar
@@ -804,6 +804,7 @@ Permission401=Skaityti nuolaidas
 Permission402=Sukurti/keisti nuolaidas
 Permission403=Patvirtinti nuolaidas
 Permission404=Ištrinti nuolaidas
+Permission430=Use Debug Bar
 Permission511=Read payments of salaries
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
@@ -818,6 +819,9 @@ Permission532=Sukurti/keisti paslaugas
 Permission534=Ištrinti paslaugas
 Permission536=Žiūrėti/tvarkyti paslėptas paslaugas
 Permission538=Eksportuoti paslaugas
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Skaityti aukas
 Permission702=Sukurti/keisti aukas
 Permission703=Ištrinti aukas
@@ -837,6 +841,12 @@ Permission1101=Skaityti pristatymo užsakymus
 Permission1102=Sukurti/keisti pristatymo užsakymus
 Permission1104=Patvirtinti pristatymo užsakymus
 Permission1109=Ištrinti pristatymo užsakymus
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Skaityti tiekėjus
 Permission1182=Read purchase orders
 Permission1183=Create/modify purchase orders
@@ -859,16 +869,6 @@ Permission1251=Pradėti masinį išorinių duomenų importą į duomenų bazę (
 Permission1321=Eksportuoti klientų sąskaitas-faktūras, atributus ir mokėjimus
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those 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)
-Permission23001=Skaityti planinį darbą
-Permission23002=sukurti / atnaujinti planinį darbą
-Permission23003=Panaikinti planinį darbą
-Permission23004=Vykdyti planinį darbą
 Permission2401=Skaityti veiksmus (įvykiai ar užduotys), susijusius su jų sąskaita
 Permission2402=Sukurti/keisti veiksmus (įvykiai ar užduotys) susijusius su jų sąskaita
 Permission2403=Ištrinti veiksmus (įvykius ar užduotis), susijusius su jų sąskaita
@@ -882,9 +882,41 @@ Permission2503=Pateikti arba ištrinti dokumentus
 Permission2515=Nustatyti dokumentų katalogus
 Permission2801=Naudokite FTP klientą skaitymo režime (tik naršyti ir parsisiųsti)
 Permission2802=Naudokite FTP klientą įrašymo režimu (ištrinti ar įkelti failus)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those 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)
+Permission23001=Skaityti planinį darbą
+Permission23002=sukurti / atnaujinti planinį darbą
+Permission23003=Panaikinti planinį darbą
+Permission23004=Vykdyti planinį darbą
 Permission50101=Use Point of Sale
 Permission50201=Skaityti sandorius/transakcijas
 Permission50202=Importuoti sandorius/transakcijas
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Spausdinti
 Permission55001=Skaityti apklausas
 Permission55002=Sukurti/keisti apklausas
@@ -1078,7 +1110,7 @@ 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=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
-AccountantDesc=Edit the details of your accountant/bookkeeper
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
@@ -1891,3 +1923,5 @@ IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute s
 UrlForIFTTT=URL endpoint for IFTTT
 YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/lt_LT/banks.lang b/htdocs/langs/lt_LT/banks.lang
index bf7802228a6..5b61ca31201 100644
--- a/htdocs/langs/lt_LT/banks.lang
+++ b/htdocs/langs/lt_LT/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=Not reconciled
 CustomerInvoicePayment=Kliento mokėjimas
 SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Pasirašymo apmokėjimas
-WithdrawalPayment=Išėmimo (withdrawal) mokėjimas
+WithdrawalPayment=Išankstinis mokėjimo pavedimas
 SocialContributionPayment=Socialinio / fiskalinio mokesčio mokėjimas
 BankTransfer=Banko pervedimas
 BankTransfers=Banko pervedimai
diff --git a/htdocs/langs/lt_LT/cashdesk.lang b/htdocs/langs/lt_LT/cashdesk.lang
index 4835c923a97..3b2261d50b9 100644
--- a/htdocs/langs/lt_LT/cashdesk.lang
+++ b/htdocs/langs/lt_LT/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/lt_LT/mails.lang b/htdocs/langs/lt_LT/mails.lang
index 033ac74f022..87a8dea5bab 100644
--- a/htdocs/langs/lt_LT/mails.lang
+++ b/htdocs/langs/lt_LT/mails.lang
@@ -19,6 +19,8 @@ MailTopic=Email topic
 MailText=Pranešimas
 MailFile=Prikabinti failai
 MailMessage=E-laiško pagrindinė dalis
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
 ShowEMailing=Rodyti e-paštą
 ListOfEMailings=E-laiškų sąrašas
 NewMailing=Naujas e-laiškas
@@ -76,9 +78,9 @@ GroupEmails=Group emails
 OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
 WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
 ResultOfMailSending=Result of mass Email sending
-NbSelected=No. selected
-NbIgnored=No. ignored
-NbSent=No. sent
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
diff --git a/htdocs/langs/lt_LT/members.lang b/htdocs/langs/lt_LT/members.lang
index ddc3f30fd1b..71b8df4a92b 100644
--- a/htdocs/langs/lt_LT/members.lang
+++ b/htdocs/langs/lt_LT/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=Pasirinkite statistiką, kurią norite skaityti
 MenuMembersStats=Statistika
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
-Nature=Prigimtis
+MemberNature=Nature of member
 Public=Informacija yra vieša
 NewMemberbyWeb=Naujas narys pridėtas. Laukiama patvirtinimo
 NewMemberForm=Naujo nario forma
diff --git a/htdocs/langs/lt_LT/products.lang b/htdocs/langs/lt_LT/products.lang
index 4c2bee49d6a..110c1b650ec 100644
--- a/htdocs/langs/lt_LT/products.lang
+++ b/htdocs/langs/lt_LT/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Kilmės šalis
-Nature=Product Type (material/finished)
+Nature=Nature of produt (material/finished)
 ShortLabel=Short label
 Unit=Vienetas
 p=u.
diff --git a/htdocs/langs/lt_LT/salaries.lang b/htdocs/langs/lt_LT/salaries.lang
index 957b1bcb0bf..3d689e4bc7c 100644
--- a/htdocs/langs/lt_LT/salaries.lang
+++ b/htdocs/langs/lt_LT/salaries.lang
@@ -1,18 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger 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_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
 Salary=Atlyginimas
 Salaries=Atlyginimai
 NewSalaryPayment=Naujas atlyginimo mokėjimas
+AddSalaryPayment=Add salary payment
 SalaryPayment=Atlyginimo mokėjimas
 SalariesPayments=Atlyginimų mokėjimai
 ShowSalaryPayment=Rodyti atlyginimo mokėjimą
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
-THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
-TJMDescription=This value is currently as information only and is not used for any calculation
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
-SalariesStatistics=Statistiques salaires
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/lt_LT/stocks.lang b/htdocs/langs/lt_LT/stocks.lang
index e603cc53529..3682d2ace36 100644
--- a/htdocs/langs/lt_LT/stocks.lang
+++ b/htdocs/langs/lt_LT/stocks.lang
@@ -3,7 +3,7 @@ WarehouseCard=Sandėlio kortelė
 Warehouse=Sandėlis
 Warehouses=Sandėliai
 ParentWarehouse=Parent warehouse
-NewWarehouse=Naujas sandėlys / Atsargų sritis
+NewWarehouse=New warehouse / Stock Location
 WarehouseEdit=Keisti sandėlį
 MenuNewWarehouse=Naujas sandėlys
 WarehouseSource=Pradinis sandėlis
@@ -29,6 +29,8 @@ MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Sandėlių plotas
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
 Location=Vieta
 LocationSummary=Trumpas vietos pavadinimas
 NumberOfDifferentProducts=Skirtingų produktų skaičius
@@ -44,7 +46,6 @@ TransferStock=Transfer stock
 MassStockTransferShort=Mass stock transfer
 StockMovement=Stock movement
 StockMovements=Stock movements
-LabelMovement=Judėjimo etiketė
 NumberOfUnit=Vienetų skaičius
 UnitPurchaseValue=Vieneto įsigijimo kaina
 StockTooLow=Atsargų per mažai
@@ -54,21 +55,23 @@ PMPValue=Vidutinė svertinė kaina
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Sandėlių vertė
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Allow to add limit and desired stock per couple (product, warehouse) instead of per product
-IndependantSubProductStock=Product stock and subproduct stock are independant
+AllowAddLimitStockByWarehouse=Manage also values for minimum and desired stock per pairing (product-warehouse) in addition to values per product
+IndependantSubProductStock=Product stock and subproduct stock are independent
 QtyDispatched=Kiekis išsiųstas
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
-RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
-DeStockOnBill=Mažinti realių atsargų klientų sąskaitų-faktūrų/kreditinių sąskaitų patvirtinimuose
-DeStockOnValidateOrder=Sumažinti realias atsargas klientų užsakymų patvirtinime
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
 DeStockOnShipment=Decrease real stocks on shipping validation
-DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification closed
-ReStockOnBill=Padidinti realių atsargų tiekėjams sąskaitos / kreditinės pastabos patvirtinimo
-ReStockOnValidateOrder=Increase real stocks on purchase orders approbation
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=Užsakymas dar neturi arba jau nebeturi statuso, kuris leidžia išsiųsti produktus į atsargų sandėlius.
 StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
 NoPredefinedProductToDispatch=Nėra iš anksto nustatytų produktų šiam objektui. Atsargų siuntimas nėra reikalingas
@@ -76,12 +79,12 @@ DispatchVerb=Išsiuntimas
 StockLimitShort=Riba perspėjimui
 StockLimit=Sandėlio riba perspėjimui
 StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
-PhysicalStock=Fizinės atsargos
+PhysicalStock=Physical Stock
 RealStock=Realios atsargos
-RealStockDesc=Physical or real stock is the stock you currently have into your internal warehouses/emplacements.
-RealStockWillAutomaticallyWhen=The real stock will automatically change according to this rules (see stock module setup to change this):
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtualios atsargos
-VirtualStockDesc=Virtual stock is the stock you will get once all open pending actions that affect stocks will be closed (supplier order received, customer order shipped, ...)
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
 IdWarehouse=Sandėlio ID
 DescWareHouse=Sandėlio aprašymas
 LieuWareHouse=Sandėlio vieta
@@ -101,7 +104,7 @@ ThisWarehouseIsPersonalStock=Šis sandėlis atvaizduoja asmenines atsargas %s %s
 SelectWarehouseForStockDecrease=Pasirinkite sandėlį atsargų sumažėjimui
 SelectWarehouseForStockIncrease=Pasirinkite sandėlį atsargų padidėjimui
 NoStockAction=Nėra veiksmų su atsargomis
-DesiredStock=Desired optimal stock
+DesiredStock=Desired Stock
 DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
 StockToBuy=Užsakyti
 Replenishment=Papildymas
@@ -114,13 +117,13 @@ CurentSelectionMode=Dabartinis pasirinkimo režimas
 CurentlyUsingVirtualStock=Virtualios atsargos
 CurentlyUsingPhysicalStock=Fizinės atsargos
 RuleForStockReplenishment=Atsargų papildymo taisyklė
-SelectProductWithNotNullQty=Pasirinkite bent vieną produktą su kiekiu, nelygiu 0, ir tiekėją
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
 AlertOnly= Tik įspėjimai
 WarehouseForStockDecrease=Sandėlis <b>%s</b> bus naudojamos atsargų sumažėjimui
 WarehouseForStockIncrease=Sandėlis <b>%s</b> bus naudojamos atsargų padidėjimui
 ForThisWarehouse=Šiam sandėliui
-ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is a list of all open supplier orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Papildymai
 NbOfProductBeforePeriod=Produkto %s kiekis atsargose iki pasirinkto periodo (< %s)
 NbOfProductAfterPeriod=Produkto %s kiekis sandėlyje po pasirinkto periodo (> %s)
@@ -130,10 +133,11 @@ RecordMovement=Record transfer
 ReceivingForSameOrder=Įplaukos už šį užsakymą
 StockMovementRecorded=Įrašyti atsargų judėjimai
 RuleForStockAvailability=Atsargų reikalavimų taisyklės
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever is rule for automatic stock change)
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
+TypeMovement=Type of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -143,11 +147,11 @@ ShowWarehouse=Rodyti sandėlį
 MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
 OpenAll=Open for all actions
 OpenInternal=Open only for internal actions
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on supplier order reception
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
 OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
 ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
 ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
@@ -171,16 +175,16 @@ inventoryValidate=Galiojantis
 inventoryDraft=Veikia
 inventorySelectWarehouse=Warehouse choice
 inventoryConfirmCreate=Sukurti
-inventoryOfWarehouse=Inventory for warehouse : %s
-inventoryErrorQtyAdd=Error : one quantity is leaser than zero
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
 inventoryMvtStock=By inventory
 inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Kategorijų filtras
-SelectFournisseur=Supplier filter
+SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
 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
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement has date of inventory
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
@@ -195,12 +199,16 @@ AddInventoryProduct=Add product to inventory
 AddProduct=Pridėti
 ApplyPMP=Apply PMP
 FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action ?
+ConfirmFlushInventory=Do you confirm this action?
 InventoryFlushed=Inventory flushed
 ExitEditMode=Exit edition
 inventoryDeleteLine=Ištrinti eilutę
 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"
+StockSupportServices=Stock management supports Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
 ReceiveProducts=Receive items
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
diff --git a/htdocs/langs/lt_LT/website.lang b/htdocs/langs/lt_LT/website.lang
index 613196a548e..9acf3675a3b 100644
--- a/htdocs/langs/lt_LT/website.lang
+++ b/htdocs/langs/lt_LT/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/lt_LT/withdrawals.lang b/htdocs/langs/lt_LT/withdrawals.lang
index 3f014f99858..92eb828c596 100644
--- a/htdocs/langs/lt_LT/withdrawals.lang
+++ b/htdocs/langs/lt_LT/withdrawals.lang
@@ -2,7 +2,7 @@
 CustomersStandingOrdersArea=Direct debit payment orders area
 SuppliersStandingOrdersArea=Direct credit payment orders area
 StandingOrdersPayment=Direct debit payment orders
-StandingOrderPayment=Direct debit payment order
+StandingOrderPayment=Tiesioginis mokėjimas į sąskaitą
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=Apdoroti
 WithdrawalsReceipts=Direct debit orders
@@ -12,21 +12,21 @@ WithdrawalsLines=Direct debit order lines
 RequestStandingOrderToTreat=Request for direct debit payment order to process
 RequestStandingOrderTreated=Request for direct debit payment order processed
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Dar negalima. Išėmimo būklė turi būti nustatyta "kredituota" prieš spec. eilučių atmetimo deklaravimą.
-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
+NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Išėmimo suma
 WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
-ResponsibleUser=Atsakingas vartotojas
+ResponsibleUser=User Responsible
 WithdrawalsSetup=Direct debit payment setup
 WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
-ThirdPartyBankCode=Trečiosios šalies banko kodas
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Priskirti įskaitytas (credited)
 ClassCreditedConfirm=Ar tikrai norite priskirti šias išėmimo įplaukas kaip įskaitytas (credited) į Jūsų banko sąskaitą ?
 TransData=Perdavimo data
@@ -50,7 +50,7 @@ StatusMotif0=Nenurodyta
 StatusMotif1=Nepakanka lėšų
 StatusMotif2=Prašymas ginčijamas
 StatusMotif3=No direct debit payment order
-StatusMotif4=Kliento užsakymas
+StatusMotif4=Sales Order
 StatusMotif5=RIB netinkamas
 StatusMotif6=Sąskaita be balanso
 StatusMotif7=Teismo sprendimas
@@ -66,11 +66,11 @@ NotifyCredit=Išėmimo kreditas
 NumeroNationalEmetter=Nacionalinis siuntėjo numeris
 WithBankUsingRIB=Banko sąskaitoms, naudojančioms RIB
 WithBankUsingBANBIC=Banko sąskaitoms, naudojančioms IBAN / BIC / SWIFT
-BankToReceiveWithdraw=Bank account to receive direct debit
+BankToReceiveWithdraw=Receiving Bank Account
 CreditDate=Kreditą
 WithdrawalFileNotCapable=Negalima sugeneruoti pajamų gavimo failo Jūsų šaliai %s (Šalis nepalaikoma programos)
-ShowWithdraw=Rodyti Išėmimą
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Jei sąskaita-faktūra turi mažiausiai vieną išėmimo mokėjimą dar apdorojamą, tai nebus nustatyta kaip apmokėta, kad pirmiausia leisti išėmimo valdymą.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Išėmimo failas
 SetToStatusSent=Nustatyti būklę "Failas išsiųstas"
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Eilučių būklės statistika
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -87,13 +87,13 @@ 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
+CreditorName=Creditor 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
+ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
@@ -102,6 +102,10 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/lv_LV/accountancy.lang b/htdocs/langs/lv_LV/accountancy.lang
index b5f5f0fd29c..5ae8808bf6b 100644
--- a/htdocs/langs/lv_LV/accountancy.lang
+++ b/htdocs/langs/lv_LV/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Konsultējieties ar trešo pušu klientu un pārdevēju sar
 ListAccounts=Grāmatvedības kontu saraksts
 UnknownAccountForThirdparty=Nezināmas trešās puses konts. Mēs izmantosim %s
 UnknownAccountForThirdpartyBlocking=Nezināms trešās puses konts. Bloķēšanas kļūda
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Trešās puses konts nav definēts vai trešā persona nav zināma. Bloķēšanas kļūda.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Trešās puses konts nav definēts vai trešā persona nav zināma. Bloķēšanas kļūda.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Nav noteikts nezināms trešās puses konts un gaidīšanas konts. Bloķēšanas kļūda
 PaymentsNotLinkedToProduct=Maksājums nav saistīts ar kādu produktu / pakalpojumu
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Eksportēt uz Cogilog
 Modelcsv_agiris=Eksports uz Agiris
 Modelcsv_openconcerto=Eksportēt OpenConcerto (tests)
 Modelcsv_configurable=Eksportēt CSV konfigurējamu
-Modelcsv_FEC=Eksporta FEC (L47 A pants)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Eksports uz Sage 50 Šveici
 ChartofaccountsId=Kontu konts. Id
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Bez derīga veltīta konta
 WithValidAccount=Izmantojot derīgu veltītu kontu
 ValueNotIntoChartOfAccount=Šī grāmatvedības konta vērtība konta diagrammā nepastāv
 AccountRemovedFromGroup=Konts ir noņemts no grupas
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Range of accounting account
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Līnijas, kas vēl nav saistītas, izmantojiet izvēl
 
 ## Import
 ImportAccountingEntries=Grāmatvedības ieraksti
-
+DateExport=Date export
 WarningReportNotReliable=Brīdinājums. Šis pārskats nav balstīts uz grāmatvedi, tādēļ tajā nav darījumu, kas Manuāli ir manuāli modificēts. Ja žurnāls ir atjaunināts, grāmatvedības skats ir precīzāks.
 ExpenseReportJournal=Izdevumu atskaites žurnāls
 InventoryJournal=Inventāra žurnāls
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index dd232956026..c0937d9be97 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=Šī sadaļa nodrošina administrēšanas funkcijas. Izmanto
 Purge=Tīrīt
 PurgeAreaDesc=Šī lapa ļauj izdzēst visus Dolibarr ģenerētos vai glabātos failus (pagaidu faili vai visi faili <b> %s </b> direktorijā). Šīs funkcijas izmantošana parasti nav nepieciešama. Tas tiek nodrošināts kā risinājums lietotājiem, kuru Dolibarr uztur pakalpojumu sniedzējs, kas nepiedāvā atļaujas, lai dzēstu tīmekļa servera ģenerētos failus.
 PurgeDeleteLogFile=Dzēsiet žurnāla failus, tostarp <b>%s</b>, kas definēti Syslog modulim (nav datu pazaudēšanas riska).
-PurgeDeleteTemporaryFiles=Dzēst visus pagaidu failus (nav datu pazaudēšanas riska)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Dzēst pagaidu failus
 PurgeDeleteAllFilesInDocumentsDir=Dzēsiet visus failus direktorijā: <b> %s </b>. <br> Tas izdzēsīs visus radītos dokumentus, kas saistīti ar elementiem (trešajām personām, rēķiniem utt.), ECM modulī augšupielādētiem failiem, datu bāzes rezerves izgāztuvēm un pagaidu failus.
 PurgeRunNow=Tīrīt tagad
@@ -804,6 +804,7 @@ Permission401=Lasīt atlaides
 Permission402=Izveidot/mainīt atlaides
 Permission403=Apstiprināt atlaides
 Permission404=Dzēst atlaides
+Permission430=Use Debug Bar
 Permission511=Lasīt algu maksājumus
 Permission512=Izveidojiet / modificējiet algu maksājumus
 Permission514=Dzēst algu maksājumus
@@ -818,6 +819,9 @@ Permission532=Izveidot/mainīt pakalpojumus
 Permission534=Dzēst pakalpojumus
 Permission536=Skatīt/vadīt slēptos pakalpojumus
 Permission538=Eksportēt pakalpojumus
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Lasīt ziedojumus
 Permission702=Izveidot/mainīt ziedojumus
 Permission703=Dzēst ziedojumus
@@ -837,6 +841,12 @@ Permission1101=Skatīt piegādes pasūtījumus
 Permission1102=Izveidot/mainīt piegādes pasūtījumus
 Permission1104=Apstiprināt piegādes pasūtījumus
 Permission1109=Dzēst piegādes pasūtījumus
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Lasīt piegādātājus
 Permission1182=Lasīt pirkuma pasūtījumus
 Permission1183=Izveidot / mainīt pirkuma pasūtījumus
@@ -859,16 +869,6 @@ Permission1251=Palaist masveida importu ārējiem datiem datu bāzē (datu ielā
 Permission1321=Eksporta klientu rēķinus, atribūti un maksājumus
 Permission1322=Atkārtoti atvērt samaksāto rēķinu
 Permission1421=Eksporta pārdošanas pasūtījumi un atribūti
-Permission20001=Lasiet atvaļinājuma pieprasījumus (jūsu atvaļinājumu un jūsu padoto atvaļinājumu)
-Permission20002=Izveidojiet / modificējiet atvaļinājuma pieprasījumus (jūsu atvaļinājumu un jūsu padotajiem)
-Permission20003=Dzēst atvaļinājumu pieprasījumus
-Permission20004=Lasīt visus atvaļinājuma pieprasījumus (pat lietotājs nav pakļauts)
-Permission20005=Izveidot / mainīt atvaļinājumu pieprasījumus visiem (pat lietotājam nav padotajiem)
-Permission20006=Admin leave requests (setup and update balance)
-Permission23001=Apskatīt ieplānoto darbu
-Permission23002=Izveidot/atjaunot ieplānoto uzdevumu
-Permission23003=Dzēst ieplānoto uzdevumu
-Permission23004=Izpildīt ieplānoto uzdevumu
 Permission2401=SKatīt darbības (pasākumi vai uzdevumi), kas saistīti ar kontu
 Permission2402=Izveidot / mainīt darbības (pasākumi vai uzdevumi), kas saistīti ar viņa kontu
 Permission2403=Dzēst darbības (pasākumi vai uzdevumi), kas saistīti ar viņa kontu
@@ -882,9 +882,41 @@ Permission2503=Pievienot vai dzēst dokumentus
 Permission2515=Iestatīt dokumentu direktorijas
 Permission2801=Lietot FTP klientu lasīšanas režīmā (pārlūko un lejupielādē)
 Permission2802=Lietot FTP klientu rakstīšanas režīmā (dzēst vai augšupielādēt failus)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Lasiet atvaļinājuma pieprasījumus (jūsu atvaļinājumu un jūsu padoto atvaļinājumu)
+Permission20002=Izveidojiet / modificējiet atvaļinājuma pieprasījumus (jūsu atvaļinājumu un jūsu padotajiem)
+Permission20003=Dzēst atvaļinājumu pieprasījumus
+Permission20004=Lasīt visus atvaļinājuma pieprasījumus (pat lietotājs nav pakļauts)
+Permission20005=Izveidot / mainīt atvaļinājumu pieprasījumus visiem (pat lietotājam nav padotajiem)
+Permission20006=Admin leave requests (setup and update balance)
+Permission23001=Apskatīt ieplānoto darbu
+Permission23002=Izveidot/atjaunot ieplānoto uzdevumu
+Permission23003=Dzēst ieplānoto uzdevumu
+Permission23004=Izpildīt ieplānoto uzdevumu
 Permission50101=Izmantot pārdošanas vietu
 Permission50201=Lasīt darījumus
 Permission50202=Importēt darījumus
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Drukāt
 Permission55001=Lasīt aptaujas
 Permission55002=Izveidot/labot aptaujas
@@ -1078,7 +1110,7 @@ AreaForAdminOnly=Iestatīšanas parametrus var iestatīt tikai <b> administrator
 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 tikai administratora lietotājiem. Dolibarr lietotāja atļaujas nevar mainīt šo ierobežojumu.
 CompanyFundationDesc=Rediģējiet uzņēmuma / organizācijas informāciju. Noklikšķiniet uz pogas "%s" vai "%s" lapas apakšdaļā.
-AccountantDesc=Rediģējiet informāciju par savu grāmatvedi / grāmatvedi
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Grāmatveža kods
 DisplayDesc=Šeit var mainīt parametrus, kas ietekmē Dolibarr izskatu un uzvedību.
 AvailableModules=Pieejamās progrmma / moduļi
@@ -1891,3 +1923,5 @@ IFTTTDesc=Šis modulis ir paredzēts, lai aktivizētu IFTTT notikumus un / vai v
 UrlForIFTTT=URL beigu punkts IFTTT
 YouWillFindItOnYourIFTTTAccount=Jūs atradīsiet to savā IFTTT kontā
 EndPointFor=Beigu punkts %s: %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/lv_LV/banks.lang b/htdocs/langs/lv_LV/banks.lang
index f40c1bdb7df..4675ef3a14a 100644
--- a/htdocs/langs/lv_LV/banks.lang
+++ b/htdocs/langs/lv_LV/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=Nesaskaņot
 CustomerInvoicePayment=Klienta maksājums
 SupplierInvoicePayment=Piegādātāja maksājums
 SubscriptionPayment=Abonēšanas maksa
-WithdrawalPayment=Izstāšanās maksājums
+WithdrawalPayment=Debit payment order
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bankas pārskaitījums
 BankTransfers=Bankas pārskaitījumi
diff --git a/htdocs/langs/lv_LV/cashdesk.lang b/htdocs/langs/lv_LV/cashdesk.lang
index f292e574ab7..1c71ba8aa6c 100644
--- a/htdocs/langs/lv_LV/cashdesk.lang
+++ b/htdocs/langs/lv_LV/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Termināļu skaits
 TerminalSelect=Atlasiet termināli, kuru vēlaties izmantot:
 POSTicket=POS biļete
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/lv_LV/mails.lang b/htdocs/langs/lv_LV/mails.lang
index 1432b057e85..dd400d13e7d 100644
--- a/htdocs/langs/lv_LV/mails.lang
+++ b/htdocs/langs/lv_LV/mails.lang
@@ -78,9 +78,9 @@ GroupEmails=Grupas e-pasti
 OneEmailPerRecipient=Viens e-pasts katram adresātam (pēc noklusējuma viens e-pasts uz vienu atlasīto ierakstu)
 WarningIfYouCheckOneRecipientPerEmail=Brīdinājums. Ja atzīmēsit šo izvēles rūtiņu, tas nozīmē, ka tiks nosūtīts tikai viens e-pasta ziņojums, izvēloties vairākus atšķirīgus ierakstus, tādēļ, ja jūsu ziņojumā ir iekļauti aizstājējumultiņi, kas attiecas uz ieraksta datiem, tos nevar aizstāt.
 ResultOfMailSending=Masu sūtīšanas rezultāts
-NbSelected=Nē atlasīts
-NbIgnored=Nē ignorēts
-NbSent=Nosūtīts
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s ziņa (s) nosūtīta.
 ConfirmUnvalidateEmailing=Vai tiešām vēlaties mainīt e-pastu <b> %s </b> uz melnraksta statusu?
 MailingModuleDescContactsWithThirdpartyFilter=Sazinieties ar klientu filtriem
diff --git a/htdocs/langs/lv_LV/members.lang b/htdocs/langs/lv_LV/members.lang
index 54fd8adefa8..1b53052c51a 100644
--- a/htdocs/langs/lv_LV/members.lang
+++ b/htdocs/langs/lv_LV/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=Izvēlieties statistiku kuru vēlaties izlasīt ...
 MenuMembersStats=Statistika
 LastMemberDate=Pēdējā biedra datums
 LatestSubscriptionDate=Jaunākais piereģistrēšanās datums
-Nature=Daba
+MemberNature=Nature of member
 Public=Informācija ir publiska
 NewMemberbyWeb=Jauns dalībnieks pievienots. Gaida apstiprinājumu
 NewMemberForm=Jauna dalībnieka forma
diff --git a/htdocs/langs/lv_LV/products.lang b/htdocs/langs/lv_LV/products.lang
index d0bb475cd24..6dd9360e6b9 100644
--- a/htdocs/langs/lv_LV/products.lang
+++ b/htdocs/langs/lv_LV/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Pārdevēja cenas
 SuppliersPricesOfProductsOrServices=Pārdevēja cenas (produktiem vai pakalpojumiem)
 CustomCode=Muita / Prece / HS kods
 CountryOrigin=Izcelsmes valsts
-Nature=Produkta veids (materiāls / gatavs)
+Nature=Nature of produt (material/finished)
 ShortLabel=Īsais nosaukums
 Unit=Vienība
 p=u.
diff --git a/htdocs/langs/lv_LV/salaries.lang b/htdocs/langs/lv_LV/salaries.lang
index 970a5f58edf..07b280565e6 100644
--- a/htdocs/langs/lv_LV/salaries.lang
+++ b/htdocs/langs/lv_LV/salaries.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - salaries
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Grāmatvedības konts, ko izmanto trešām pusēm
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Lietotāja kartē norādītais grāmatvedības konts tiks izmantots tikai pakārtotajam grāmatvedim. Šis viens tiks izmantots General Ledger un noklusējuma vērtība Subledged grāmatvedībai, ja lietotāja definēts lietotāju grāmatvedības konts nav definēts.
-SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Grāmatvedības konts pēc noklusējuma algu maksājumiem
 Salary=Alga
 Salaries=Algas
 NewSalaryPayment=Jauna algas izmaksa
@@ -12,8 +12,10 @@ ShowSalaryPayment=Rādīt algu maksājumus
 THM=Vidējā stundas cena
 TJM=Vidējā dienas likme
 CurrentSalary=Pašreizējā alga
-THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
-TJMDescription=This value is currently as information only and is not used for any calculation
+THMDescription=Šo vērtību var izmantot, lai aprēķinātu laiku, kas patērēts projektā, ko ievadījuši lietotāji, ja tiek izmantots modulis projekts
+TJMDescription=Šī vērtībai ir tikai informatīva un netiek izmantota aprēķiniem
 LastSalaries=Jaunākie %s algu maksājumi
 AllSalaries=Visi algu maksājumi
 SalariesStatistics=Algas statistika
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/lv_LV/stocks.lang b/htdocs/langs/lv_LV/stocks.lang
index be1eb641c81..26ecdf29269 100644
--- a/htdocs/langs/lv_LV/stocks.lang
+++ b/htdocs/langs/lv_LV/stocks.lang
@@ -3,7 +3,7 @@ WarehouseCard=Noliktava kartiņa
 Warehouse=Noliktava
 Warehouses=Noliktavas
 ParentWarehouse=Galvenā noliktava
-NewWarehouse=Jauns noliktavu / Noliktavas platība
+NewWarehouse=Jauna noliktava/krājuma atrašanās vieta
 WarehouseEdit=Modificēt noliktavas
 MenuNewWarehouse=Jauna noliktava
 WarehouseSource=Sākotnējā noliktava
@@ -29,6 +29,8 @@ MovementId=Pārvietošanas ID
 StockMovementForId=Pārvietošanas ID %d
 ListMouvementStockProject=Ar projektu saistīto krājumu kustību saraksts
 StocksArea=Noliktavas platība
+AllWarehouses=Visas noliktavas
+IncludeAlsoDraftOrders=Iekļaujiet arī pasūtījumu projektus
 Location=Vieta
 LocationSummary=Īsais atrašanās vietas nosaukums
 NumberOfDifferentProducts=Dažādu produktu skaits
@@ -53,8 +55,8 @@ PMPValue=Vidējā svērtā cena
 PMPValueShort=VSC
 EnhancedValueOfWarehouses=Noliktavas vērtība
 UserWarehouseAutoCreate=Lietotāja noliktavas izveide, izveidojot lietotāju
-AllowAddLimitStockByWarehouse=Ļauj pievienot ierobežojumu un vēlamo krājumu uz pāris (produkts, noliktava), nevis uz produktu
-IndependantSubProductStock=Produktu krājumi un blakusprodukti ir neatkarīgi
+AllowAddLimitStockByWarehouse=Pārvaldiet arī minimālo un vēlamo krājumu vērtības attiecībā uz pāriem (produktu noliktava) papildus vērtībām katram produktam
+IndependantSubProductStock=Produktu krājumi un apakšprodukti ir neatkarīgi
 QtyDispatched=Nosūtītais daudzums
 QtyDispatchedShort=Daudz. nosūtīts
 QtyToDispatchShort=Daudzums nosūtīšanai
@@ -62,12 +64,14 @@ OrderDispatch=Posteņu ieņēmumi
 RuleForStockManagementDecrease=Lai automātiski samazinātu krājumu samazinājumu, izvēlieties noteikumu (manuāla samazināšana vienmēr ir iespējama, pat ja ir aktivizēts automātiskais samazināšanas noteikums).
 RuleForStockManagementIncrease=Izvēlieties noteikumu automātiskai krājumu palielināšanai (manuāla palielināšana vienmēr ir iespējama, pat ja ir aktivizēts automātiskais pieauguma noteikums).
 DeStockOnBill=Samaziniet reālos krājumus klienta rēķina / kredītzīmes atzīmēšanā
-DeStockOnValidateOrder=Samazināt reālos krājumus klienta pasūtījuma validācijā
+DeStockOnValidateOrder=Samaziniet reālos krājumus pārdošanas pasūtījuma apstiprināšanā
 DeStockOnShipment=Samazināt reālos krājumus piegādes apstiprinājuma gadījumā
-DeStockOnShipmentOnClosing=Samazināt reālās krājumus kuģošanas klasifikācijā
-ReStockOnBill=Palieliniet reālo krājumus, pārbaudot piegādātāja rēķinu / kredītzīmi
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Palieliniet reālos krājumus, apstiprinot pārdevēja rēķinu / kredīta piezīmi
 ReStockOnValidateOrder=Palieliniet reālo krājumu pirkšanas pasūtījuma apstiprinājumā
-ReStockOnDispatchOrder=Palielināt reālo krājumus, manuāli nosūtīt uz noliktavu pēc piegādātāja pasūtījuma preču saņemšanas
+ReStockOnDispatchOrder=Palieliniet reālos krājumus manuālajā nosūtīšanā noliktavā, pēc pirkuma pasūtījuma saņemšanas
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=Lai vēl nav vai vairs statusu, kas ļauj sūtījumiem produktu krājumu noliktavās.
 StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
 NoPredefinedProductToDispatch=Nav iepriekš produktu šo objektu. Līdz ar to nav nosūtot noliktavā ir nepieciešama.
@@ -75,12 +79,12 @@ DispatchVerb=Nosūtīšana
 StockLimitShort=Brīdinājuma limits
 StockLimit=Krājumu brīdinājuma limits
 StockLimitDesc=(tukšs) nozīmē, ka nav brīdinājuma. <br> 0 var izmantot brīdinājumam, tiklīdz krājums ir tukšs.
-PhysicalStock=Fiziskie krājumi
+PhysicalStock=Fiziskais krājums
 RealStock=Rālie krājumi
-RealStockDesc=Fiziskais vai reālais krājums ir krājums, kas jums patlaban ir pieejams jūsu iekšējās noliktavās / izvietojumos.
-RealStockWillAutomaticallyWhen=Reālais krājums automātiski mainās saskaņā ar šiem noteikumiem (skatiet krājumu moduļa iestatījumus, lai mainītu šo):
+RealStockDesc=Fiziskā / reālā krājumi ir krājumi, kas pašlaik atrodas noliktavās.
+RealStockWillAutomaticallyWhen=Reālais krājums tiks mainīts saskaņā ar šo noteikumu (kā noteikts Stock modulī):
 VirtualStock=Virtuālie krājumi
-VirtualStockDesc=Virtuālais krājums ir krājums, ko saņemsiet, kad tiks atvērtas visas atvērtas, neapdraudētās darbības, kas ietekmē krājumus (piegādes pasūtījums saņemts, nosūtīts pasūtītājs, ...)
+VirtualStockDesc=Virtuālais krājums ir aprēķinātais krājums, kas pieejams, kad visas atvērtās / nepabeigtās darbības (kas ietekmē krājumus) ir slēgtas (saņemtie pasūtījumi, nosūtītie pasūtījumi utt.)
 IdWarehouse=Id noliktava
 DescWareHouse=Apraksts noliktava
 LieuWareHouse=Lokālā noliktava
@@ -100,7 +104,7 @@ ThisWarehouseIsPersonalStock=Šī noliktava ir personīgie krājumi %s %s
 SelectWarehouseForStockDecrease=Izvēlieties noliktavu krājumu samazināšanai
 SelectWarehouseForStockIncrease=Izvēlieties noliktavu krājumu palielināšanai
 NoStockAction=Nav akciju darbība
-DesiredStock=Vēlamais minimālais krājums
+DesiredStock=Vēlamais krājums
 DesiredStockDesc=Šī krājuma summa būs vērtība, ko izmanto krājumu papildināšanai, izmantojot papildināšanas funkciju.
 StockToBuy=Lai pasūtītu
 Replenishment=Papildinājums
@@ -113,13 +117,13 @@ CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtuāla noliktava
 CurentlyUsingPhysicalStock=Reāla noliktava
 RuleForStockReplenishment=Noteikums par krājumu papildināšanu
-SelectProductWithNotNullQty=Izvēlieties vismaz vienu produktu ar Daudz kas nav nulles un piegādātāju
+SelectProductWithNotNullQty=Atlasiet vismaz vienu produktu, kura daudzums nav null un pārdevējs
 AlertOnly= Brīdinājumi tikai
 WarehouseForStockDecrease=Noliktava <b>%s</b> tiks izmantota krājumu samazināšanai
 WarehouseForStockIncrease=Noliktava <b>%s</b> tiks izmantota krājumu palielināšanai
 ForThisWarehouse=Šai noliktavai
-ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is a list of all opened supplier orders including predefined products. Only opened orders with predefined products, so orders that may affect stocks, are visible here.
+ReplenishmentStatusDesc=Šis ir saraksts ar visiem produktiem, kuru krājumi ir mazāki par vēlamo krājumu (vai ir zemāka par brīdinājuma vērtību, ja ir atzīmēta izvēles rūtiņa "tikai brīdinājums"). Izmantojot izvēles rūtiņu, varat izveidot pirkuma pasūtījumus, lai aizpildītu starpību.
+ReplenishmentOrdersDesc=Šis ir visu atvērto pirkumu pasūtījumu saraksts, ieskaitot iepriekš definētus produktus. Atveriet pasūtījumus tikai ar iepriekš definētiem produktiem, tāpēc šeit ir redzami pasūtījumi, kas var ietekmēt krājumus.
 Replenishments=Papildinājumus
 NbOfProductBeforePeriod=Produktu daudzums %s noliktavā pirms izvēlētā perioda (< %s)
 NbOfProductAfterPeriod=Daudzums produktu %s krājumā pēc izvēlētā perioda (&gt; %s)
@@ -143,11 +147,11 @@ ShowWarehouse=Rādīt noliktavu
 MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
+NoPendingReceptionOnSupplierOrder=Nav atvērta saņemšanas, jo atvērts pirkuma pasūtījums
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
 OpenAll=Atvērt visām darbībām
 OpenInternal=Atveras tikai iekšējām darbībām
-UseDispatchStatus=Izmantojiet nosūtīšanas statusu (apstipriniet / noraidiet) produktu līnijām piegādātāja pasūtījuma saņemšanā
+UseDispatchStatus=Izmantojiet nosūtīšanas statusu (apstipriniet / noraidiet) produktu līnijām pirkuma pasūtījuma saņemšanā
 OptionMULTIPRICESIsOn=Ir ieslēgta opcija "vairākas cenas par segmentu". Tas nozīmē, ka produktam ir vairākas pārdošanas cenas, tāpēc pārdošanas vērtību nevar aprēķināt
 ProductStockWarehouseCreated=Brīdinājuma krājuma limits un pareizi izveidots vēlamais optimālais krājums
 ProductStockWarehouseUpdated=Uzturvērtības ierobežojums brīdinājumam un vēlamais optimālais krājums ir pareizi atjaunināts
@@ -171,16 +175,16 @@ inventoryValidate=Apstiprināts
 inventoryDraft=Darbojas
 inventorySelectWarehouse=Noliktavas izvēle
 inventoryConfirmCreate=Izveidot
-inventoryOfWarehouse=Noliktavas inventārs : %s
+inventoryOfWarehouse=Noliktavas krājums: %s
 inventoryErrorQtyAdd=Kļūda: viens daudzums ir mazāks par nulli
 inventoryMvtStock=Pēc inventāra
 inventoryWarningProductAlreadyExists=Šis produkts jau ir iekļauts sarakstā
 SelectCategory=Sadaļu filtrs
-SelectFournisseur=Piegādātāju filtrs
+SelectFournisseur=Pārdevēja filtrs
 inventoryOnDate=Inventārs
-INVENTORY_DISABLE_VIRTUAL=Ļaujiet neiznīcināt bērnu produktu no inventāra komplekta
+INVENTORY_DISABLE_VIRTUAL=Virtuālais produkts (komplekts): nesamazina bērna produkta krājumus
 INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Izmantojiet pirkuma cenu, ja nevarat atrast pēdējo pirkuma cenu
-INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Krājumu kustība ir inventāra datums
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Krājumu kustībai ir inventarizācijas datums
 inventoryChangePMPPermission=Ļauj mainīt produkta PMP vērtību
 ColumnNewPMP=Jauna vienība PMP
 OnlyProdsInStock=Nepievienojiet produktu bez krājuma
@@ -202,7 +206,7 @@ inventoryDeleteLine=Dzēst rindu
 RegulateStock=Regulēt krājumus
 ListInventory=Saraksts
 StockSupportServices=Stock management atbalsta Pakalpojumi
-StockSupportServicesDesc=Pēc noklusējuma varat iegādāties tikai produktu ar veidu "produkts". Ja ieslēgts un ja moduļa pakalpojums ir ieslēgts, varat arī nolikt produktu ar tipu "pakalpojums"
+StockSupportServicesDesc=Pēc noklusējuma jūs varat uzkrāt tikai "produkta" produktus. Jūs varat arī uzglabāt "pakalpojuma" tipa produktu, ja ir iespējoti abi moduļu pakalpojumi un šī opcija.
 ReceiveProducts=Saņemt priekšmetus
 StockIncreaseAfterCorrectTransfer=Palielināt ar korekciju/pārvietošanu
 StockDecreaseAfterCorrectTransfer=Samazināt pēc korekcijas/pārsvietošanas
diff --git a/htdocs/langs/lv_LV/website.lang b/htdocs/langs/lv_LV/website.lang
index a4f63733b86..1ceefd882d9 100644
--- a/htdocs/langs/lv_LV/website.lang
+++ b/htdocs/langs/lv_LV/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=Jums nav atļaujas pievienot vai rediģēt PHP din
 ReplaceWebsiteContent=Nomainiet vietnes saturu
 DeleteAlsoJs=Vai arī dzēst visus šajā tīmekļa vietnē raksturīgos javascript failus?
 DeleteAlsoMedias=Vai arī dzēst visus šajā tīmekļa vietnē esošos mediju failus?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/lv_LV/withdrawals.lang b/htdocs/langs/lv_LV/withdrawals.lang
index 7d71634041f..43d51376581 100644
--- a/htdocs/langs/lv_LV/withdrawals.lang
+++ b/htdocs/langs/lv_LV/withdrawals.lang
@@ -18,7 +18,7 @@ InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Summa atsaukt
 WithdrawsRefused=Tiešais debets noraidīts
 NoInvoiceToWithdraw=Netika gaidīts neviens klienta rēķins ar atvērtiem tiešā debeta pieprasījumiem. Rēķina kartē dodieties uz cilni "%s", lai iesniegtu pieprasījumu.
-ResponsibleUser=Atbildīgais lietotājs
+ResponsibleUser=Lietotājs ir atbildīgs
 WithdrawalsSetup=Tiešā debeta maksājuma iestatīšana
 WithdrawStatistics=Tiešā debeta maksājumu statistika
 WithdrawRejectStatistics=Tiešā debeta maksājums noraida statistiku
@@ -50,7 +50,7 @@ StatusMotif0=Nenoteikts
 StatusMotif1=Nepietiekami līdzekļi
 StatusMotif2=Pieprasījumu apstrīdēja
 StatusMotif3=Nav tiešā debeta maksājuma uzdevuma
-StatusMotif4=Klienta pasūtijums
+StatusMotif4=Pārdošanas pasūtījums
 StatusMotif5=RIB nelietojams
 StatusMotif6=Konts bez atlikuma
 StatusMotif7=Juridiskais lēmums
@@ -66,11 +66,11 @@ NotifyCredit=Izstāšanās Kredīts
 NumeroNationalEmetter=Valsts raidītājs skaits
 WithBankUsingRIB=Attiecībā uz banku kontiem, izmantojot RIB
 WithBankUsingBANBIC=Attiecībā uz banku kontiem, izmantojot IBAN / BIC / SWIFT
-BankToReceiveWithdraw=Bankas konts, lai saņemtu tiešo debetu
+BankToReceiveWithdraw=Bankas konta saņemšana
 CreditDate=Kredīts
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
-ShowWithdraw=Rādīt izņemšana
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Tomēr, ja rēķins satur vismaz vienu maksājums, kas nav apstrādāts, to nevar noteikt kā apmaksātu.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=Šī cilne ļauj pieprasīt tiešā debeta maksājuma uzdevumu. Kad esat pabeidzis, dodieties uz izvēlni Bank-> Tiešais debets, lai pārvaldītu tiešā debeta maksājuma uzdevumu. Ja maksājuma uzdevums ir slēgts, rēķins tiek automātiski reģistrēts, un rēķins tiek slēgts, ja atlikušais maksājums ir nulle.
 WithdrawalFile=Izstāšanās fails
 SetToStatusSent=Nomainīt uz statusu "Fails nosūtīts"
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=Tas arī ierakstīs maksājumus rēķiniem un kl
 StatisticsByLineStatus=Statistics by status of lines
 RUM=RUM
 RUMLong=Unikāla pilnvaru atsauce
-RUMWillBeGenerated=Ja tukšs, UMR numurs tiks ģenerēts, tiklīdz tiks saglabāta informācija par bankas kontu
+RUMWillBeGenerated=Ja tukša, UMR (Unique Mandate Reference) tiks ģenerēta, tiklīdz tiks saglabāta bankas konta informācija.
 WithdrawMode=Tiešā debeta režīms (FRST vai RECUR)
 WithdrawRequestAmount=Tiešā debeta pieprasījuma summa:
 WithdrawRequestErrorNilAmount=Nevar izveidot tīrās summas tiešā debeta pieprasījumu.
@@ -93,7 +93,7 @@ SEPAFormYourName=Jūsu vārds
 SEPAFormYourBAN=Jūsu bankas konta nosaukums (IBAN)
 SEPAFormYourBIC=Jūsu bankas identifikācijas kods (BIC)
 SEPAFrstOrRecur=Maksājuma veids
-ModeRECUR=Atkārtotais maksājums
+ModeRECUR=Atkārtots maksājums
 ModeFRST=Vienreizējs maksājums
 PleaseCheckOne=Lūdzu izvēlaties tikai vienu
 DirectDebitOrderCreated=Tiešais debeta uzdevums %s izveidots
@@ -102,6 +102,10 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA vispirms
 ExecutionDate=Izpildes datums
 CreateForSepa=Izveidojiet tiešā debeta failu
+ICS=Kreditora identifikators CI
+END_TO_END="EndToEndId" SEPA XML tag - katram darījumam piešķirts unikāls ID
+USTRD="Nestrukturēts" SEPA XML tag
+ADDDAYS=Pievienojiet dienas izpildes datumam
 
 ### Notifications
 InfoCreditSubject=Bankas veiktais tiešā debeta maksājuma uzdevuma %s maksājums
diff --git a/htdocs/langs/mk_MK/accountancy.lang b/htdocs/langs/mk_MK/accountancy.lang
index daa5b4ef413..bb141cb9eb0 100644
--- a/htdocs/langs/mk_MK/accountancy.lang
+++ b/htdocs/langs/mk_MK/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Consult here the list of third-party customers and vendors
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third-party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
-Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Without valid dedicated account
 WithValidAccount=With valid dedicated account
 ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
 AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Range of accounting account
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
-
+DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang
index f9e88f2c7a7..18fac329b2d 100644
--- a/htdocs/langs/mk_MK/admin.lang
+++ b/htdocs/langs/mk_MK/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
@@ -804,6 +804,7 @@ Permission401=Read discounts
 Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
+Permission430=Use Debug Bar
 Permission511=Read payments of salaries
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
@@ -818,6 +819,9 @@ Permission532=Create/modify services
 Permission534=Delete services
 Permission536=See/manage hidden services
 Permission538=Export services
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
@@ -837,6 +841,12 @@ Permission1101=Read delivery orders
 Permission1102=Create/modify delivery orders
 Permission1104=Validate delivery orders
 Permission1109=Delete delivery orders
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Read suppliers
 Permission1182=Read purchase orders
 Permission1183=Create/modify purchase orders
@@ -859,16 +869,6 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those 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)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
 Permission2401=Read actions (events or tasks) linked to his account
 Permission2402=Create/modify actions (events or tasks) linked to his account
 Permission2403=Delete actions (events or tasks) linked to his account
@@ -882,9 +882,41 @@ Permission2503=Submit or delete documents
 Permission2515=Setup documents directories
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those 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)
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale
 Permission50201=Read transactions
 Permission50202=Import transactions
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Print
 Permission55001=Read polls
 Permission55002=Create/modify polls
@@ -1078,7 +1110,7 @@ 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 to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
-AccountantDesc=Edit the details of your accountant/bookkeeper
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
@@ -1891,3 +1923,5 @@ IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute s
 UrlForIFTTT=URL endpoint for IFTTT
 YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/mk_MK/banks.lang b/htdocs/langs/mk_MK/banks.lang
index cb39150b627..c77158e07b7 100644
--- a/htdocs/langs/mk_MK/banks.lang
+++ b/htdocs/langs/mk_MK/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
 SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Subscription payment
-WithdrawalPayment=Withdrawal payment
+WithdrawalPayment=Debit payment order
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
diff --git a/htdocs/langs/mk_MK/cashdesk.lang b/htdocs/langs/mk_MK/cashdesk.lang
index 006097b7e82..ea0e660ed2d 100644
--- a/htdocs/langs/mk_MK/cashdesk.lang
+++ b/htdocs/langs/mk_MK/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/mk_MK/mails.lang b/htdocs/langs/mk_MK/mails.lang
index b50faffe2fa..8b92cef3103 100644
--- a/htdocs/langs/mk_MK/mails.lang
+++ b/htdocs/langs/mk_MK/mails.lang
@@ -19,6 +19,8 @@ MailTopic=Email topic
 MailText=Message
 MailFile=Attached files
 MailMessage=Email body
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
 ShowEMailing=Show emailing
 ListOfEMailings=List of emailings
 NewMailing=New emailing
@@ -76,9 +78,9 @@ GroupEmails=Group emails
 OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
 WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
 ResultOfMailSending=Result of mass Email sending
-NbSelected=No. selected
-NbIgnored=No. ignored
-NbSent=No. sent
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
diff --git a/htdocs/langs/mk_MK/members.lang b/htdocs/langs/mk_MK/members.lang
index 9517568846c..9993e05428f 100644
--- a/htdocs/langs/mk_MK/members.lang
+++ b/htdocs/langs/mk_MK/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
-Nature=Nature
+MemberNature=Nature of member
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
diff --git a/htdocs/langs/mk_MK/products.lang b/htdocs/langs/mk_MK/products.lang
index 402779cb00f..7b68f5b3ebd 100644
--- a/htdocs/langs/mk_MK/products.lang
+++ b/htdocs/langs/mk_MK/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
-Nature=Product Type (material/finished)
+Nature=Nature of produt (material/finished)
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/mk_MK/salaries.lang b/htdocs/langs/mk_MK/salaries.lang
index 6a82354edae..7c3c08a65bd 100644
--- a/htdocs/langs/mk_MK/salaries.lang
+++ b/htdocs/langs/mk_MK/salaries.lang
@@ -1,18 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger 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_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
 Salary=Salary
 Salaries=Salaries
 NewSalaryPayment=New salary payment
+AddSalaryPayment=Add salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
 ShowSalaryPayment=Show salary payment
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
-THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
-TJMDescription=This value is currently as information only and is not used for any calculation
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
-SalariesStatistics=Statistiques salaires
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/mk_MK/stocks.lang b/htdocs/langs/mk_MK/stocks.lang
index 8178a8918b7..d42f1a82243 100644
--- a/htdocs/langs/mk_MK/stocks.lang
+++ b/htdocs/langs/mk_MK/stocks.lang
@@ -3,7 +3,7 @@ WarehouseCard=Warehouse card
 Warehouse=Warehouse
 Warehouses=Warehouses
 ParentWarehouse=Parent warehouse
-NewWarehouse=New warehouse / Stock area
+NewWarehouse=New warehouse / Stock Location
 WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
 WarehouseSource=Source warehouse
@@ -29,6 +29,8 @@ MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
 LocationSummary=Short name location
 NumberOfDifferentProducts=Number of different products
@@ -44,7 +46,6 @@ TransferStock=Transfer stock
 MassStockTransferShort=Mass stock transfer
 StockMovement=Stock movement
 StockMovements=Stock movements
-LabelMovement=Movement label
 NumberOfUnit=Number of units
 UnitPurchaseValue=Unit purchase price
 StockTooLow=Stock too low
@@ -54,21 +55,23 @@ PMPValue=Weighted average price
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Allow to add limit and desired stock per couple (product, warehouse) instead of per product
-IndependantSubProductStock=Product stock and subproduct stock are independant
+AllowAddLimitStockByWarehouse=Manage also values for minimum and desired stock per pairing (product-warehouse) in addition to values per product
+IndependantSubProductStock=Product stock and subproduct stock are independent
 QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
-RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
-DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
-DeStockOnValidateOrder=Decrease real stocks on customers orders validation
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
 DeStockOnShipment=Decrease real stocks on shipping validation
-DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification closed
-ReStockOnBill=Increase real stocks on suppliers invoices/credit notes validation
-ReStockOnValidateOrder=Increase real stocks on purchase orders approbation
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows dispatching of products in stock warehouses.
 StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
 NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required.
@@ -76,12 +79,12 @@ DispatchVerb=Dispatch
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
 StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
-PhysicalStock=Physical stock
+PhysicalStock=Physical Stock
 RealStock=Real Stock
-RealStockDesc=Physical or real stock is the stock you currently have into your internal warehouses/emplacements.
-RealStockWillAutomaticallyWhen=The real stock will automatically change according to this rules (see stock module setup to change this):
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
-VirtualStockDesc=Virtual stock is the stock you will get once all open pending actions that affect stocks will be closed (supplier order received, customer order shipped, ...)
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
@@ -101,7 +104,7 @@ ThisWarehouseIsPersonalStock=This warehouse represents personal stock of %s %s
 SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
 SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
 NoStockAction=No stock action
-DesiredStock=Desired optimal stock
+DesiredStock=Desired Stock
 DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
 StockToBuy=To order
 Replenishment=Replenishment
@@ -114,13 +117,13 @@ CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtual stock
 CurentlyUsingPhysicalStock=Physical stock
 RuleForStockReplenishment=Rule for stocks replenishment
-SelectProductWithNotNullQty=Select at least one product with a qty not null and a supplier
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
 AlertOnly= Alerts only
 WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is a list of all open supplier orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,10 +133,11 @@ RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever is rule for automatic stock change)
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
+TypeMovement=Type of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -143,11 +147,11 @@ ShowWarehouse=Show warehouse
 MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
 OpenAll=Open for all actions
 OpenInternal=Open only for internal actions
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on supplier order reception
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
 OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
 ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
 ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
@@ -171,16 +175,16 @@ inventoryValidate=Validated
 inventoryDraft=Running
 inventorySelectWarehouse=Warehouse choice
 inventoryConfirmCreate=Create
-inventoryOfWarehouse=Inventory for warehouse : %s
-inventoryErrorQtyAdd=Error : one quantity is leaser than zero
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
 inventoryMvtStock=By inventory
 inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
-SelectFournisseur=Supplier filter
+SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
 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
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement has date of inventory
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
@@ -195,12 +199,16 @@ AddInventoryProduct=Add product to inventory
 AddProduct=Add
 ApplyPMP=Apply PMP
 FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action ?
+ConfirmFlushInventory=Do you confirm this action?
 InventoryFlushed=Inventory flushed
 ExitEditMode=Exit edition
 inventoryDeleteLine=Delete line
 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"
+StockSupportServices=Stock management supports Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
 ReceiveProducts=Receive items
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
diff --git a/htdocs/langs/mk_MK/website.lang b/htdocs/langs/mk_MK/website.lang
index b4d894f55d7..534756ac932 100644
--- a/htdocs/langs/mk_MK/website.lang
+++ b/htdocs/langs/mk_MK/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/mk_MK/withdrawals.lang b/htdocs/langs/mk_MK/withdrawals.lang
index 3defcec975a..cbca2b2f103 100644
--- a/htdocs/langs/mk_MK/withdrawals.lang
+++ b/htdocs/langs/mk_MK/withdrawals.lang
@@ -12,21 +12,21 @@ 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
+NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Amount to withdraw
 WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
-ResponsibleUser=Responsible user
+ResponsibleUser=User Responsible
 WithdrawalsSetup=Direct debit payment setup
 WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
-ThirdPartyBankCode=Third party bank code
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Classify credited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
@@ -50,7 +50,7 @@ StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
 StatusMotif2=Request contested
 StatusMotif3=No direct debit payment order
-StatusMotif4=Customer Order
+StatusMotif4=Sales Order
 StatusMotif5=RIB unusable
 StatusMotif6=Account without balance
 StatusMotif7=Judicial Decision
@@ -66,11 +66,11 @@ NotifyCredit=Withdrawal Credit
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=For bank accounts using RIB
 WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
-BankToReceiveWithdraw=Bank account to receive direct debit
+BankToReceiveWithdraw=Receiving Bank Account
 CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
-ShowWithdraw=Show Withdraw
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -87,13 +87,13 @@ 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
+CreditorName=Creditor 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
+ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
@@ -102,6 +102,10 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/mn_MN/accountancy.lang b/htdocs/langs/mn_MN/accountancy.lang
index daa5b4ef413..bb141cb9eb0 100644
--- a/htdocs/langs/mn_MN/accountancy.lang
+++ b/htdocs/langs/mn_MN/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Consult here the list of third-party customers and vendors
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third-party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
-Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Without valid dedicated account
 WithValidAccount=With valid dedicated account
 ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
 AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Range of accounting account
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
-
+DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/mn_MN/admin.lang b/htdocs/langs/mn_MN/admin.lang
index e8a5dda7efb..9eaa12ec9be 100644
--- a/htdocs/langs/mn_MN/admin.lang
+++ b/htdocs/langs/mn_MN/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
@@ -804,6 +804,7 @@ Permission401=Read discounts
 Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
+Permission430=Use Debug Bar
 Permission511=Read payments of salaries
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
@@ -818,6 +819,9 @@ Permission532=Create/modify services
 Permission534=Delete services
 Permission536=See/manage hidden services
 Permission538=Export services
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
@@ -837,6 +841,12 @@ Permission1101=Read delivery orders
 Permission1102=Create/modify delivery orders
 Permission1104=Validate delivery orders
 Permission1109=Delete delivery orders
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Read suppliers
 Permission1182=Read purchase orders
 Permission1183=Create/modify purchase orders
@@ -859,16 +869,6 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those 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)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
 Permission2401=Read actions (events or tasks) linked to his account
 Permission2402=Create/modify actions (events or tasks) linked to his account
 Permission2403=Delete actions (events or tasks) linked to his account
@@ -882,9 +882,41 @@ Permission2503=Submit or delete documents
 Permission2515=Setup documents directories
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those 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)
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale
 Permission50201=Read transactions
 Permission50202=Import transactions
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Print
 Permission55001=Read polls
 Permission55002=Create/modify polls
@@ -1078,7 +1110,7 @@ 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 to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
-AccountantDesc=Edit the details of your accountant/bookkeeper
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
@@ -1891,3 +1923,5 @@ IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute s
 UrlForIFTTT=URL endpoint for IFTTT
 YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/mn_MN/banks.lang b/htdocs/langs/mn_MN/banks.lang
index cb39150b627..c77158e07b7 100644
--- a/htdocs/langs/mn_MN/banks.lang
+++ b/htdocs/langs/mn_MN/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
 SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Subscription payment
-WithdrawalPayment=Withdrawal payment
+WithdrawalPayment=Debit payment order
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
diff --git a/htdocs/langs/mn_MN/cashdesk.lang b/htdocs/langs/mn_MN/cashdesk.lang
index 006097b7e82..ea0e660ed2d 100644
--- a/htdocs/langs/mn_MN/cashdesk.lang
+++ b/htdocs/langs/mn_MN/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/mn_MN/mails.lang b/htdocs/langs/mn_MN/mails.lang
index b50faffe2fa..8b92cef3103 100644
--- a/htdocs/langs/mn_MN/mails.lang
+++ b/htdocs/langs/mn_MN/mails.lang
@@ -19,6 +19,8 @@ MailTopic=Email topic
 MailText=Message
 MailFile=Attached files
 MailMessage=Email body
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
 ShowEMailing=Show emailing
 ListOfEMailings=List of emailings
 NewMailing=New emailing
@@ -76,9 +78,9 @@ GroupEmails=Group emails
 OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
 WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
 ResultOfMailSending=Result of mass Email sending
-NbSelected=No. selected
-NbIgnored=No. ignored
-NbSent=No. sent
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
diff --git a/htdocs/langs/mn_MN/members.lang b/htdocs/langs/mn_MN/members.lang
index 9517568846c..9993e05428f 100644
--- a/htdocs/langs/mn_MN/members.lang
+++ b/htdocs/langs/mn_MN/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
-Nature=Nature
+MemberNature=Nature of member
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
diff --git a/htdocs/langs/mn_MN/products.lang b/htdocs/langs/mn_MN/products.lang
index 402779cb00f..7b68f5b3ebd 100644
--- a/htdocs/langs/mn_MN/products.lang
+++ b/htdocs/langs/mn_MN/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
-Nature=Product Type (material/finished)
+Nature=Nature of produt (material/finished)
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/mn_MN/salaries.lang b/htdocs/langs/mn_MN/salaries.lang
index 6a82354edae..7c3c08a65bd 100644
--- a/htdocs/langs/mn_MN/salaries.lang
+++ b/htdocs/langs/mn_MN/salaries.lang
@@ -1,18 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger 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_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
 Salary=Salary
 Salaries=Salaries
 NewSalaryPayment=New salary payment
+AddSalaryPayment=Add salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
 ShowSalaryPayment=Show salary payment
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
-THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
-TJMDescription=This value is currently as information only and is not used for any calculation
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
-SalariesStatistics=Statistiques salaires
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/mn_MN/stocks.lang b/htdocs/langs/mn_MN/stocks.lang
index 8178a8918b7..d42f1a82243 100644
--- a/htdocs/langs/mn_MN/stocks.lang
+++ b/htdocs/langs/mn_MN/stocks.lang
@@ -3,7 +3,7 @@ WarehouseCard=Warehouse card
 Warehouse=Warehouse
 Warehouses=Warehouses
 ParentWarehouse=Parent warehouse
-NewWarehouse=New warehouse / Stock area
+NewWarehouse=New warehouse / Stock Location
 WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
 WarehouseSource=Source warehouse
@@ -29,6 +29,8 @@ MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
 LocationSummary=Short name location
 NumberOfDifferentProducts=Number of different products
@@ -44,7 +46,6 @@ TransferStock=Transfer stock
 MassStockTransferShort=Mass stock transfer
 StockMovement=Stock movement
 StockMovements=Stock movements
-LabelMovement=Movement label
 NumberOfUnit=Number of units
 UnitPurchaseValue=Unit purchase price
 StockTooLow=Stock too low
@@ -54,21 +55,23 @@ PMPValue=Weighted average price
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Allow to add limit and desired stock per couple (product, warehouse) instead of per product
-IndependantSubProductStock=Product stock and subproduct stock are independant
+AllowAddLimitStockByWarehouse=Manage also values for minimum and desired stock per pairing (product-warehouse) in addition to values per product
+IndependantSubProductStock=Product stock and subproduct stock are independent
 QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
-RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
-DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
-DeStockOnValidateOrder=Decrease real stocks on customers orders validation
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
 DeStockOnShipment=Decrease real stocks on shipping validation
-DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification closed
-ReStockOnBill=Increase real stocks on suppliers invoices/credit notes validation
-ReStockOnValidateOrder=Increase real stocks on purchase orders approbation
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows dispatching of products in stock warehouses.
 StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
 NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required.
@@ -76,12 +79,12 @@ DispatchVerb=Dispatch
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
 StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
-PhysicalStock=Physical stock
+PhysicalStock=Physical Stock
 RealStock=Real Stock
-RealStockDesc=Physical or real stock is the stock you currently have into your internal warehouses/emplacements.
-RealStockWillAutomaticallyWhen=The real stock will automatically change according to this rules (see stock module setup to change this):
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
-VirtualStockDesc=Virtual stock is the stock you will get once all open pending actions that affect stocks will be closed (supplier order received, customer order shipped, ...)
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
@@ -101,7 +104,7 @@ ThisWarehouseIsPersonalStock=This warehouse represents personal stock of %s %s
 SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
 SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
 NoStockAction=No stock action
-DesiredStock=Desired optimal stock
+DesiredStock=Desired Stock
 DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
 StockToBuy=To order
 Replenishment=Replenishment
@@ -114,13 +117,13 @@ CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtual stock
 CurentlyUsingPhysicalStock=Physical stock
 RuleForStockReplenishment=Rule for stocks replenishment
-SelectProductWithNotNullQty=Select at least one product with a qty not null and a supplier
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
 AlertOnly= Alerts only
 WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is a list of all open supplier orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,10 +133,11 @@ RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever is rule for automatic stock change)
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
+TypeMovement=Type of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -143,11 +147,11 @@ ShowWarehouse=Show warehouse
 MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
 OpenAll=Open for all actions
 OpenInternal=Open only for internal actions
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on supplier order reception
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
 OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
 ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
 ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
@@ -171,16 +175,16 @@ inventoryValidate=Validated
 inventoryDraft=Running
 inventorySelectWarehouse=Warehouse choice
 inventoryConfirmCreate=Create
-inventoryOfWarehouse=Inventory for warehouse : %s
-inventoryErrorQtyAdd=Error : one quantity is leaser than zero
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
 inventoryMvtStock=By inventory
 inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
-SelectFournisseur=Supplier filter
+SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
 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
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement has date of inventory
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
@@ -195,12 +199,16 @@ AddInventoryProduct=Add product to inventory
 AddProduct=Add
 ApplyPMP=Apply PMP
 FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action ?
+ConfirmFlushInventory=Do you confirm this action?
 InventoryFlushed=Inventory flushed
 ExitEditMode=Exit edition
 inventoryDeleteLine=Delete line
 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"
+StockSupportServices=Stock management supports Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
 ReceiveProducts=Receive items
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
diff --git a/htdocs/langs/mn_MN/website.lang b/htdocs/langs/mn_MN/website.lang
index b4d894f55d7..534756ac932 100644
--- a/htdocs/langs/mn_MN/website.lang
+++ b/htdocs/langs/mn_MN/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/mn_MN/withdrawals.lang b/htdocs/langs/mn_MN/withdrawals.lang
index 3defcec975a..cbca2b2f103 100644
--- a/htdocs/langs/mn_MN/withdrawals.lang
+++ b/htdocs/langs/mn_MN/withdrawals.lang
@@ -12,21 +12,21 @@ 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
+NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Amount to withdraw
 WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
-ResponsibleUser=Responsible user
+ResponsibleUser=User Responsible
 WithdrawalsSetup=Direct debit payment setup
 WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
-ThirdPartyBankCode=Third party bank code
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Classify credited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
@@ -50,7 +50,7 @@ StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
 StatusMotif2=Request contested
 StatusMotif3=No direct debit payment order
-StatusMotif4=Customer Order
+StatusMotif4=Sales Order
 StatusMotif5=RIB unusable
 StatusMotif6=Account without balance
 StatusMotif7=Judicial Decision
@@ -66,11 +66,11 @@ NotifyCredit=Withdrawal Credit
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=For bank accounts using RIB
 WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
-BankToReceiveWithdraw=Bank account to receive direct debit
+BankToReceiveWithdraw=Receiving Bank Account
 CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
-ShowWithdraw=Show Withdraw
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -87,13 +87,13 @@ 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
+CreditorName=Creditor 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
+ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
@@ -102,6 +102,10 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/nb_NO/accountancy.lang b/htdocs/langs/nb_NO/accountancy.lang
index c9f0fb87382..1c296c94956 100644
--- a/htdocs/langs/nb_NO/accountancy.lang
+++ b/htdocs/langs/nb_NO/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Liste over tredjeparts kunder og leverandører og deres reg
 ListAccounts=Liste over regnskapskontoer
 UnknownAccountForThirdparty=Ukjent tredjepartskonto. Vi vil bruke %s
 UnknownAccountForThirdpartyBlocking=Ukjent tredjepartskonto. Blokkeringsfeil
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Tredjepartskonto ikke definert eller tredjepart ukjent. Blokkeringsfeil.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Tredjepartskonto ikke definert eller tredjepart ukjent. Blokkeringsfeil.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Ukjent tredjepartskonto og ventekonto ikke definert. Blokkeringsfeil
 PaymentsNotLinkedToProduct=Betaling ikke knyttet til noen vare/tjeneste
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Eksport til Cogilog
 Modelcsv_agiris=Eksport til Agiris
 Modelcsv_openconcerto=Eksport for OpenConcerto (Test)
 Modelcsv_configurable=Eksport CSV Konfigurerbar
-Modelcsv_FEC=Eksport FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Eksport for Sage 50 Switzerland
 ChartofaccountsId=Kontoplan ID
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Uten gyldig dedikert konto
 WithValidAccount=Med gyldig dedikert konto
 ValueNotIntoChartOfAccount=Denne verdien av regnskapskonto eksisterer ikke i kontoplanen
 AccountRemovedFromGroup=Kontoen er fjernet fra gruppen
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range= Oversikt over regnskapskonto
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Linjer som ennå ikke er bundet, bruk menyen <a href=
 
 ## Import
 ImportAccountingEntries=Regnskapsposter
-
+DateExport=Date export
 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=Utgiftsrapport-journal
 InventoryJournal=Inventar-journal
diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
index 158946d636d..b15776573cf 100644
--- a/htdocs/langs/nb_NO/admin.lang
+++ b/htdocs/langs/nb_NO/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=Dette området viser administrasjonsfunksjoner. Bruk menyen
 Purge=Utrenskning
 PurgeAreaDesc=Denne siden lar deg slette alle filer som er generert eller lagret av Dolibarr (midlertidige filer eller alle filer i katalogen <b> %s </b>). Bruk av denne funksjonen er normalt ikke nødvendig. Den leveres som en løsning for brukere hvis Dolibarr er vert for en leverandør som ikke tilbyr tillatelser for å slette filer generert av webserveren.
 PurgeDeleteLogFile=Slett loggfiler, inkludert <b>%s</b> definert for Syslog-modulen (ingen risiko for å miste data)
-PurgeDeleteTemporaryFiles=Slett alle temporære filer (du mister ingen data)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Slett temporære filer
 PurgeDeleteAllFilesInDocumentsDir=Slett alle filer i katalogen: <b> %s </b>. <br> Dette vil slette alle genererte dokumenter relatert til elementer (tredjeparter, fakturaer etc ...), filer lastet opp i ECM-modulen, database backup dumper og midlertidig filer.
 PurgeRunNow=Start utrenskning
@@ -804,6 +804,7 @@ Permission401=Vis rabatter
 Permission402=Opprett/endre rabatter
 Permission403=Valider rabatter
 Permission404=Slett rabatter
+Permission430=Use Debug Bar
 Permission511=Les lønnsutbetalinger
 Permission512=Opprett/endre betaling av lønn
 Permission514=Slett utbetalinger av lønn
@@ -818,6 +819,9 @@ Permission532=Opprett/endre tjenester
 Permission534=Slett tjenester
 Permission536=Administrer skjulte tjenester
 Permission538=Eksporter tjenester
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Vis donasjoner
 Permission702=Opprett/endre donasjoner
 Permission703=Slett donasjoner
@@ -837,6 +841,12 @@ Permission1101=Vis pakksedler
 Permission1102=Opprett/endre pakksedler
 Permission1104=Valider pakksedler
 Permission1109=Slett pakksedler
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Vis leverandører
 Permission1182=Les innkjøpsordre
 Permission1183=Opprett/modifiser innkjøpsordre
@@ -859,16 +869,6 @@ Permission1251=Kjør masseimport av eksterne data til database (datalast)
 Permission1321=Eksportere kundefakturaer, attributter og betalinger
 Permission1322=Gjenåpne en betalt regning
 Permission1421=Eksporter salgsordre og attributter
-Permission20001=Les permitteringsforespørsler (dine og dine underordnedes)
-Permission20002=Opprett/endre permisjonene dine (dine og dine underordnedes)
-Permission20003=Slett ferieforespørsler
-Permission20004=Les alle permisjonsforespørsler (selv om bruker ikke er underordnet)
-Permission20005=Opprett/endre permisjonsforespørsler for alle (selv om bruker ikke er underordnet)
-Permission20006=Administrer ferieforespørsler (oppsett og oppdatering av balanse)
-Permission23001=Les planlagt oppgave
-Permission23002=Opprett/endre planlagt oppgave
-Permission23003=Slett planlagt oppgave
-Permission23004=Utfør planlagt oppgave
 Permission2401=Vise handlinger (hendelser og oppgaver) lenket til egen brukerkonto
 Permission2402=Opprett/endre handlinger (hendelser og oppgaver) lenket til egen brukerkonto
 Permission2403=Slett hendelser (hendelser og oppgaver) relatert til egen brukerkonto
@@ -882,9 +882,41 @@ Permission2503=Send eller slett dokumenter
 Permission2515=Oppsett av  dokumentmapper
 Permission2801=Bruk FTP-klient i lesemodus (bla gjennom og laste ned)
 Permission2802=Bruk FTP-klient i skrivemodus (slette eller laste opp filer)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Les permitteringsforespørsler (dine og dine underordnedes)
+Permission20002=Opprett/endre permisjonene dine (dine og dine underordnedes)
+Permission20003=Slett ferieforespørsler
+Permission20004=Les alle permisjonsforespørsler (selv om bruker ikke er underordnet)
+Permission20005=Opprett/endre permisjonsforespørsler for alle (selv om bruker ikke er underordnet)
+Permission20006=Administrer ferieforespørsler (oppsett og oppdatering av balanse)
+Permission23001=Les planlagt oppgave
+Permission23002=Opprett/endre planlagt oppgave
+Permission23003=Slett planlagt oppgave
+Permission23004=Utfør planlagt oppgave
 Permission50101=Bruk utsalgssted
 Permission50201=Les transaksjoner
 Permission50202=Importer transaksjoner
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Skriv ut
 Permission55001=Les meningsmålinger
 Permission55002=Opprett/endre meningsmålinger
@@ -1078,7 +1110,7 @@ AreaForAdminOnly=Oppsettparametere kan bare angis av <b> administratorbrukere </
 SystemInfoDesc=Systeminformasjon er diverse teknisk informasjon som kun vises i skrivebeskyttet modus, og som kun er synlig for administratorer.
 SystemAreaForAdminOnly=Dette området er kun tilgjengelig for administratorbrukere. Dolibarr brukerrettigheter kan ikke endre denne begrensningen.
 CompanyFundationDesc=Rediger informasjonen til firmaet/enheten. Klikk på "%s" eller "%s" knappen nederst på siden.
-AccountantDesc=Rediger detaljene til din regnskapsfører/bokholder
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Regnskapsførerkode
 DisplayDesc=Parametre som påvirker utseende og oppførsel av Dolibarr kan endres her.
 AvailableModules=Tilgjengelige apper/moduler
@@ -1891,3 +1923,5 @@ IFTTTDesc=Denne modulen er utformet for å utløse hendelser på IFTTT og/eller
 UrlForIFTTT=URL-endepunkt for IFTTT
 YouWillFindItOnYourIFTTTAccount=Du finner den på din IFTTT-konto
 EndPointFor=Sluttpunkt for %s: %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/nb_NO/banks.lang b/htdocs/langs/nb_NO/banks.lang
index e0f39184532..5fadb7f2217 100644
--- a/htdocs/langs/nb_NO/banks.lang
+++ b/htdocs/langs/nb_NO/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=Ikke sammenslått
 CustomerInvoicePayment=Kundeinnbetaling
 SupplierInvoicePayment=Leverandørbetaling
 SubscriptionPayment=Abonnementsbetaling
-WithdrawalPayment=Uttaksbetaling
+WithdrawalPayment=Debiter betalingsordre
 SocialContributionPayment=Betaling av skatter og avgifter
 BankTransfer=Bankoverføring
 BankTransfers=Bankoverføringer
diff --git a/htdocs/langs/nb_NO/cashdesk.lang b/htdocs/langs/nb_NO/cashdesk.lang
index 89f1d3e7e89..9dcab394ae2 100644
--- a/htdocs/langs/nb_NO/cashdesk.lang
+++ b/htdocs/langs/nb_NO/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Antall terminaler
 TerminalSelect=Velg terminalen du vil bruke:
 POSTicket=POS Billett
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/nb_NO/mails.lang b/htdocs/langs/nb_NO/mails.lang
index e0ab0167659..a1e27fc6687 100644
--- a/htdocs/langs/nb_NO/mails.lang
+++ b/htdocs/langs/nb_NO/mails.lang
@@ -78,9 +78,9 @@ GroupEmails=Gruppe e-postmeldinger
 OneEmailPerRecipient=Én e-post per mottaker (som standard, en e-post per post valgt)
 WarningIfYouCheckOneRecipientPerEmail=Advarsel, hvis du merker av denne boksen, betyr det at bare en e-post vil bli sendt for flere forskjellige valgte poster, så hvis meldingen inneholder erstatningsvariabler som refererer til data i en post, blir det ikke mulig å erstatte dem.
 ResultOfMailSending=Resultat av massesending av e-post
-NbSelected=Antall valgt
-NbIgnored=Antall ignorert
-NbSent=Antall sendt
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s melding(er) sendt.
 ConfirmUnvalidateEmailing=Er du sikker på at du vil endre status på epost <b>%s</b> til kladd?
 MailingModuleDescContactsWithThirdpartyFilter=Kontakt med kundefilter
diff --git a/htdocs/langs/nb_NO/members.lang b/htdocs/langs/nb_NO/members.lang
index 616e02fc920..6faaf810b05 100644
--- a/htdocs/langs/nb_NO/members.lang
+++ b/htdocs/langs/nb_NO/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=Velg statistikk du ønsker å lese ...
 MenuMembersStats=Statistikk
 LastMemberDate=Siste medlemsdato
 LatestSubscriptionDate=Siste abonnementsdato
-Nature=Natur
+MemberNature=Nature of member
 Public=Informasjon er offentlig
 NewMemberbyWeb=Nytt medlem lagt til. Venter på godkjenning
 NewMemberForm=Skjema for nytt medlem 
diff --git a/htdocs/langs/nb_NO/products.lang b/htdocs/langs/nb_NO/products.lang
index 88c571ad537..7d96e527604 100644
--- a/htdocs/langs/nb_NO/products.lang
+++ b/htdocs/langs/nb_NO/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Leverandørpriser
 SuppliersPricesOfProductsOrServices=Leverandørpriser (av varer eller tjenester)
 CustomCode=Toll / vare / HS-kode
 CountryOrigin=Opprinnelsesland
-Nature=Varetype (materiale/finish)
+Nature=Nature of produt (material/finished)
 ShortLabel=Kort etikett
 Unit=Enhet
 p= stk
diff --git a/htdocs/langs/nb_NO/salaries.lang b/htdocs/langs/nb_NO/salaries.lang
index 807e5d33a9e..3d7048c764c 100644
--- a/htdocs/langs/nb_NO/salaries.lang
+++ b/htdocs/langs/nb_NO/salaries.lang
@@ -5,6 +5,7 @@ SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Regnskapskonto som standard for lønnsutbetal
 Salary=Lønn
 Salaries=Lønn
 NewSalaryPayment=Ny lønnsutbetaling
+AddSalaryPayment=Legg til lønnsutbetaling
 SalaryPayment=Lønnsutbetaling
 SalariesPayments=Lønnsutbetalinger
 ShowSalaryPayment=Vis lønnsutbetaling
@@ -16,3 +17,5 @@ TJMDescription=Dene verdien er foreløpig brukt til informasjon, og er ikke bruk
 LastSalaries=Siste %s lønnsutbetalinger
 AllSalaries=Alle lønnsutbetalinger
 SalariesStatistics=Lønnsstatistikk
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/nb_NO/stocks.lang b/htdocs/langs/nb_NO/stocks.lang
index 1abc68227ae..a7d75773b32 100644
--- a/htdocs/langs/nb_NO/stocks.lang
+++ b/htdocs/langs/nb_NO/stocks.lang
@@ -3,7 +3,7 @@ WarehouseCard=Lagerkort
 Warehouse=Lager
 Warehouses=Lagre
 ParentWarehouse=Foreldre-lager
-NewWarehouse=Nytt lager
+NewWarehouse=Nytt lager/lagerlokasjon
 WarehouseEdit=Endre lager
 MenuNewWarehouse=Nytt lager
 WarehouseSource=Kildelager
@@ -29,6 +29,8 @@ MovementId=Bevegelses-ID
 StockMovementForId=Bevegelse ID %d
 ListMouvementStockProject=Liste over varebevegelser tilknyttet prosjekt
 StocksArea=Område for lager
+AllWarehouses=Alle lager
+IncludeAlsoDraftOrders=Inkluder også ordrekladd
 Location=Lokasjon
 LocationSummary=Kort navn på lokasjon
 NumberOfDifferentProducts=Antall forskjellige varer
@@ -44,7 +46,6 @@ TransferStock=Overfør lagerbeholdning
 MassStockTransferShort=Masse-lageroverføring
 StockMovement=Lagerbevegelse
 StockMovements=Lagerbevegelser
-LabelMovement=Bevegelse-etikett
 NumberOfUnit=Antall enheter
 UnitPurchaseValue=Enhets innkjøpspris
 StockTooLow=For lav beholdning
@@ -54,21 +55,23 @@ PMPValue=Vektet gjennomsnittspris
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Lagerverdi
 UserWarehouseAutoCreate=Opprett et brukerlager automatisk når du oppretter en bruker
-AllowAddLimitStockByWarehouse=Tillat å legge til grense og ønsket lager pr. par (vare, lager) i stedet for pr. produkt
-IndependantSubProductStock=Varelager og sub-varelager er uavhengig av hverandre
+AllowAddLimitStockByWarehouse=Behandle også verdier for minimum og ønsket lager per paring (produkt-lager) i tillegg til verdier per produkt
+IndependantSubProductStock=Beholdning for vare og delvare er uavhengige
 QtyDispatched=Antall sendt
 QtyDispatchedShort=Mengde utsendt
 QtyToDispatchShort=Mengde for utsendelse
 OrderDispatch=Varekvitteringer
-RuleForStockManagementDecrease=Regel for automatisk lagerreduksjon (manuell reduksjon er alltid mulig, selv om automatisk reduksjon er aktivert)
-RuleForStockManagementIncrease=Regel for automatisk lagerøkning (manuell økning er alltid mulig, selv om automatisk økning er aktivert)
-DeStockOnBill=Reduser virkelig beholdning ut fra faktura/kreditnota
-DeStockOnValidateOrder=Reduser virkelig beholdning ut fra ordre
+RuleForStockManagementDecrease=Velg regel for automatisk lagerreduksjon (manuell reduksjon er alltid mulig, selv om en automatisk reduksjonsregel er aktivert)
+RuleForStockManagementIncrease=Velg regel for automatisk lagerøkning (manuell økning er alltid mulig, selv om en automatisk økningsregel er aktivert)
+DeStockOnBill=Reduser reelt lager ved validering av kundefaktura/kredittnota
+DeStockOnValidateOrder=Reduser reelt lager ved validering av salgsordre
 DeStockOnShipment=Minsk fysisk lager ved validering av forsendelse
-DeStockOnShipmentOnClosing=Reduser reell varebeholdning når levering klassifiseres som lukket
-ReStockOnBill=Øk virkelig beholdning ut fra faktura/kreditnota
-ReStockOnValidateOrder=Øk reellt lager ved godkjennelse av innkjøpsordre 
-ReStockOnDispatchOrder=Øk reell varebeholdning ved manuell forsendelse til lager, etter mottak av leverandørordre
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Øk reelt lager ved validering av leverandørfaktura/kredittnota
+ReStockOnValidateOrder=Øk reelt lager ved godkjenning av kjøpsordre 
+ReStockOnDispatchOrder=Øk reelt lager ved manuell forsendelse til lager, etter mottak av varer etter innkjøpsordre
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=Ordre har enda ikke, eller ikke lenger, status som tillater utsendelse av varer
 StockDiffPhysicTeoric=Forklaring for forskjell mellom fysisk og virtuelt lager
 NoPredefinedProductToDispatch=Ingen forhåndsdefinerte varer for dette objektet. Så ingen lagerutsending er nødvendig.
@@ -76,12 +79,12 @@ DispatchVerb=Send ut
 StockLimitShort=Varslingsgrense
 StockLimit=Varslingsgrense for lagerbeholdning
 StockLimitDesc=(tom) betyr ingen advarsel. <br> 0 kan brukes til advarsel så snart lageret er tomt.
-PhysicalStock=Fysisk beholdning
+PhysicalStock=Fysisk lagerbeholdning
 RealStock=Virkelig beholdning
-RealStockDesc=Fysisk eller reelt lager er beholdningen du for øyeblikket har i dine interne varehus.
-RealStockWillAutomaticallyWhen=Den reelle varebeholdningen endres automatisk i henhold til disse reglene (se lagermoduloppsett for å endre dette):
+RealStockDesc=Fysisk/reelt lager er beholdningen du for øyeblikket har i dine interne lagre.
+RealStockWillAutomaticallyWhen=Virkelig beholdning vil bli endret i henhold til denne regelen (som definert i Lager-modulen):
 VirtualStock=Virtuell beholdning
-VirtualStockDesc=Virtuell aksje er beholdningen du vil få når alle åpne ventende handlinger som påvirker lager, lukkes (leverandørordre mottatt, kundeordre sendt, ...)
+VirtualStockDesc=Virtuelt lager er beregnet beholdning tilgjengelig når alle åpne/ventende handlinger (som påvirker beholdning) er lukket (innkjøpsordre mottatt, salgsordre sendt osv.)
 IdWarehouse=Lager-ID
 DescWareHouse=Beskrivelse av lager
 LieuWareHouse=Lagerlokasjon
@@ -101,7 +104,7 @@ ThisWarehouseIsPersonalStock=Dette lageret representerer det personlige lageret
 SelectWarehouseForStockDecrease=Velg lager til bruk for lagerreduksjon
 SelectWarehouseForStockIncrease=Velg lager til bruk for lagerøkning
 NoStockAction=Ingen lagerhendelser
-DesiredStock=Ønsket optimal beholdning
+DesiredStock=Ønsket beholdning
 DesiredStockDesc=Denne lagerbeholdningen vil være den verdien som brukes til å fylle lager med påfyllingsfunksjonen.
 StockToBuy=For bestilling
 Replenishment=Påfylling av varer
@@ -114,13 +117,13 @@ CurentSelectionMode=Gjeldende valgmodus
 CurentlyUsingVirtualStock=Teoretisk varebeholdning
 CurentlyUsingPhysicalStock=Fysisk varebeholdning
 RuleForStockReplenishment=Regler for lågerpåfylling
-SelectProductWithNotNullQty=Velg minst en vare, med beholdning > 0, og en leverandør
+SelectProductWithNotNullQty=Velg minst en vare med et antall, ikke null, og en leverandør
 AlertOnly= Kun varsler
 WarehouseForStockDecrease=Lageret <b>%s</b> vil bli brukt til reduksjon av varebeholdning
 WarehouseForStockIncrease=Lageret <b>%s</b> vil bli brukt til økning av varebeholdning
 ForThisWarehouse=For dette lageret
-ReplenishmentStatusDesc=Dette er en liste over alle varer med beholdning lavere enn ønsket (eller lavere enn varslingsverdi hvis boksen "bare varsling" er krysset av). Ved hjelp av avkrysningsboksen, kan du opprette leverandørordre for å fylle differansen.
-ReplenishmentOrdersDesc=Dette er en liste over alle åpne leverandørordre inkludert forhåndsdefinerte varer. Bare åpne ordrer med forhåndsdefinerte produkter, slik at ordre som kan påvirke beholdning, er synlige her.
+ReplenishmentStatusDesc=Dette er en liste over alle varer med beholdning lavere enn ønsket (eller lavere enn varslingsverdi hvis boksen "bare varsling" er krysset av). Ved hjelp av avkrysningsboksen, kan du opprette innkjøpsordre for å fylle differansen.
+ReplenishmentOrdersDesc=Dette er en liste over alle åpne innkjøpsordre, inkludert forhåndsdefinerte varer. Bare åpne ordrer med forhåndsdefinerte produkter, slik at ordre som kan påvirke beholdning, er synlige her.
 Replenishments=Lagerpåfyllinger
 NbOfProductBeforePeriod=Beholdning av varen %s før valgte periode (< %s)
 NbOfProductAfterPeriod=Beholdning av varen %s før etter periode (< %s)
@@ -134,6 +137,7 @@ StockMustBeEnoughForInvoice=Lagernivå må være høyt nok til å legge varen/tj
 StockMustBeEnoughForOrder=Lagernivå må være høyt nok til å legge varen/tjenesten til ordre (sjekk er gjort mot dagens virkelige lagernivå når du legger til en linje i ordren i forhold til hva som er regelen for automatisk lagerendring)
 StockMustBeEnoughForShipment= Lagernivå må være høyt nok til å legge varen/tjenesten til levering (sjekk er gjort mot dagens virkelige lagernivå når du legger til en linje i leveringen i forhold til hva som er regelen for automatisk lagerendring)
 MovementLabel=Bevegelsesetikett
+TypeMovement=Type bevegelse
 DateMovement=Dato for bevegelse
 InventoryCode=Bevegelse eller varelager
 IsInPackage=Innhold i pakken
@@ -143,11 +147,11 @@ ShowWarehouse=Vis lager
 MovementCorrectStock=Lagerkorreksjon for var %s
 MovementTransferStock=Lageroverførsel av vare %s til annet lager
 InventoryCodeShort=Lag./bev.-kode
-NoPendingReceptionOnSupplierOrder=Ingen ventende mottak grunnet åpen leverandørordre
+NoPendingReceptionOnSupplierOrder=Ingen ventende mottak på grunn av åpen innkjøpsordre
 ThisSerialAlreadyExistWithDifferentDate=Dette lot/serienummeret (<strong>%s</strong>) finnes allerede, men med ulik "best før" og "siste forbruksdag" (funnet <strong>%s</strong> , men tastet inn <strong>%s</strong>).
 OpenAll=Åpen for alle handlinger
 OpenInternal=Kun åpen for interne hendelser
-UseDispatchStatus=Bruk en utsendelses-status (godkjenn/avslå) for varelinjer på leverandør ordremottak
+UseDispatchStatus=Bruk en utsendelses-status (godkjenn/avslå) for varelinjer på innkjøpsordre ved varemottak
 OptionMULTIPRICESIsOn=Opsjonen "Flere priser pr. segment" er slått på. Det betyr at en vare har flere utsalgspriser og salgsverdi ikke kan kalkuleres
 ProductStockWarehouseCreated=Varsel for nedre og ønsket varebeholdning opprettet
 ProductStockWarehouseUpdated=Varsel for nedre og ønsket varebeholdning oppdatert
@@ -171,14 +175,14 @@ inventoryValidate=Validert
 inventoryDraft=Løpende
 inventorySelectWarehouse=Lagervalg
 inventoryConfirmCreate=Opprett
-inventoryOfWarehouse=Oversiktfor lager: %s
-inventoryErrorQtyAdd=Feil: en mengde er mindre enn null
+inventoryOfWarehouse=Lagertelling for lager: %s
+inventoryErrorQtyAdd=Feil: En mengde er mindre enn null
 inventoryMvtStock=Etter varetelling
 inventoryWarningProductAlreadyExists=Denne varen er allerede på listen
 SelectCategory=Kategorifilter
 SelectFournisseur=Leverandørfilter
 inventoryOnDate=Varetelling
-INVENTORY_DISABLE_VIRTUAL=Tillat å ikke redusere subvare fra et sett på lager
+INVENTORY_DISABLE_VIRTUAL=Virtuell vare (sett): Ikke reduser lager av en sub-vare
 INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Bruk innkjøpspris hvis ingen siste innkjøpspris finnes
 INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Lagerbevegelse har dato for lagerbeholdning
 inventoryChangePMPPermission=Tillat å endre PMP-verdi for en vare
@@ -201,6 +205,10 @@ ExitEditMode=Avslutt endring
 inventoryDeleteLine=Slett linje
 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"
+StockSupportServices=Lagerstyring støtter Varer
+StockSupportServicesDesc=Som standard kan du bare lagre varer av typen "vare". Du kan også lagre et produkt av typen "tjeneste" hvis begge modultjenestene og dette alternativet er aktivert.
 ReceiveProducts=Motta varer
+StockIncreaseAfterCorrectTransfer=Øk ved korreksjon/overføring
+StockDecreaseAfterCorrectTransfer=Reduser ved korreksjon/overføring
+StockIncrease=Lagerøkning
+StockDecrease=Lagerreduksjon
diff --git a/htdocs/langs/nb_NO/website.lang b/htdocs/langs/nb_NO/website.lang
index a75055498dc..61e3013c584 100644
--- a/htdocs/langs/nb_NO/website.lang
+++ b/htdocs/langs/nb_NO/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=Du har ikke tillatelse til å legge til eller redi
 ReplaceWebsiteContent=Erstatt nettsideinnhold
 DeleteAlsoJs=Slett også alle javascript-filer som er spesifikke for denne nettsiden?
 DeleteAlsoMedias=Slett også alle mediefiler som er spesifikke for denne nettsiden?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/nb_NO/withdrawals.lang b/htdocs/langs/nb_NO/withdrawals.lang
index 7d2a494494c..ce42e5e20a0 100644
--- a/htdocs/langs/nb_NO/withdrawals.lang
+++ b/htdocs/langs/nb_NO/withdrawals.lang
@@ -12,21 +12,21 @@ WithdrawalsLines=Direktedebiter ordrelinjer
 RequestStandingOrderToTreat=Forespør prossesering av direktedebetsordre
 RequestStandingOrderTreated=Forespør prossesererte direktedebetsordre
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Ennå ikke mulig. Tilbaketrekkings-status må være satt til 'kreditert' før fjerning fra spesifikke linjer.
-NbOfInvoiceToWithdraw=Antall kvalifiserte fakturaer med ventende debitering
+NbOfInvoiceToWithdraw=Antall kvalifiserte fakturaer med ventende avbestillingsordre
 NbOfInvoiceToWithdrawWithInfo=Antall kundefakturaer med direktedebetsordre som har definert bankkontoinformasjon
 InvoiceWaitingWithdraw=Faktura som venter på direktedebet
 AmountToWithdraw=Beløp å tilbakekalle
 WithdrawsRefused=Direktedebet avvist
 NoInvoiceToWithdraw=Ingen kundefaktura med åpne 'Debetforespørsler' venter. Gå til fanen '%s' på fakturakortet for å gjøre en forespørsel.
-ResponsibleUser=Ansvarlig bruker
+ResponsibleUser=Brukeransvarlig
 WithdrawalsSetup=Oppsett av direktedebetsbetalinger
 WithdrawStatistics=Statistikk over direktedebetsbetalinger
 WithdrawRejectStatistics=Statistikk over avviste direktedebetsbetalinger
 LastWithdrawalReceipt=Siste %s direktedebetskvitteringer
 MakeWithdrawRequest=Foreta en direktedebet betalingsforespørsel
 WithdrawRequestsDone=%s direktedebet-betalingforespørsler registrert
-ThirdPartyBankCode=Tredjepartens bankkonto
-NoInvoiceCouldBeWithdrawed=Ingen faktura tilbakekalt. Kontroller at fakturaer er mot selskaper med gyldig standard BAN, og at BAN har en RUM-modus <strong> %s </strong>.
+ThirdPartyBankCode=Tredjeparts bankkode
+NoInvoiceCouldBeWithdrawed=Ingen faktura debitert. Kontroller at fakturaer mot selskaper med gyldig standard BAN, og at BAN har en RUM-modus <strong> %s </strong>.
 ClassCredited=Klassifiser som kreditert
 ClassCreditedConfirm=Er du sikker på at du vil klassifisere tilbakekallingen som kreditert din bankkonto?
 TransData=Dato for overføring
@@ -50,7 +50,7 @@ StatusMotif0=Uspesifisert
 StatusMotif1=Ikke nok midler
 StatusMotif2=Forespørselen er bestridt
 StatusMotif3=Ikke en direktedebetsordre
-StatusMotif4=Kundeordre
+StatusMotif4=Salgsordre
 StatusMotif5=RIB ubrukelig
 StatusMotif6=Konto uten balanse
 StatusMotif7=Rettslig avgjørelse
@@ -66,11 +66,11 @@ NotifyCredit=Kreditt tilbakekalling
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=For bankkontoer som bruker RIB
 WithBankUsingBANBIC=For bankkontoer som bruker IBAN/BIC/SWIFT
-BankToReceiveWithdraw=Bankkonto for mottak av direktedebet
+BankToReceiveWithdraw=Mottakende bankkonto
 CreditDate=Kreditt på
 WithdrawalFileNotCapable=Kan ikke ikke generere kvitteringsfil for tilbaketrekking for landet ditt %s (Landet er ikke støttet)
-ShowWithdraw=Vis tilbakekalling
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Hvis faktura har minst en tilbakekallingsbetaling ennå ikke behandlet, vil den ikke bli satt som betalt for å tillate videre håndtering av tilbakekallinger.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=Under denne fanen kan du be om en direktedebet-betalingsordre .Når dette er gjort, kan du gå inn i menyen Bank-> direktedebet-ordre for å håndtere betalingsoppdraget .Når betalingsoppdraget er lukket, vil betaling på fakturaen automatisk bli registrert, og fakturaen lukkes hvis restbeløpet er null.
 WithdrawalFile=Tilbaketrekkingsfil
 SetToStatusSent=Sett status til "Fil Sendt"
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=Dette vil også registrere innbetalinger til fak
 StatisticsByLineStatus=Statistikk etter linjestatus
 RUM=UMR
 RUMLong=Unik Mandat Referanse
-RUMWillBeGenerated=Hvis tomt, vil UMR-nummer bli generert når bankkontoinformasjon er lagret
+RUMWillBeGenerated=Hvis tomt, vil UMR (Unique Mandate Reference) bli generert når bankkontoinformasjon er lagret
 WithdrawMode=Direktedebetsmodus (FRST eller RECUR)
 WithdrawRequestAmount=Antall direktedebet-betalingforespørsler
 WithdrawRequestErrorNilAmount=Kan ikke opprette en tom direktedebet-betalingforespørsel
@@ -93,7 +93,7 @@ SEPAFormYourName=Ditt navn
 SEPAFormYourBAN=Ditt bankontonavn (IBAN)
 SEPAFormYourBIC=Din banks identifikasjonskode (BIC)
 SEPAFrstOrRecur=Betalingstype
-ModeRECUR=Gjentagende betaling
+ModeRECUR=Gjentakende betaling
 ModeFRST=Engangsbetaling
 PleaseCheckOne=Vennligs kryss av kun en
 DirectDebitOrderCreated=Direktedebet-ordre %s opprettet
@@ -102,6 +102,10 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Utførelsesdato
 CreateForSepa=Lag direkte debitfil
+ICS=Kreditoridentifikator CI
+END_TO_END="EndToEndId" SEPA XML-tag - Unik ID tildelt per transaksjon
+USTRD="Ustrukturert" SEPA XML-tag
+ADDDAYS=Legg til dager til utførelsesdato
 
 ### Notifications
 InfoCreditSubject=Betaling av direktedebets-betalingsordre %s utført av banken
diff --git a/htdocs/langs/nl_NL/accountancy.lang b/htdocs/langs/nl_NL/accountancy.lang
index bf4dcc55b11..a9c274e87fb 100644
--- a/htdocs/langs/nl_NL/accountancy.lang
+++ b/htdocs/langs/nl_NL/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Raadpleeg hier de lijst met externe klanten en leveranciers
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Onbekende relatie-rekening. Gebruikt wordt 1%s
 UnknownAccountForThirdpartyBlocking=Blokkeringsfout. Onbekende relatierekening. 
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Tegenrekening relatie niet gedefinieerd of relatie onbekend. Blokkeringsfout.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Tegenrekening relatie niet gedefinieerd of relatie onbekend. Blokkeringsfout.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Betaling niet gekoppeld aan een product / dienst
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Exporteren naar Cogilog
 Modelcsv_agiris=Exporteren naar Agiris
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Configureerbare CSV export
-Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Rekeningschema Id
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Zonder geldig toegewezen grootboekrekening
 WithValidAccount=Met geldig toegewezen grootboekrekening
 ValueNotIntoChartOfAccount=Deze grootboekrekening is niet aanwezig in het rekeningschema
 AccountRemovedFromGroup=Rekening uit groep verwijderd.
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Grootboeknummer van/tot
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Regels die nog niet zijn gebonden, gebruik het menu <
 
 ## Import
 ImportAccountingEntries=Boekingen
-
+DateExport=Date export
 WarningReportNotReliable=Waarschuwing, dit rapport is niet gebaseerd op het grootboek, dus bevat het niet de transactie die handmatig in het grootboek is gewijzigd. Als uw journalisatie up-to-date is, is de weergave van de boekhouding nauwkeuriger.
 ExpenseReportJournal=Kostenoverzicht
 InventoryJournal=Inventarisatie
diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
index 352ac57f724..deaa6104f3c 100644
--- a/htdocs/langs/nl_NL/admin.lang
+++ b/htdocs/langs/nl_NL/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Leegmaken
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Verwijder logbestanden <b>%s</b> aangemaakt door de Syslog module (Geen risico op verlies van gegevens)
-PurgeDeleteTemporaryFiles=Verwijder alle tijdelijke bestanden (Geen risico op verlies van gegevens)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Verwijder tijdelijke bestanden
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Nu opschonen
@@ -804,6 +804,7 @@ Permission401=Bekijk kortingen
 Permission402=Creëren / wijzigen kortingen
 Permission403=Kortingen valideren
 Permission404=Kortingen verwijderen
+Permission430=Use Debug Bar
 Permission511=Read payments of salaries
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
@@ -818,6 +819,9 @@ Permission532=Creëren / wijzigen van diensten
 Permission534=Diensten verwijderen
 Permission536=Inzien / beheren van verborgen diensten
 Permission538=Diensten exporteren
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Bekijk donaties
 Permission702=Creëren / wijzigen donaties
 Permission703=Verwijderen donaties
@@ -837,6 +841,12 @@ Permission1101=Bekijk levering opdrachten
 Permission1102=Creëren / wijzigen opdrachtenlevering
 Permission1104=Valideer opdrachtenlevering
 Permission1109=Verwijderen opdrachtenlevering
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Bekijk leveranciers
 Permission1182=Read purchase orders
 Permission1183=Create/modify purchase orders
@@ -859,16 +869,6 @@ Permission1251=Voer massale invoer van externe gegevens in de database uit (data
 Permission1321=Exporteer afnemersfacturen, attributen en betalingen
 Permission1322=Open een betaalde factuur
 Permission1421=Export sales orders and attributes
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those of your 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
-Permission23002=Maak/wijzig geplande taak
-Permission23003=Verwijder geplande taak
-Permission23004=Voer geplande taak uit
 Permission2401=Bekijk acties (gebeurtenissen of taken) in gerelateerd aan eigen account
 Permission2402=Creëren / wijzigen / verwijderen acties (gebeurtenissen of taken) gerelateerd aan eigen account
 Permission2403=Bekijk acties (gebeurtenissen of taken) van anderen
@@ -882,9 +882,41 @@ Permission2503=In te dienen of te verwijderen documenten
 Permission2515=Instellen documentabonneelijsten
 Permission2801=Gebruik FTP-client in lees modus (enkel verkennen en downloaden)
 Permission2802=Gebruik FTP-client in schrijf modus (verwijderen of bestanden uploaden)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those of your 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
+Permission23002=Maak/wijzig geplande taak
+Permission23003=Verwijder geplande taak
+Permission23004=Voer geplande taak uit
 Permission50101=Use Point of Sale
 Permission50201=Lees transacties
 Permission50202=Import transacties
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Afdrukken
 Permission55001=Lees polls
 Permission55002=Maak / wijzig polls
@@ -1078,7 +1110,7 @@ AreaForAdminOnly=Setup functies kunnen alleen door <b>Administrator gebruikers</
 SystemInfoDesc=Systeeminformatie is technische informatie welke u in alleen-lezen modus krijgt en alleen door beheerders is in te zien.
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
-AccountantDesc=Edit the details of your accountant/bookkeeper
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Beschikbare app/modules
@@ -1891,3 +1923,5 @@ IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute s
 UrlForIFTTT=URL endpoint for IFTTT
 YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/nl_NL/banks.lang b/htdocs/langs/nl_NL/banks.lang
index d743daff053..5797ca94e03 100644
--- a/htdocs/langs/nl_NL/banks.lang
+++ b/htdocs/langs/nl_NL/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=Niet afgestemd
 CustomerInvoicePayment=Afnemersbetaling
 SupplierInvoicePayment=Betaling van de leverancier
 SubscriptionPayment=Betaling van abonnement
-WithdrawalPayment=Intrekking betaling
+WithdrawalPayment=Debet betalingsopdracht
 SocialContributionPayment=Sociale/fiscale belastingbetaling
 BankTransfer=Bankoverboeking
 BankTransfers=Bankoverboeking
diff --git a/htdocs/langs/nl_NL/cashdesk.lang b/htdocs/langs/nl_NL/cashdesk.lang
index db419112109..53c684b6d19 100644
--- a/htdocs/langs/nl_NL/cashdesk.lang
+++ b/htdocs/langs/nl_NL/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/nl_NL/mails.lang b/htdocs/langs/nl_NL/mails.lang
index a3130e5312e..43f976f41c1 100644
--- a/htdocs/langs/nl_NL/mails.lang
+++ b/htdocs/langs/nl_NL/mails.lang
@@ -19,6 +19,8 @@ MailTopic=Email topic
 MailText=Bericht
 MailFile=Bijgevoegde bestanden
 MailMessage=E-mailinhoud
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
 ShowEMailing=Toon EMailing
 ListOfEMailings=EMailingenlijst
 NewMailing=Nieuwe EMailing
@@ -76,9 +78,9 @@ GroupEmails=Groepeer e-mails
 OneEmailPerRecipient=Één e-mail per ontvanger (standaard: één e-mail per geselecteerde record)
 WarningIfYouCheckOneRecipientPerEmail=Pas op, indien u deze optie selecteerd, zal er maar één e-mail verstuurd worden voor verschillende geselecteerde records, dus, indien u bericht variablelen bevat welke betrekking hebben op data, is het niet mogelijk deze te vervangen.
 ResultOfMailSending=Result of mass Email sending
-NbSelected=No. selected
-NbIgnored=No. ignored
-NbSent=No. sent
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s bericht (en) verzonden.
 ConfirmUnvalidateEmailing=Weet u zeker dat u de status van deze e-mail <b>%s</b> wilt wijzigen naar klad?
 MailingModuleDescContactsWithThirdpartyFilter=Contact met filters
diff --git a/htdocs/langs/nl_NL/members.lang b/htdocs/langs/nl_NL/members.lang
index ae758029d4f..8397f7fe7c2 100644
--- a/htdocs/langs/nl_NL/members.lang
+++ b/htdocs/langs/nl_NL/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=Kies de statistieken die u wilt lezen ...
 MenuMembersStats=Statistiek
 LastMemberDate=Laatste liddatum
 LatestSubscriptionDate=Laatste abonnementsdatum
-Nature=Natuur
+MemberNature=Nature of member
 Public=Informatie zijn openbaar (no = prive)
 NewMemberbyWeb=Nieuw lid toegevoegd. In afwachting van goedkeuring
 NewMemberForm=Nieuw lid formulier
diff --git a/htdocs/langs/nl_NL/products.lang b/htdocs/langs/nl_NL/products.lang
index 3e893a46ddf..a743fb9211c 100644
--- a/htdocs/langs/nl_NL/products.lang
+++ b/htdocs/langs/nl_NL/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Prijzen van leveranciers
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Douane / Commodity / HS-code
 CountryOrigin=Land van herkomst
-Nature=Product Type (material/finished)
+Nature=Nature of produt (material/finished)
 ShortLabel=Kort label
 Unit=Eenheid
 p=u.
diff --git a/htdocs/langs/nl_NL/salaries.lang b/htdocs/langs/nl_NL/salaries.lang
index c543aeb94a9..67b5f99c909 100644
--- a/htdocs/langs/nl_NL/salaries.lang
+++ b/htdocs/langs/nl_NL/salaries.lang
@@ -12,8 +12,10 @@ ShowSalaryPayment=Toon salarisbetaling
 THM=Gemiddeld uurtarief
 TJM=Gemiddeld dagtarief
 CurrentSalary=Huidig salaris
-THMDescription=Deze waarde kan worden gebruikt om de kosten te berekenen van de benodigde project-tijd. Werkt alleen indien de module Project is geactiveerd
-TJMDescription=Deze waarde is momenteel alleen voor informatie en wordt niet gebruikt in een berekening
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
 LastSalaries=Laatste %s salaris betalingen
 AllSalaries=Alle salarisbetalingen
 SalariesStatistics=Salarisstatistieken
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/nl_NL/stocks.lang b/htdocs/langs/nl_NL/stocks.lang
index dadefa29a7e..a455e2e986c 100644
--- a/htdocs/langs/nl_NL/stocks.lang
+++ b/htdocs/langs/nl_NL/stocks.lang
@@ -3,7 +3,7 @@ WarehouseCard=Magazijndetailkaart
 Warehouse=Magazijn
 Warehouses=Magazijnen
 ParentWarehouse=Hoofdmagazijn
-NewWarehouse=Nieuw magazijn / Vooraadoverzicht
+NewWarehouse=New warehouse / Stock Location
 WarehouseEdit=Magazijn wijzigen
 MenuNewWarehouse=Nieuw magazijn
 WarehouseSource=Bronmagazijn
@@ -29,6 +29,8 @@ MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Magazijnen
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
 Location=Locatie
 LocationSummary=Korte naam locatie
 NumberOfDifferentProducts=Aantal verschillende producten
@@ -40,35 +42,36 @@ Unit=Eenheid
 StockCorrection=Voorraad vorrectie
 CorrectStock=Voorraadcorrectie
 StockTransfer=Voorraadbeweging
-TransferStock=Transfer stock
+TransferStock=Voorraad verplaatsen
 MassStockTransferShort=Bulk verplaatsen van voorraad
 StockMovement=Voorraad verplaatsen
 StockMovements=Voorraad-verplaatsingen
-LabelMovement=Bewegingslabel
 NumberOfUnit=Aantal eenheden
 UnitPurchaseValue=Eenheidsprijs
 StockTooLow=Voorraad te laag
-StockLowerThanLimit=Stock lower than alert limit (%s)
+StockLowerThanLimit=Voorraad lager dan alarmlimiet (%s)
 EnhancedValue=Waardering
 PMPValue=Waardering (PMP)
 PMPValueShort=Waarde
 EnhancedValueOfWarehouses=Voorraadwaardering
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Allow to add limit and desired stock per couple (product, warehouse) instead of per product
-IndependantSubProductStock=Product voorraad en subproduct voorraad zijn onafhankelijk
+AllowAddLimitStockByWarehouse=Manage also values for minimum and desired stock per pairing (product-warehouse) in addition to values per product
+IndependantSubProductStock=Product stock and subproduct stock are independent
 QtyDispatched=Hoeveelheid verzonden
 QtyDispatchedShort=Aantal verzonden
 QtyToDispatchShort=Aantal te verzenden
-OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
-RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
-DeStockOnBill=Verlaag de echte voorraad na het valideren van afnemersfacturen / creditnota's
-DeStockOnValidateOrder=Verlaag de echte voorraad na het valideren van opdrachten
+OrderDispatch=Bestellingen
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
 DeStockOnShipment=Decrease real stocks on shipping validation
-DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification closed
-ReStockOnBill=Verhoog de echte voorraad na het valideren van leveranciersfacturen / creditnota's
-ReStockOnValidateOrder=Increase real stocks on purchase orders approbation
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=Opdracht heeft nog geen, of niet langer, een status die het verzenden van producten naar een magazijn toestaat.
 StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
 NoPredefinedProductToDispatch=Geen vooraf ingestelde producten voor dit object. Daarom is verzending in voorraad niet vereist.
@@ -76,12 +79,12 @@ DispatchVerb=Verzending
 StockLimitShort=Alarm limiet
 StockLimit=Alarm voorraadlimiet
 StockLimitDesc=Geen melding bij geen voorraad. <br>0 kan worden gebruikt om te waarschuwen zodra er geen voorraad meer is.
-PhysicalStock=Fysieke voorraad
+PhysicalStock=Physical Stock
 RealStock=Werkelijke voorraad
-RealStockDesc=Physical or real stock is the stock you currently have into your internal warehouses/emplacements.
-RealStockWillAutomaticallyWhen=The real stock will automatically change according to this rules (see stock module setup to change this):
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtuele voorraad
-VirtualStockDesc=Virtual stock is the stock you will get once all open pending actions that affect stocks will be closed (supplier order received, customer order shipped, ...)
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
 IdWarehouse=Magazijn-ID
 DescWareHouse=Beschrijving magazijn
 LieuWareHouse=Localisatie magazijn
@@ -101,39 +104,40 @@ ThisWarehouseIsPersonalStock=Dit magazijn vertegenwoordigt een persoonlijke voor
 SelectWarehouseForStockDecrease=Kies magazijn te gebruiken voor voorraad daling
 SelectWarehouseForStockIncrease=Kies magazijn te gebruiken voor verhoging van voorraad
 NoStockAction=Geen stockbeweging
-DesiredStock=Desired optimal stock
-DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
+DesiredStock=Desired Stock
+DesiredStockDesc=Dit voorraadbedrag is de waarde die wordt gebruikt om de voorraad te vullen met de aanvulfunctie.
 StockToBuy=Te bestellen
 Replenishment=Bevoorrading
 ReplenishmentOrders=Bevoorradingsorder
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
+VirtualDiffersFromPhysical=Volgens de voorraad bij- en afinstellingen kunnen fysieke voorraad en virtuele aandelen (fysieke + huidige bestellingen) verschillen
 UseVirtualStockByDefault=Gebruik virtuele voorraad standaard, in plaats van de fysieke voorraad, voor de aanvul functie
 UseVirtualStock=Gebruik virtuele voorraad
 UsePhysicalStock=Gebruik fysieke voorraad
-CurentSelectionMode=Current selection mode
+CurentSelectionMode=Huidige selectiemodus
 CurentlyUsingVirtualStock=Virtual voorraad
 CurentlyUsingPhysicalStock=Fysieke voorraad
 RuleForStockReplenishment=Regels voor bevoorrading
-SelectProductWithNotNullQty=Kies minstens één aanwezig product dat een leverancier heeft
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
 AlertOnly= Enkel waarschuwingen
 WarehouseForStockDecrease=De voorraad van magazijn <b>%s</b> zal verminderd worden
 WarehouseForStockIncrease=De voorraad van magazijn <b>%s</b> zal verhoogd worden
 ForThisWarehouse=Voor dit magazijn
-ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is a list of all open supplier orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
 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 gemaakt, klik op "%s".
-RecordMovement=Record transfer
+RecordMovement=Vastleggen verplaatsing
 ReceivingForSameOrder=Ontvangsten voor deze bestelling
 StockMovementRecorded=Geregistreerde voorraadbewegingen
 RuleForStockAvailability=Regels op voorraad vereisten
-StockMustBeEnoughForInvoice=Er moet voldoende voorraad zijn om product/dienst aan factuur toe te voegen (systeem checkt op huidige voorraad aantal als regel wordt toegevoegd aan factuur, ongeacht de regel voor automatische voorraad aanpassing)
-StockMustBeEnoughForOrder=Er moet voldoende voorraad zijn om product/dienst aan order toe te voegen (systeem checkt op huidige voorraad aantal als regel wordt toegevoegd aan order, ongeacht de regel voor automatische voorraad aanpassing)
-StockMustBeEnoughForShipment= Er moet voldoende voorraad zijn om product/dienst aan verzending toe te voegen (systeem checkt op huidige voorraad aantal als regel wordt toegevoegd aan verzending, ongeacht de regel voor automatische voorraad aanpassing)
+StockMustBeEnoughForInvoice=Het voorraadniveau moet voldoende zijn om het product / de service aan de factuur toe te voegen (controle wordt uitgevoerd op de actuele werkelijke voorraad bij het toevoegen van een regel aan de factuur, ongeacht de regel voor automatische voorraadwijziging)
+StockMustBeEnoughForOrder=Het voorraadniveau moet voldoende zijn om product / dienst aan de bestelling toe te voegen (controle wordt uitgevoerd op de huidige reële voorraad wanneer een regel wordt toegevoegd, ongeacht de regel voor automatische voorraadwijziging)
+StockMustBeEnoughForShipment= Voorraadniveau moet voldoende zijn om product / dienst aan verzending toe te voegen (controle wordt uitgevoerd op huidige reële voorraad bij het toevoegen van een regel aan verzending, ongeacht de regel voor automatische voorraadwijziging)
 MovementLabel=Label van de verplaatsing
+TypeMovement=Type of movement
 DateMovement=Date of movement
 InventoryCode=Verplaatsing of inventaris code
 IsInPackage=Vervat in pakket
@@ -143,64 +147,68 @@ ShowWarehouse=Toon magazijn
 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
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
 ThisSerialAlreadyExistWithDifferentDate=Deze lot/serienummer (<strong>%s</strong>) bestaat al, maar met verschillende verval of verkoopen voor datum <strong>(gevonden %s</strong> maar u gaf in<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
+OpenAll=Alle bewerkingen toegestaan
+OpenInternal=Alleen interne bewerkingen toegestaan
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
 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
-NewInventory=New inventory
-inventorySetup = Inventory Setup
-inventoryCreatePermission=Create new inventory
-inventoryReadPermission=View inventories
-inventoryWritePermission=Update inventories
-inventoryValidatePermission=Validate inventory
-inventoryTitle=Voorraad
-inventoryListTitle=Inventories
-inventoryListEmpty=No inventory in progress
-inventoryCreateDelete=Create/Delete inventory
+ProductStockWarehouseCreated=Voorraad alarm en gewenste optimale voorraad correct gecreëerd
+ProductStockWarehouseUpdated=Voorraad alarm en gewenste optimale voorraad correct bijgewerkt
+ProductStockWarehouseDeleted=Voorraad alarm en gewenste optimale voorraad correct verwijderd
+AddNewProductStockWarehouse=Stel nieuwe limiet in voor waarschuwing en gewenste optimale voorraad
+AddStockLocationLine=Verlaag de hoeveelheid en klik vervolgens op een ​​ander magazijn om dit product toe te voegen
+InventoryDate=Datum inventarisatie
+NewInventory=Nieuwe inventarisatie
+inventorySetup = Setup inventarisatie
+inventoryCreatePermission=Aanmaken nieuwe inventarisatie
+inventoryReadPermission=Bekijk inventarisaties
+inventoryWritePermission=Bijwerken inventarisaties
+inventoryValidatePermission=Inventarisatie goedkeuren
+inventoryTitle=Inventarisering
+inventoryListTitle=Inventariseringen
+inventoryListEmpty=Geen inventarisering in opbouw
+inventoryCreateDelete=Aanmaken/verwijderen inventarisering
 inventoryCreate=Nieuw
 inventoryEdit=Bewerken
 inventoryValidate=Gevalideerd
 inventoryDraft=Lopende
 inventorySelectWarehouse=Magazijn
 inventoryConfirmCreate=Create
-inventoryOfWarehouse=Inventory for warehouse : %s
-inventoryErrorQtyAdd=Error : one quantity is leaser than zero
-inventoryMvtStock=By inventory
-inventoryWarningProductAlreadyExists=This product is already into list
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
+inventoryMvtStock=Inventarisatie
+inventoryWarningProductAlreadyExists=Dit product is reeds aanwezig in de lijst
 SelectCategory=Categorie filter
-SelectFournisseur=Filter leverancier
+SelectFournisseur=Vendor filter
 inventoryOnDate=Voorraad
-INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
 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
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement has date of inventory
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
-LastPA=Last BP
+TheoricalQty=Theoretisch aantal
+TheoricalValue=Theoretisch aantal
+LastPA=Laatste BP
 CurrentPA=Curent BP
-RealQty=Real Qty
+RealQty=Echte aantal
 RealValue=Werkelijke waarde
-RegulatedQty=Regulated Qty
-AddInventoryProduct=Add product to inventory
+RegulatedQty=Gereguleerde aantal
+AddInventoryProduct=Voeg product toe aan inventarisatie
 AddProduct=Toevoegen
-ApplyPMP=Apply PMP
+ApplyPMP=Pas PMP toe
 FlushInventory=Voorraad op 'nul' zetten
-ConfirmFlushInventory=Wilt u deze actie bevestigen?
+ConfirmFlushInventory=Bevestigen?
 InventoryFlushed=Inventarisatie opgeschoond
 ExitEditMode=Exit editie
 inventoryDeleteLine=Verwijderen regel
-RegulateStock=Regulate Stock
+RegulateStock=Voorraad reguleren
 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 items
+StockSupportServices=Voorraadbeheer ondersteunt Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
+ReceiveProducts=Items ontvangen
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
diff --git a/htdocs/langs/nl_NL/website.lang b/htdocs/langs/nl_NL/website.lang
index a085bf5af1c..f466074cb2a 100644
--- a/htdocs/langs/nl_NL/website.lang
+++ b/htdocs/langs/nl_NL/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/nl_NL/withdrawals.lang b/htdocs/langs/nl_NL/withdrawals.lang
index 0da6817bada..2fd0c894135 100644
--- a/htdocs/langs/nl_NL/withdrawals.lang
+++ b/htdocs/langs/nl_NL/withdrawals.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Direct debit payment orders area
+CustomersStandingOrdersArea=Onderdeel automatische incasso betalingsopdrachten
 SuppliersStandingOrdersArea=Directe betaalopdrachten omgeving
 StandingOrdersPayment=Orders automatisch te incasseren
 StandingOrderPayment=Incasso betalingsopdracht
@@ -8,25 +8,25 @@ StandingOrderToProcess=Te verwerken
 WithdrawalsReceipts=Incasso-opdrachten
 WithdrawalReceipt=Incasso-opdracht
 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
+WithdrawalsLines=Regels voor automatische incasso
+RequestStandingOrderToTreat=Verzoek om automatische incasso te verwerken
+RequestStandingOrderTreated=Verzoek om automatische incassomachtiging verwerkt
 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=Aantal klant factuur met automatische incasso betalingsopdrachten en gedefinieerde bankrekeninginformatie
-InvoiceWaitingWithdraw=Invoice waiting for direct debit
+NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Factuur wacht op automatische incasso
 AmountToWithdraw=Bedrag in te trekken
-WithdrawsRefused=Direct debit refused
+WithdrawsRefused=Automatische incasso geweigerd
 NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
-ResponsibleUser=Verantwoordelijke gebruiker
-WithdrawalsSetup=Direct debit payment setup
+ResponsibleUser=User Responsible
+WithdrawalsSetup=Instelling voor automatische incasso
 WithdrawStatistics=Automatische incasso statistieken
 WithdrawRejectStatistics=Geweigerde automatische incasso statistieken
 LastWithdrawalReceipt=Laatste %s ontvangen incasso's
 MakeWithdrawRequest=Automatische incasso aanmaken
 WithdrawRequestsDone=%s direct debit payment requests recorded
-ThirdPartyBankCode=Bankcode van derde
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Classificeer creditering
 ClassCreditedConfirm=Weet u zeker dat u deze intrekkingsontvangst als bijgeschreven op uw bankrekening wilt classificeren?
 TransData=Datum transmissie
@@ -50,7 +50,7 @@ StatusMotif0=Niet gespecificeerd
 StatusMotif1=Ontoereikende voorziening
 StatusMotif2=Betwiste
 StatusMotif3=Geen incasso-opdracht
-StatusMotif4=Afnemersopdracht
+StatusMotif4=Sales Order
 StatusMotif5=RIB onwerkbaar
 StatusMotif6=Rekening zonder balans
 StatusMotif7=Gerechtelijke beslissing
@@ -66,11 +66,11 @@ NotifyCredit=Intrekking Credit
 NumeroNationalEmetter=Nationale zender nummer
 WithBankUsingRIB=Voor bankrekeningen die gebruik maken van RIB
 WithBankUsingBANBIC=Voor bankrekeningen die gebruik maken van IBAN / BIC / SWIFT
-BankToReceiveWithdraw=Bank account to receive direct debit
+BankToReceiveWithdraw=Receiving Bank Account
 CreditDate=Crediteer op
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
-ShowWithdraw=Toon intrekking
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Echter, als factuur is ten minste een terugtrekking betaling nog niet verwerkt, zal het niet worden ingesteld als betaald om tot terugtrekking te beheren voor.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -87,13 +87,13 @@ 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
+CreditorName=Creditor Name
 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
+ModeRECUR=Recurring payment
 ModeFRST=Eenmalige incasso
 PleaseCheckOne=Alleen één controleren
 DirectDebitOrderCreated=Direct debit order %s created
@@ -102,6 +102,10 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Uitvoeringsdatum
 CreateForSepa=Aanmaken incassobestand
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/pl_PL/accountancy.lang b/htdocs/langs/pl_PL/accountancy.lang
index 37a094a476e..006ac65e13c 100644
--- a/htdocs/langs/pl_PL/accountancy.lang
+++ b/htdocs/langs/pl_PL/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Consult here the list of third-party customers and vendors
 ListAccounts=Lista kont księgowych
 UnknownAccountForThirdparty=Unknown third-party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
-Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Bez poprawnego dedykowanego konta
 WithValidAccount=Z poprawnym dedykowanym kontem
 ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
 AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Zakres konta księgowego
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
-
+DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
index a55aa59b303..0ed44756d6d 100644
--- a/htdocs/langs/pl_PL/admin.lang
+++ b/htdocs/langs/pl_PL/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Czyszczenie
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Usuń pliki logu, wliczając <b>%s</b> zdefiniowany dla modułu Syslog (brak ryzyka utraty danych)
-PurgeDeleteTemporaryFiles=Usuń wszystkie pliki tymczasowe (nie utracisz danych)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Usuń pliki tymczasowe
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Czyść teraz
@@ -804,6 +804,7 @@ Permission401=Odczytaj zniżki
 Permission402=Tworzenie / modyfikacja zniżek
 Permission403=Walidacja zniżek
 Permission404=Usuwanie zniżek
+Permission430=Use Debug Bar
 Permission511=Read payments of salaries
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
@@ -818,6 +819,9 @@ Permission532=Tworzenie / modyfikacja usług
 Permission534=Usuwanie usług
 Permission536=Zobacz / zarządzaj ukrytymi usługami
 Permission538=Eksport usług
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Zobacz darowizny
 Permission702=Tworzenie / modyfikacja darowizn
 Permission703=Usuń darowizny
@@ -837,6 +841,12 @@ Permission1101=Zobacz zamówienia na dostawy
 Permission1102=Tworzenie / modyfikacja zamówień na dostawy
 Permission1104=Walidacja zamówienia na dostawy
 Permission1109=Usuń zamówienia na dostawy
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Czytaj dostawców
 Permission1182=Read purchase orders
 Permission1183=Create/modify purchase orders
@@ -859,16 +869,6 @@ Permission1251=Uruchom masowy import danych zewnętrznych do bazy danych (wgrywa
 Permission1321=Eksport faktur klienta, atrybutów oraz płatności
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those 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)
-Permission23001=Czytaj Zaplanowane zadania
-Permission23002=Tworzenie / aktualizacja Zaplanowanych zadań
-Permission23003=Usuwanie Zaplanowanego zadania
-Permission23004=Wykonanie Zaplanowanego zadania
 Permission2401=Czytaj działania (zdarzenia lub zadania) związane z jego kontem
 Permission2402=Tworzenie / modyfikacja działań (zdarzeń lub zadań) związanych z jego kontem
 Permission2403=Usuwanie działań (zdarzeń lub zadań) związanych z jego kontem
@@ -882,9 +882,41 @@ Permission2503=Potwierdź lub usuń dokumenty
 Permission2515=Konfiguracja katalogów dokumentów
 Permission2801=Użyj klienta FTP w trybie odczytu (tylko przeglądanie i pobieranie)
 Permission2802=Użyj klienta FTP w trybie zapisu (usuwanie lub przesyłanie plików)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those 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)
+Permission23001=Czytaj Zaplanowane zadania
+Permission23002=Tworzenie / aktualizacja Zaplanowanych zadań
+Permission23003=Usuwanie Zaplanowanego zadania
+Permission23004=Wykonanie Zaplanowanego zadania
 Permission50101=Use Point of Sale
 Permission50201=Czytaj transakcje
 Permission50202=Import transakcji
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Druk
 Permission55001=Czytaj ankiet
 Permission55002=Tworzenie / modyfikacja ankiet
@@ -1078,7 +1110,7 @@ AreaForAdminOnly=Parametry mogą być ustawiane tylko przez <b>użytkowników z
 SystemInfoDesc=System informacji jest różne informacje techniczne można uzyskać w trybie tylko do odczytu i widoczne tylko dla administratorów.
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
-AccountantDesc=Edit the details of your accountant/bookkeeper
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Dostępne aplikacje / moduły
@@ -1891,3 +1923,5 @@ IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute s
 UrlForIFTTT=URL endpoint for IFTTT
 YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/pl_PL/banks.lang b/htdocs/langs/pl_PL/banks.lang
index 8aeec84d4c7..e78818fc226 100644
--- a/htdocs/langs/pl_PL/banks.lang
+++ b/htdocs/langs/pl_PL/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=Not reconciled
 CustomerInvoicePayment=Płatności klienta
 SupplierInvoicePayment=Płatność dostawcy
 SubscriptionPayment=Zaplanowana płatność
-WithdrawalPayment=Wycofana płatność
+WithdrawalPayment=Debit payment order
 SocialContributionPayment=Płatność za ZUS/podatek
 BankTransfer=Przelew bankowy
 BankTransfers=Przelewy bankowe
diff --git a/htdocs/langs/pl_PL/cashdesk.lang b/htdocs/langs/pl_PL/cashdesk.lang
index fa2df7ee0ed..2387ed10d7b 100644
--- a/htdocs/langs/pl_PL/cashdesk.lang
+++ b/htdocs/langs/pl_PL/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/pl_PL/mails.lang b/htdocs/langs/pl_PL/mails.lang
index a8c229cef0d..26161193ec3 100644
--- a/htdocs/langs/pl_PL/mails.lang
+++ b/htdocs/langs/pl_PL/mails.lang
@@ -19,6 +19,8 @@ MailTopic=Email topic
 MailText=Wiadomość
 MailFile=Dołączone pliki
 MailMessage=Zawartość emaila 
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
 ShowEMailing=Pokaż mailingi
 ListOfEMailings=Lista mailingów
 NewMailing=Nowy mailing
@@ -76,9 +78,9 @@ GroupEmails=Group emails
 OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
 WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
 ResultOfMailSending=Result of mass Email sending
-NbSelected=No. selected
-NbIgnored=No. ignored
-NbSent=No. sent
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
diff --git a/htdocs/langs/pl_PL/members.lang b/htdocs/langs/pl_PL/members.lang
index d8ae37f489e..063cd3e446a 100644
--- a/htdocs/langs/pl_PL/members.lang
+++ b/htdocs/langs/pl_PL/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=Wybierz statystyki chcesz czytać ...
 MenuMembersStats=Statystyka
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Data ostatniej subskrypcji
-Nature=Natura
+MemberNature=Nature of member
 Public=Informacje są publiczne
 NewMemberbyWeb=Nowy członek dodaje. Oczekuje na zatwierdzenie
 NewMemberForm=Nowa forma członkiem
diff --git a/htdocs/langs/pl_PL/products.lang b/htdocs/langs/pl_PL/products.lang
index a2c026e4fe4..10b9789e003 100644
--- a/htdocs/langs/pl_PL/products.lang
+++ b/htdocs/langs/pl_PL/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Ceny dostawców
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Kraj pochodzenia
-Nature=Product Type (material/finished)
+Nature=Nature of produt (material/finished)
 ShortLabel=Krótka etykieta
 Unit=Jednostka
 p=jedn.
diff --git a/htdocs/langs/pl_PL/salaries.lang b/htdocs/langs/pl_PL/salaries.lang
index c802f3e9d27..977baae0642 100644
--- a/htdocs/langs/pl_PL/salaries.lang
+++ b/htdocs/langs/pl_PL/salaries.lang
@@ -1,18 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger 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=Konto rachunkowe użyte dla użytkownika kontrahentów
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Dedykowane konto księgowe zdefiniowane na karcie użytkownika będzie używane wyłącznie do księgowania Subledger. Ten zostanie użyty w General Ledger i jako wartość domyślna księgowania Subledger, jeśli dedykowane konto rachunkowe użytkownika dla użytkownika nie zostanie zdefiniowane.
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Domyślne konto rachunkowe dla płatności wynagrodzenia
 Salary=Wypłata
 Salaries=Wypłaty
 NewSalaryPayment=Nowa wypłata
+AddSalaryPayment=Dodaj płatność wynagrodzenia
 SalaryPayment=Wypłata wynagrodzenia
 SalariesPayments=Wypłaty wynagordzeń
 ShowSalaryPayment=Pokaż wypłaty wynagrodzeń
 THM=Średnia stawka godzinowa
 TJM=Średnia stawka dzienna
 CurrentSalary=Aktualne wynagrodzenie
-THMDescription=Ta wartość może być użyta do obliczenia kosztów poniesionych przy projekcie do którego przystąpili użytkownicy jeżeli moduł projektów jest używany
-TJMDescription=Ta wartość jest aktualnie jedynie informacją i nie jest wykorzystywana do jakichkolwiek obliczeń
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
 LastSalaries=Ostatnie %s płatności wynagrodzeń
 AllSalaries=Wszystkie płatności wynagrodzeń
-SalariesStatistics=Statistiques salaires
+SalariesStatistics=Statystyki wynagrodzeń
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/pl_PL/stocks.lang b/htdocs/langs/pl_PL/stocks.lang
index dc62e3fce85..e8f562a9b8c 100644
--- a/htdocs/langs/pl_PL/stocks.lang
+++ b/htdocs/langs/pl_PL/stocks.lang
@@ -3,14 +3,14 @@ WarehouseCard=Karta magazynu
 Warehouse=Magazyn
 Warehouses=Magazyny
 ParentWarehouse=Magazyn nadrzędny
-NewWarehouse=Nowy magazyn / obszar magazynowania
+NewWarehouse=New warehouse / Stock Location
 WarehouseEdit=Modyfikacja magazynu
 MenuNewWarehouse=Nowy magazyn
 WarehouseSource=Magazyn źródłowy
 WarehouseSourceNotDefined=Nie zdefiniowano magazynu,
-AddWarehouse=Create warehouse
+AddWarehouse=Utwórz magazyn
 AddOne=Dodaj jedną
-DefaultWarehouse=Default warehouse
+DefaultWarehouse=Domyślny magazyn
 WarehouseTarget=Docelowy magazynie
 ValidateSending=Usuń wysyłanie
 CancelSending=Anuluj wysyłanie
@@ -29,6 +29,8 @@ MovementId=ID przesunięcia
 StockMovementForId=ID przesunięcia %d
 ListMouvementStockProject=Lista przesunięć zapasu skojarzona z projektem
 StocksArea=Powierzchnia magazynów
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
 Location=Lokacja
 LocationSummary=Nazwa skrócona lokalizacji
 NumberOfDifferentProducts=Wiele różnych środków
@@ -44,7 +46,6 @@ TransferStock=Przesuń zapas
 MassStockTransferShort=Masowe przesuniecie zapasu
 StockMovement=Przeniesienie zapasu
 StockMovements=Przesunięcia zapasu
-LabelMovement=Etykieta przesunięcia
 NumberOfUnit=Liczba jednostek
 UnitPurchaseValue=Jednostkowa cena nabycia
 StockTooLow=Zbyt niski zapas
@@ -54,21 +55,23 @@ PMPValue=Średnia ważona ceny
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Magazyny wartości
 UserWarehouseAutoCreate=Utwórz użytkownika dla magazynu kiedy tworzysz użytkownika
-AllowAddLimitStockByWarehouse=Allow to add limit and desired stock per couple (product, warehouse) instead of per product
-IndependantSubProductStock=Produkt akcji i subproduct akcji są niezależne
+AllowAddLimitStockByWarehouse=Manage also values for minimum and desired stock per pairing (product-warehouse) in addition to values per product
+IndependantSubProductStock=Product stock and subproduct stock are independent
 QtyDispatched=Wysłana ilość
 QtyDispatchedShort=Ilość wysłana
 QtyToDispatchShort=Ilość do wysłania
 OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Zasady dla automatycznego zarządzania zmniejszeniem zapasu (ręczne zmniejszenie jest zawsze możliwe, nawet gdy automatyczne reguły są aktywne)
-RuleForStockManagementIncrease=Zasady dla automatycznego zarządzania zwiększaniem zapasu (ręczne zwiększenie jest zawsze możliwe, nawet gdy automatyczne reguły są aktywne)
-DeStockOnBill=Zmniejsz realne zapasy magazynu po potwierdzeniu faktur / not kredytowych
-DeStockOnValidateOrder=Zmniejsz realne zapasy magazynu po potwierdzeniu zamówień klientów
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
 DeStockOnShipment=Zmniejsz realne zapasy magazynu po potwierdzeniu wysyłki
-DeStockOnShipmentOnClosing=Zmniejsz realny zapas przy sklasyfikowaniu wysyłki jako ukończonej
-ReStockOnBill=Zwiększ realne zapasy magazynu po potwierdzeniu faktur / not kredytowych
-ReStockOnValidateOrder=Increase real stocks on purchase orders approbation
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=Zamówienie nie jest jeszcze lub nie więcej status, który umożliwia wysyłanie produktów w magazynach czas.
 StockDiffPhysicTeoric=Wyjaśnienia dla różnicy pomiędzy fizycznym i wirtualnych zapasem
 NoPredefinedProductToDispatch=Nie gotowych produktów dla tego obiektu. Więc nie w czas wysyłki jest wymagane.
@@ -76,12 +79,12 @@ DispatchVerb=Wysyłka
 StockLimitShort=Limit zapasu przy którym wystąpi alarm
 StockLimit=Limit zapasu przy którym wystąpi alarm
 StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
-PhysicalStock=Fizyczne stany
+PhysicalStock=Physical Stock
 RealStock=Realny magazyn
-RealStockDesc=Physical or real stock is the stock you currently have into your internal warehouses/emplacements.
-RealStockWillAutomaticallyWhen=The real stock will automatically change according to this rules (see stock module setup to change this):
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Wirtualny zapas
-VirtualStockDesc=Virtual stock is the stock you will get once all open pending actions that affect stocks will be closed (supplier order received, customer order shipped, ...)
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
 IdWarehouse=Identyfikator magazynu
 DescWareHouse=Opis magazynu
 LieuWareHouse=Lokalizacja magazynu
@@ -101,7 +104,7 @@ ThisWarehouseIsPersonalStock=Tym składzie przedstawia osobiste zasobów %s %s
 SelectWarehouseForStockDecrease=Wybierz magazyn do zmniejszenia zapasu
 SelectWarehouseForStockIncrease=Wybierz magazyn do zwiększenia zapasu
 NoStockAction=Brak akcji stock
-DesiredStock=Pożądany zapas
+DesiredStock=Desired Stock
 DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
 StockToBuy=Na zamówienie
 Replenishment=Uzupełnienie
@@ -114,13 +117,13 @@ CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Wirtualny zapas
 CurentlyUsingPhysicalStock=Fizyczny zapas
 RuleForStockReplenishment=Reguła dla uzupełnienia zapasów
-SelectProductWithNotNullQty=Wybierz co najmniej jeden produkt z st not null i dostawcy
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
 AlertOnly= Tylko alarmy
 WarehouseForStockDecrease=<b>Magazyn% s</b> zostaną wykorzystane do zmniejszenia magazynie
 WarehouseForStockIncrease=<b>Magazyn% s</b> zostaną wykorzystane do zwiększenia magazynie
 ForThisWarehouse=W tym magazynie
-ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is a list of all open supplier orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Uzupełnienie
 NbOfProductBeforePeriod=Ilość produktów w magazynie% s przed wybrany okres (<% s)
 NbOfProductAfterPeriod=Ilość produktów w magazynie% s po wybraniu okres (>% s)
@@ -130,10 +133,11 @@ RecordMovement=Record transfer
 ReceivingForSameOrder=Wpływy do tego celu
 StockMovementRecorded=Przesunięcia zapasu zarejestrowane
 RuleForStockAvailability=Zasady dotyczące dostępności zapasu
-StockMustBeEnoughForInvoice=Poziom zapasu musi być wystarczający aby dodać produkt/usługę do faktury (sprawdzenie odbywa się na aktualnym realnym zapasie przy dodawaniu pozycji do faktury niezależnie od reguły automatycznej zmiany zapasu)
-StockMustBeEnoughForOrder=Poziom zapasu musi być wystarczający aby dodać produkt/usługę do zamówienia (sprawdzenie odbywa się na aktualnym realnym zapasie przy dodawaniu pozycji do zamówienia niezależnie od reguły automatycznej zmiany zapasu)
-StockMustBeEnoughForShipment= Poziom zapasu musi być wystarczający aby dodać produkt/usługę do wysyłki (sprawdzenie odbywa się na aktualnym realnym zapasie przy dodawaniu pozycji do wysyłki niezależnie od reguły automatycznej zmiany zapasu)
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Etykieta ruchu
+TypeMovement=Type of movement
 DateMovement=Data przesunięcia
 InventoryCode=Ruch lub kod inwentaryzacji
 IsInPackage=Zawarte w pakiecie
@@ -143,11 +147,11 @@ ShowWarehouse=Pokaż magazyn
 MovementCorrectStock=Korekta zapasu dla artykułu %s
 MovementTransferStock=Transferuj zapas artykułu %s do innego magazynu
 InventoryCodeShort=Kod Fv/ Przesunięcia
-NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
 ThisSerialAlreadyExistWithDifferentDate=Ten lot/numer seryjny (<strong>%s</strong>) już istnieje ale z inna data do wykorzystania lub sprzedania (znaleziono  <strong>%s</strong> a wszedłeś w <strong>%s</strong>)
 OpenAll=Otwórz dla wszystkich działań
 OpenInternal=Otwórz tylko dla wewnętrznych działań
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on supplier order reception
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
 OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
 ProductStockWarehouseCreated=Limit zapasu dla ostrzeżenia i pożądany optymalny zapas prawidłowo utworzony
 ProductStockWarehouseUpdated=Limit zapasu dla ostrzeżenia i pożądany optymalny zapas prawidłowo zaktualizowany
@@ -171,16 +175,16 @@ inventoryValidate=Zatwierdzony
 inventoryDraft=Działa
 inventorySelectWarehouse=Magazyn zmieniony
 inventoryConfirmCreate=Utwórz
-inventoryOfWarehouse=Inwentaryzacja dla magazynu: %s
-inventoryErrorQtyAdd=Error : one quantity is leaser than zero
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
 inventoryMvtStock=Według inwentaryzacji
 inventoryWarningProductAlreadyExists=Te produkt jest już na liście
 SelectCategory=Filtr kategorii
-SelectFournisseur=Supplier filter
+SelectFournisseur=Vendor filter
 inventoryOnDate=Inwentaryzacja
-INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
 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
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement has date of inventory
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Nie dodawaj produktu bez zapasu
@@ -195,12 +199,16 @@ AddInventoryProduct=Dodaj produkt do inwentaryzacji
 AddProduct=Dodaj
 ApplyPMP=Apply PMP
 FlushInventory=Flush inventory
-ConfirmFlushInventory=Czy potwierdzasz tą czynność?
+ConfirmFlushInventory=Do you confirm this action?
 InventoryFlushed=Inwentaryzacja zakończona
 ExitEditMode=Opuść edycję
 inventoryDeleteLine=Usuń linię
 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"
+StockSupportServices=Stock management supports Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
 ReceiveProducts=Receive items
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
diff --git a/htdocs/langs/pl_PL/website.lang b/htdocs/langs/pl_PL/website.lang
index 5dd5a3ef2e3..b53162bf594 100644
--- a/htdocs/langs/pl_PL/website.lang
+++ b/htdocs/langs/pl_PL/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/pl_PL/withdrawals.lang b/htdocs/langs/pl_PL/withdrawals.lang
index a07e2f068e4..0c20ba09a77 100644
--- a/htdocs/langs/pl_PL/withdrawals.lang
+++ b/htdocs/langs/pl_PL/withdrawals.lang
@@ -12,21 +12,21 @@ WithdrawalsLines=Direct debit order lines
 RequestStandingOrderToTreat=Request for direct debit payment order to process
 RequestStandingOrderTreated=Request for direct debit payment order processed
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Jeszcze nie możliwe. Wycofaj stan musi być ustawiony na "dobro", zanim uzna odrzucić na konkretnych liniach.
-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
+NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Kwota do wycofania
 WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
-ResponsibleUser=Odpowiedzialny użytkownika
+ResponsibleUser=User Responsible
 WithdrawalsSetup=Direct debit payment setup
 WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
-ThirdPartyBankCode=Kod banku kontrahenta
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Klasyfikacja zapisane
 ClassCreditedConfirm=Czy na pewno chcesz to wycofanie otrzymania sklasyfikowania jako wpłacone na konto bankowe?
 TransData=Data Transmission
@@ -50,7 +50,7 @@ StatusMotif0=Nieokreślone
 StatusMotif1=Przepis insuffisante
 StatusMotif2=conteste liqueur
 StatusMotif3=No direct debit payment order
-StatusMotif4=Zamówienia klientów
+StatusMotif4=Sales Order
 StatusMotif5=RIB inexploitable
 StatusMotif6=Salda rachunku bez
 StatusMotif7=Orzeczenia sądowego
@@ -66,11 +66,11 @@ NotifyCredit=Odstąpienia od umowy kredytowej
 NumeroNationalEmetter=Krajowy numer nadajnika
 WithBankUsingRIB=Na rachunkach bankowych z wykorzystaniem RIB
 WithBankUsingBANBIC=Na rachunkach bankowych z wykorzystaniem IBAN / BIC / SWIFT
-BankToReceiveWithdraw=Bank account to receive direct debit
+BankToReceiveWithdraw=Receiving Bank Account
 CreditDate=Kredyt na
 WithdrawalFileNotCapable=Nie można wygenerować plik paragon wycofania dla danego kraju:% s (Twój kraj nie jest obsługiwany)
-ShowWithdraw=Pokaż Wypłata
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Jeśli jednak faktura nie co najmniej jeden wypłaty płatności jeszcze przetworzone, nie będzie ustawiony jako zapłaci, aby umożliwić zarządzanie wycofanie wcześniej.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Plik Wycofanie
 SetToStatusSent=Ustaw status "Plik Wysłane"
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statystyki według stanu linii
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -87,13 +87,13 @@ 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
+CreditorName=Creditor Name
 SEPAFillForm=(B) Please complete all the fields marked *
 SEPAFormYourName=Twoje imię
 SEPAFormYourBAN=Your Bank Account Name (IBAN)
 SEPAFormYourBIC=Your Bank Identifier Code (BIC)
 SEPAFrstOrRecur=Rodzaj płatności
-ModeRECUR=Powtarzająca się płatność
+ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Proszę wybierz tylko jedną
 DirectDebitOrderCreated=Direct debit order %s created
@@ -102,6 +102,10 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang
index 71d60ba1226..9878c50a066 100644
--- a/htdocs/langs/pt_BR/admin.lang
+++ b/htdocs/langs/pt_BR/admin.lang
@@ -672,16 +672,6 @@ Permission1251=Rodar(run) Importações Massivas de Dados Externos para o Banco
 Permission1321=Exportar Faturas de Clientes, Atributos e Pagamentos
 Permission1322=Reabrir uma nota paga
 Permission1421=Exportar ordens de venda e atributos
-Permission20001=Leia pedidos de licença (sua licença e os de seus subordinados)
-Permission20002=Criar/modificar seus pedidos de licença (sua licença e os de seus subordinados)
-Permission20003=Excluir pedidos de licença
-Permission20004=Leia todos os pedidos de licença (mesmo do usuário não subordinados)
-Permission20005=Criar / modificar pedidos de licença para todos (mesmo do usuário não subordinados)
-Permission20006=Pedidos de licença administrativas (configuração e atualização de balanço)
-Permission23001=Ler Tarefas Agendadas
-Permission23002=Criar/Atualizar Tarefas Agendadas
-Permission23003=Excluir Tarefas Agendadas
-Permission23004=Executar Tarefas Agendadas
 Permission2401=Ler Ações (enventos ou tarefas) Vinculado a sua Conta
 Permission2402=Criar/Modificar Ações (eventos ou tarefas) Vinculado a sua Conta
 Permission2403=Excluir ações (eventos ou tarefas) vinculadas à sua Conta
@@ -695,6 +685,16 @@ Permission2503=Submeter ou Deletar Documentos
 Permission2515=Configurar Diretórios dos Documentos
 Permission2801=Usar cliente FTP no modo leitura (somente navegador e baixar)
 Permission2802=Usar cliente FTP no modo escrita (deletar ou upload de arquivos)
+Permission20001=Leia pedidos de licença (sua licença e os de seus subordinados)
+Permission20002=Criar/modificar seus pedidos de licença (sua licença e os de seus subordinados)
+Permission20003=Excluir pedidos de licença
+Permission20004=Leia todos os pedidos de licença (mesmo do usuário não subordinados)
+Permission20005=Criar / modificar pedidos de licença para todos (mesmo do usuário não subordinados)
+Permission20006=Pedidos de licença administrativas (configuração e atualização de balanço)
+Permission23001=Ler Tarefas Agendadas
+Permission23002=Criar/Atualizar Tarefas Agendadas
+Permission23003=Excluir Tarefas Agendadas
+Permission23004=Executar Tarefas Agendadas
 Permission50101=Use o Ponto de Venda
 Permission50201=Ler Transações
 Permission50202=Importar Transações
diff --git a/htdocs/langs/pt_PT/accountancy.lang b/htdocs/langs/pt_PT/accountancy.lang
index a7b48f70053..9cd6b2dc65f 100644
--- a/htdocs/langs/pt_PT/accountancy.lang
+++ b/htdocs/langs/pt_PT/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Consult here the list of third-party customers and vendors
 ListAccounts=Lista de contas contabilísticas
 UnknownAccountForThirdparty=Unknown third-party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Pagamento não vinculado a nenhum produto / serviço
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Exportar CSV configurável
-Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=ID de plano de contas
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Sem conta dedicada válido
 WithValidAccount=Com conta dedicada válida
 ValueNotIntoChartOfAccount=Este valor de conta de contabilística não existe no plano de contas
 AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Gama da conta contabilística
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Linhas ainda não encadernadas, use o menu <a href="%
 
 ## Import
 ImportAccountingEntries=Entradas contábeis
-
+DateExport=Date export
 WarningReportNotReliable=Atenção, este relatório não é baseado no Ledger, portanto, não contém transações modificadas manualmente no Ledger. Se a sua periodização estiver atualizada, a visão da contabilidade será mais precisa.
 ExpenseReportJournal=Diário de relatórios de despesas
 InventoryJournal=Diário de Inventário
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index 942139f6e01..5f8e5ed45c0 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Limpar
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Eliminar os ficheiros de registo, incluindo <b>%s</b> definido para o módulo Syslog (não existe risco de perda de dados)
-PurgeDeleteTemporaryFiles=Eliminar todos os ficheiros temporários (sem risco de perder os dados)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Eliminar ficheiros temporários
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Limpar agora
@@ -804,6 +804,7 @@ Permission401=Consultar descontos
 Permission402=Criar/modificar descontos
 Permission403=Validar descontos
 Permission404=Eliminar descontos
+Permission430=Use Debug Bar
 Permission511=Leia pagamentos de salários
 Permission512=Criar / modificar pagamentos de salários
 Permission514=Excluir pagamentos de salários
@@ -818,6 +819,9 @@ Permission532=Criar/modificar serviços
 Permission534=Eliminar serviços
 Permission536=Ver/gerir serviços ocultos
 Permission538=Exportar serviços
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Consultar donativos
 Permission702=Criar/modificar donativos
 Permission703=Eliminar donativos
@@ -837,6 +841,12 @@ Permission1101=Consultar ordens de envío
 Permission1102=Criar/modificar ordens de envío
 Permission1104=Confirmar ordem de envío
 Permission1109=Eliminar ordem de envío
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Consultar fornecedores
 Permission1182=Read purchase orders
 Permission1183=Create/modify purchase orders
@@ -859,16 +869,6 @@ Permission1251=Executar importações em massa de dados externos para a bases de
 Permission1321=Exportar faturas, atributos e cobranças de clientes
 Permission1322=Reabrir uma fatura paga
 Permission1421=Export sales orders and attributes
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
-Permission20003=Eliminar pedidos de licença
-Permission20004=Consultar todos os pedidos de licença (incluindo os dos utilizadores não são seus subordinados)
-Permission20005=Criar/modificar pedidos de licença de todos (incluindo os dos utilizadores não são seus subordinados)
-Permission20006=Pedidos de licenças do administrador (configuração e atualização do balanço)
-Permission23001=Consultar trabalho agendado
-Permission23002=Criar/atualizar trabalho agendado
-Permission23003=Eliminar trabalho agendado
-Permission23004=Executar trabalho agendado
 Permission2401=Consultar ações (eventos ou tarefas) vinculadas à conta dele
 Permission2402=Criar/modificar ações (eventos ou tarefas) vinculadas à conta dele
 Permission2403=Consultar ações (eventos ou tarefas) vinculadas à conta dele
@@ -882,9 +882,41 @@ Permission2503=Submeter ou eliminar documentos
 Permission2515=Configuração de diretórios de documentos
 Permission2801=Usar cliente FTP em modo de leitura (listar e descarregar apenas)
 Permission2802=Usar o cliente FTP em modo de escrita (eliminar ou carregar ficheiros)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
+Permission20003=Eliminar pedidos de licença
+Permission20004=Consultar todos os pedidos de licença (incluindo os dos utilizadores não são seus subordinados)
+Permission20005=Criar/modificar pedidos de licença de todos (incluindo os dos utilizadores não são seus subordinados)
+Permission20006=Pedidos de licenças do administrador (configuração e atualização do balanço)
+Permission23001=Consultar trabalho agendado
+Permission23002=Criar/atualizar trabalho agendado
+Permission23003=Eliminar trabalho agendado
+Permission23004=Executar trabalho agendado
 Permission50101=Use Point of Sale
 Permission50201=Consultar transações
 Permission50202=Importar transações
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Imprimir
 Permission55001=Consultar votações
 Permission55002=Criar/Modificar votações
@@ -1078,7 +1110,7 @@ AreaForAdminOnly=Os parâmetros de configuração só podem ser definidos pelos
 SystemInfoDesc=Esta informação do sistema é uma informação técnica acessível só para leitura dos administradores.
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edite as informações da empresa / entidade. Clique no botão "%s" ou "%s" na parte inferior da página.
-AccountantDesc=Edite os detalhes do seu contador / contabilista
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Aplicações/módulos disponíveis
@@ -1891,3 +1923,5 @@ IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute s
 UrlForIFTTT=URL endpoint for IFTTT
 YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/pt_PT/banks.lang b/htdocs/langs/pt_PT/banks.lang
index cb778f9ada2..64adbecba0e 100644
--- a/htdocs/langs/pt_PT/banks.lang
+++ b/htdocs/langs/pt_PT/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=Não reconciliado
 CustomerInvoicePayment=Pagamento de cliente
 SupplierInvoicePayment=Pagamento de fornecedor
 SubscriptionPayment=Pagamento Assinatura
-WithdrawalPayment=Pagamento de retirada
+WithdrawalPayment=Débito direto
 SocialContributionPayment=Pagamento da taxa social/fiscal
 BankTransfer=Transferência bancária
 BankTransfers=Transferencias bancarias
diff --git a/htdocs/langs/pt_PT/cashdesk.lang b/htdocs/langs/pt_PT/cashdesk.lang
index 6b30f07ae0a..5146c9f9ddc 100644
--- a/htdocs/langs/pt_PT/cashdesk.lang
+++ b/htdocs/langs/pt_PT/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/pt_PT/mails.lang b/htdocs/langs/pt_PT/mails.lang
index 2c22990bfac..24ce7015897 100644
--- a/htdocs/langs/pt_PT/mails.lang
+++ b/htdocs/langs/pt_PT/mails.lang
@@ -19,6 +19,8 @@ MailTopic=Email topic
 MailText=Mensagem
 MailFile=Ficheiro
 MailMessage=Texto utilizado no corpo da mensagem
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
 ShowEMailing=Mostrar E-Mailing
 ListOfEMailings=Lista de mailings
 NewMailing=Novo emailing
@@ -76,9 +78,9 @@ GroupEmails=E-mails do grupo
 OneEmailPerRecipient=Um email por destinatário (por padrão, um email por registro selecionado)
 WarningIfYouCheckOneRecipientPerEmail=Atenção, se você marcar esta caixa, significa que apenas um e-mail será enviado para vários registros diferentes selecionados, portanto, se sua mensagem contiver variáveis ​​de substituição referentes a dados de um registro, não será possível substituí-las.
 ResultOfMailSending=Result of mass Email sending
-NbSelected=Não selecionado
-NbIgnored=Não ignorado
-NbSent=Não enviado
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s mensagem (s) enviada (s).
 ConfirmUnvalidateEmailing=Tem certeza de que deseja alterar o e-mail <b> %s </ b> para o status do rascunho?
 MailingModuleDescContactsWithThirdpartyFilter=Contato com filtros de clientes
diff --git a/htdocs/langs/pt_PT/members.lang b/htdocs/langs/pt_PT/members.lang
index 769a92d3937..36f6e87bdac 100644
--- a/htdocs/langs/pt_PT/members.lang
+++ b/htdocs/langs/pt_PT/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=Escolha as estatísticas que você deseja ler ...
 MenuMembersStats=Estatística
 LastMemberDate=Última data do membro
 LatestSubscriptionDate=Data da última subscrição
-Nature=Natureza
+MemberNature=Nature of member
 Public=As informações são públicas
 NewMemberbyWeb=Novo membro acrescentou. Aguardando aprovação
 NewMemberForm=Forma novo membro
diff --git a/htdocs/langs/pt_PT/products.lang b/htdocs/langs/pt_PT/products.lang
index bbe63fc079e..14b1b68ad0a 100644
--- a/htdocs/langs/pt_PT/products.lang
+++ b/htdocs/langs/pt_PT/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Preços de fornecedor
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Código Aduaneiro / Commodity / HS
 CountryOrigin=País de origem
-Nature=Product Type (material/finished)
+Nature=Nature of produt (material/finished)
 ShortLabel=Rótulo curto
 Unit=Unidade
 p=você.
diff --git a/htdocs/langs/pt_PT/salaries.lang b/htdocs/langs/pt_PT/salaries.lang
index 354fdd9a91d..317b98ad927 100644
--- a/htdocs/langs/pt_PT/salaries.lang
+++ b/htdocs/langs/pt_PT/salaries.lang
@@ -1,18 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
 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_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Conta contabilística usada por defeito para pagamentos de salários
 Salary=Salário
 Salaries=Salários
 NewSalaryPayment=Novo Pagamento de Salário
+AddSalaryPayment=Add salary payment
 SalaryPayment=Pagamento de Salário
 SalariesPayments=Pagamentos de Salários
 ShowSalaryPayment=Mostrar pagamento de salário
 THM=Taxa horária média
 TJM=Taxa diária média
 CurrentSalary=Salário atual
-THMDescription=Esse valor pode ser usado para calcular o custo do tempo consumido num projeto inserido pelos utilizadores, isto no caso de o módulo Projetos estiver a ser utilizado
-TJMDescription=Esse valor é atualmente serve apenas como informação e não é utilizado em qualquer cálculo
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
 LastSalaries=Últimos %s pagamentos salariais
 AllSalaries=Todos os pagamentos salariais
-SalariesStatistics=Estatísticas salariais
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/pt_PT/stocks.lang b/htdocs/langs/pt_PT/stocks.lang
index 029f564a5b1..8295713a569 100644
--- a/htdocs/langs/pt_PT/stocks.lang
+++ b/htdocs/langs/pt_PT/stocks.lang
@@ -3,7 +3,7 @@ WarehouseCard=Ficha do armazém
 Warehouse=Armazém
 Warehouses=Armazéns
 ParentWarehouse=Armazém Principal
-NewWarehouse=Novo armazém / área de stock
+NewWarehouse=New warehouse / Stock Location
 WarehouseEdit=Modificar armazém
 MenuNewWarehouse=Novo armazém
 WarehouseSource=Armazem Origem
@@ -29,6 +29,8 @@ MovementId=Id. do Movimento
 StockMovementForId=Id. do Movimento %d
 ListMouvementStockProject=Lista de movimentos de estoque associados ao projeto
 StocksArea=Área de armazéns
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
 Location=Localização
 LocationSummary=Nome abreviado da localização
 NumberOfDifferentProducts=Número de produtos diferentes
@@ -53,7 +55,7 @@ PMPValue=Valor (PMP)
 PMPValueShort=PMP
 EnhancedValueOfWarehouses=Valor de stocks
 UserWarehouseAutoCreate=Crie um armazém de usuários automaticamente ao criar um usuário
-AllowAddLimitStockByWarehouse=Permitir adicionar limite e estoque desejado por par (produto, armazém) em vez de por produto
+AllowAddLimitStockByWarehouse=Manage also values for minimum and desired stock per pairing (product-warehouse) in addition to values per product
 IndependantSubProductStock=Estoque de produto e subproduto são independentes
 QtyDispatched=Quantidade desagregada
 QtyDispatchedShort=Qt. despachada
@@ -62,12 +64,14 @@ OrderDispatch=Receção da encomenda
 RuleForStockManagementDecrease=Escolha Regra para redução automática de estoque (a redução manual é sempre possível, mesmo se uma regra de redução automática estiver ativada)
 RuleForStockManagementIncrease=Escolha Regra para aumento automático de estoque (o aumento manual é sempre possível, mesmo se uma regra de aumento automático estiver ativada)
 DeStockOnBill=Diminuir estoques reais na validação da fatura / nota de crédito do cliente
-DeStockOnValidateOrder=Diminuir estoques reais na validação do pedido do cliente
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
 DeStockOnShipment=Diminuir stocks reais ao validar a expedição
-DeStockOnShipmentOnClosing=Diminuir estoques reais na classificação de remessa fechada
-ReStockOnBill=Aumentar os estoques reais na validação da fatura / nota de crédito do fornecedor
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
 ReStockOnValidateOrder=Aumentar estoques reais na aprovação do pedido
-ReStockOnDispatchOrder=Aumentar estoques reais no envio manual para o depósito, após o recebimento do pedido pelo fornecedor
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=A encomenda não está pronta para o despacho dos produtos no stock dos armazéns.
 StockDiffPhysicTeoric=Explicação da diferença entre estoque físico e virtual
 NoPredefinedProductToDispatch=Nenhum produto predefinido para este objeto. Portanto, não é necessário enviar despachos em stock.
@@ -75,12 +79,12 @@ DispatchVerb=Expedição
 StockLimitShort=Limite para alerta
 StockLimit=Limite de estoque para alerta
 StockLimitDesc=(vazio) significa que não há aviso. <br> 0 pode ser usado para um aviso assim que o estoque estiver vazio.
-PhysicalStock=Stock físico
+PhysicalStock=Physical Stock
 RealStock=Stock real
-RealStockDesc=O estoque físico ou real é o estoque que você tem atualmente em seus armazéns / locais internos.
-RealStockWillAutomaticallyWhen=O estoque real será alterado automaticamente de acordo com essas regras (consulte a configuração do módulo de estoque para alterar isso):
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Stock virtual
-VirtualStockDesc=O estoque virtual é o estoque que você receberá uma vez que todas as ações pendentes abertas que afetam os estoques serão fechadas (pedido do fornecedor recebido, pedido do cliente enviado, ...)
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
 IdWarehouse=Id. armazem
 DescWareHouse=Descrição armazem
 LieuWareHouse=Localização armazem
@@ -100,7 +104,7 @@ ThisWarehouseIsPersonalStock=Este armazém representa stock pessoal de %s %s
 SelectWarehouseForStockDecrease=Escolha depósito a ser usado para diminuição de ações
 SelectWarehouseForStockIncrease=Escolha depósito a ser usado para aumentar stock
 NoStockAction=Nenhuma ação de estoque
-DesiredStock=Estoque ideal desejado
+DesiredStock=Desired Stock
 DesiredStockDesc=Esse valor do estoque será o valor usado para preencher o estoque pelo recurso de reabastecimento.
 StockToBuy=Pedir
 Replenishment=Reabastecimento
@@ -113,13 +117,13 @@ CurentSelectionMode=Modo de seleção atual
 CurentlyUsingVirtualStock=Stock virtual
 CurentlyUsingPhysicalStock=Stock físico
 RuleForStockReplenishment=Regra para reabastecimento de estoques
-SelectProductWithNotNullQty=Selecione pelo menos um produto com uma quantidade não nula e um fornecedor
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
 AlertOnly= Só Alertas
 WarehouseForStockDecrease=O depósito <b> %s </ b> será usado para redução de estoque
 WarehouseForStockIncrease=O depósito <b> %s </ b> será usado para aumentar o estoque
 ForThisWarehouse=Para este armazém
-ReplenishmentStatusDesc=Esta é uma lista de todos os produtos com um estoque menor do que o estoque desejado (ou menor que o valor de alerta, se a caixa de seleção "somente alerta" estiver marcada). Usando a caixa de seleção, você pode criar pedidos de fornecedores para preencher a diferença.
-ReplenishmentOrdersDesc=Esta é uma lista de todos os pedidos de fornecedores abertos, incluindo produtos predefinidos. Somente pedidos abertos com produtos predefinidos, portanto, os pedidos que podem afetar os estoques são visíveis aqui.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Reabastecimentos
 NbOfProductBeforePeriod=Quantidade de produto %s em estoque antes do período selecionado (<%s)
 NbOfProductAfterPeriod=Quantidade de produto %s em estoque após o período selecionado (> %s)
@@ -143,11 +147,11 @@ ShowWarehouse=Mostrar armazém
 MovementCorrectStock=Correção de estoque para o produto %s
 MovementTransferStock=Transferência de estoque do produto %s para outro depósito
 InventoryCodeShort=Inv./Mov. código
-NoPendingReceptionOnSupplierOrder=Não há recepção pendente devido a pedido de fornecedor aberto
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
 ThisSerialAlreadyExistWithDifferentDate=Este lote / número de série (<strong> %s </ strong>) já existe, mas com data diferente de eatby ou sellby (encontrado <strong> %s </ strong>, mas você insere <strong> %s </ strong>).
 OpenAll=Aberto para todas as ações
 OpenInternal=Aberto somente para ações internas
-UseDispatchStatus=Usar um status de despacho (aprovar / recusar) para linhas de produtos na recepção de pedidos do fornecedor
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
 OptionMULTIPRICESIsOn=A opção "vários preços por segmento" está ativada. Isso significa que um produto tem vários preços de venda, portanto, o valor para venda não pode ser calculado
 ProductStockWarehouseCreated=Limite de estoque para estoque ideal de alerta e desejado criado corretamente
 ProductStockWarehouseUpdated=Limite de estoque para estoque ótimo de alerta e desejado atualizado corretamente
@@ -171,16 +175,16 @@ inventoryValidate=Validado
 inventoryDraft=Em Serviço
 inventorySelectWarehouse=Escolha do armazém
 inventoryConfirmCreate=Criar
-inventoryOfWarehouse=Inventário para depósito: %s
-inventoryErrorQtyAdd=Erro: uma quantidade é menor que zero
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
 inventoryMvtStock=Por inventário
 inventoryWarningProductAlreadyExists=Este produto já está na lista
 SelectCategory=Filtro por categoría
-SelectFournisseur=Filtro de fornecedores
+SelectFournisseur=Vendor filter
 inventoryOnDate=Inventário
-INVENTORY_DISABLE_VIRTUAL=Permitir não desmontar produto filho de um kit no inventário
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
 INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use o preço de compra se não for possível encontrar o último preço de compra
-INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Movimento de estoque tem data de inventário
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement has date of inventory
 inventoryChangePMPPermission=Permitir alterar o valor do PMP para um produto
 ColumnNewPMP=Nova unidade PMP
 OnlyProdsInStock=Não adicione produto sem estoque
@@ -202,7 +206,7 @@ inventoryDeleteLine=Apagar a linha
 RegulateStock=Regular estoque
 ListInventory=Lista
 StockSupportServices=Gestão de stocks suporta serviços
-StockSupportServicesDesc=Por padrão, você pode estocar somente produtos com o tipo "produto". Se ativado, e se o serviço de módulo estiver ativado, também é possível estocar um produto com o tipo "serviço"
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
 ReceiveProducts=Receber itens
 StockIncreaseAfterCorrectTransfer=Aumentar por correção / transferência
 StockDecreaseAfterCorrectTransfer=Diminuir pela correção / transferência
diff --git a/htdocs/langs/pt_PT/website.lang b/htdocs/langs/pt_PT/website.lang
index 262cc348365..c98603548d7 100644
--- a/htdocs/langs/pt_PT/website.lang
+++ b/htdocs/langs/pt_PT/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/pt_PT/withdrawals.lang b/htdocs/langs/pt_PT/withdrawals.lang
index 2b25184b8ad..36049ddec43 100644
--- a/htdocs/langs/pt_PT/withdrawals.lang
+++ b/htdocs/langs/pt_PT/withdrawals.lang
@@ -18,14 +18,14 @@ InvoiceWaitingWithdraw=Fatura a aguardar por débito direto
 AmountToWithdraw=Quantidade a Levantar
 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
+ResponsibleUser=User Responsible
 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=Últimos recibos de débito direto %s
 MakeWithdrawRequest=Efetuar um pedido de pagamento por débito direto
 WithdrawRequestsDone=Pedidos de pagamento por débito direto %s registrados
-ThirdPartyBankCode=Código Banco do Terceiro
+ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=Nenhuma fatura debitada com sucesso. Verifique se as faturas estão em empresas com um IBAN válido e se o IBAN tem uma UMR (Unique Mandate Reference) com o modo <strong> %s </ strong>.
 ClassCredited=Classificar como creditado
 ClassCreditedConfirm=Tem a certeza que quer classificar este débito direto como creditado na sua conta bancária?
@@ -50,7 +50,7 @@ StatusMotif0=Não especificado
 StatusMotif1=Fundos insuficientes
 StatusMotif2=Pedido contestado
 StatusMotif3=Nenhum pedido de pagamento por débito direto
-StatusMotif4=Encomenda de cliente
+StatusMotif4=Sales Order
 StatusMotif5=RIB inutilizável
 StatusMotif6=Conta sem saldo
 StatusMotif7=Decisão Judicial
@@ -66,11 +66,11 @@ NotifyCredit=levantamento de crédito
 NumeroNationalEmetter=Número Nacional de Transmissor
 WithBankUsingRIB=Para contas bancárias usando RIB
 WithBankUsingBANBIC=Para contas bancárias usando IBAN / BIC / SWIFT
-BankToReceiveWithdraw=Conta bancária para receber débito direto
+BankToReceiveWithdraw=Receiving Bank Account
 CreditDate=Crédito em
 WithdrawalFileNotCapable=Não é possível gerar o arquivo de recibo de retirada para o seu país %s (Seu país não é suportado)
-ShowWithdraw=Mostrar levantamento
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=No entanto, se a fatura tiver pelo menos um pagamento ainda não processado, não será definida como paga para permitir o gestão do pagamento anterior.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=Essa guia permite que você solicite uma ordem de pagamento por débito direto. Uma vez feito, entre no menu Banco-> Débito Direto para administrar a ordem de pagamento por débito direto. Quando a ordem de pagamento é encerrada, o pagamento na fatura será registrado automaticamente e a fatura será encerrada se o restante a pagar for nulo.
 WithdrawalFile=arquivo retirado
 SetToStatusSent=Definir o estado como "Ficheiro Enviado"
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=Isso também registrará os pagamentos para as f
 StatisticsByLineStatus=Estatísticas por status de linhas
 RUM=UMR
 RUMLong=Referência de mandato exclusivo
-RUMWillBeGenerated=Se estiver vazio, o número de UMR será gerado assim que as informações da conta bancária forem salvas
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Modo de débito direto (FRST ou RECUR)
 WithdrawRequestAmount=Quantidade de solicitação de débito direto:
 WithdrawRequestErrorNilAmount=Não é possível criar um pedido de débito direto para o valor vazio.
@@ -87,13 +87,13 @@ SepaMandateShort=Mandato SEPA
 PleaseReturnMandate=Por favor, devolva este formulário de mandato por e-mail para %s ou por e-mail para
 SEPALegalText=Ao assinar este formulário de mandato, você autoriza (A) %s a enviar instruções ao seu banco para debitar sua conta e (B) seu banco a debitar sua conta de acordo com as instruções de %s. Como parte de seus direitos, você tem direito a um reembolso de seu banco, de acordo com os termos e condições de seu contrato com seu banco. Um reembolso deve ser solicitado no prazo de oito semanas a partir da data em que sua conta foi debitada. Seus direitos em relação ao mandato acima são explicados em uma declaração que você pode obter do seu banco.
 CreditorIdentifier=Identificador do Credor
-CreditorName=Nome do Credor
+CreditorName=Creditor Name
 SEPAFillForm=(B) Por favor, preencha todos os campos marcados com *
 SEPAFormYourName=O seu nome
 SEPAFormYourBAN=O nome da sua conta bancária (IBAN)
 SEPAFormYourBIC=Seu código de identificação bancária (BIC)
 SEPAFrstOrRecur=Tipo de pagamento
-ModeRECUR=Pagamento Recorrente
+ModeRECUR=Recurring payment
 ModeFRST=Pagamento único
 PleaseCheckOne=Por favor, marque apenas um
 DirectDebitOrderCreated=Ordem de débito direto %s criada
@@ -102,6 +102,10 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Data de execução
 CreateForSepa=Criar ficheiro de débito direto
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
 
 ### Notifications
 InfoCreditSubject=Pagamento da ordem de pagamento de débito direto %s pelo banco
diff --git a/htdocs/langs/ro_RO/accountancy.lang b/htdocs/langs/ro_RO/accountancy.lang
index 09bd7419c85..aa81f9c0a8d 100644
--- a/htdocs/langs/ro_RO/accountancy.lang
+++ b/htdocs/langs/ro_RO/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Consultați aici lista clienților și furnizorilor terți
 ListAccounts=Lista conturilor contabile
 UnknownAccountForThirdparty=Cont terț necunoscut. Vom folosi %s
 UnknownAccountForThirdpartyBlocking=Cont terț necunoscut. Eroare de blocare
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Contul terț nu este definit sau este necunoscut. Eroare de blocare.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Contul terț nu este definit sau este necunoscut. Eroare de blocare.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Conturile terț și de așteptare necunoscute nu sunt definite. Eroare de blocare
 PaymentsNotLinkedToProduct=Plata nu legată de vreun produs/serviciu
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Export pentru Cogilog
 Modelcsv_agiris=Export pentru Agiris
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Exportați CSV configurabil
-Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Id-ul listei de conturi
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Fără un cont dedicat valabil
 WithValidAccount=Cu un cont dedicat valabil
 ValueNotIntoChartOfAccount=Această valoare a contului contabil nu există în planul de conturi
 AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Rang cont contabil
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Linii care nu sunt încă legate, utilizați meniul <
 
 ## Import
 ImportAccountingEntries=Intrările contabile
-
+DateExport=Date export
 WarningReportNotReliable=Atenție, acest raport nu se bazează pe registrul contabil, deci nu conține o tranzacție modificată manual în registru contabil. Dacă jurnalele dvs. sunt actualizate, vizualizarea contabilă este mai precisă.
 ExpenseReportJournal=Jurnalul raportului de cheltuieli
 InventoryJournal=Jurnal inventar
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index 006b0777335..97849658f83 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=Această zonă oferă funcții de administrare. Utilizați m
 Purge=Curăţenie
 PurgeAreaDesc=Această pagină vă permite să ștergeți toate fișierele generate sau stocate de Dolibarr (fișiere temporare sau toate fișierele din directorul <b> %s </b>). Utilizarea acestei funcții nu este în mod normal necesară. Este oferită ca soluție pentru utilizatorii care găzduiesc Dolibarr la un furnizor care nu oferă permisiuni de ștergere a fișierelor generate de serverul web.
 PurgeDeleteLogFile=Ștergeți fișierele din jurnal, inclusiv <b> %s </ b> definite pentru modulul Syslog (fără risc de pierdere a datelor)
-PurgeDeleteTemporaryFiles=Ştergere toate fişierele temporare (fără riscul de a pierde date)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Sterge fisiere temporare
 PurgeDeleteAllFilesInDocumentsDir=Ștergeți toate fișierele din directorul: <b>%s</b>.<br>\nAceasta va șterge toate documentele generate legate de elemente (terțe părți, facturi etc.), fișierele încărcate în modulul ECM, gropile de rezervă pentru baze de date și fișierele temporare . 
 PurgeRunNow=Elimină acum
@@ -804,6 +804,7 @@ Permission401=Citiţi cu reduceri
 Permission402=Creare / Modificare reduceri
 Permission403=Validate reduceri
 Permission404=Ştergere reduceri
+Permission430=Use Debug Bar
 Permission511=Citire salarii
 Permission512=Creare / Modificare plata salariilor 
 Permission514=Şterge plata salariilor 
@@ -818,6 +819,9 @@ Permission532=Creare / Modificare servicii
 Permission534=Ştergere servicii
 Permission536=A se vedea / administra serviciile ascunse
 Permission538=Exportul de servicii
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Citiţi donaţii
 Permission702=Creare / Modificare donaţii
 Permission703=Ştergere donaţii
@@ -837,6 +841,12 @@ Permission1101=Citiţi cu livrare comenzi
 Permission1102=Creare / Modificare ordine de livrare
 Permission1104=Validate livrarea comenzilor
 Permission1109=Ştergere livrarea comenzilor
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Citiţi cu furnizorii
 Permission1182=Citiți purchase orders
 Permission1183=Creați/modificați comenzile de achiziţie
@@ -859,16 +869,6 @@ Permission1251=Run masa importurile de date externe în baza de date (date de sa
 Permission1321=Export client facturi, atribute şi plăţile
 Permission1322=Redeschide o factură plătită
 Permission1421=Exportaţi comenzi de vânzări și atribute
-Permission20001=Citiți cererile de concediu (concediul dvs. și cele ale subordonaților dvs)
-Permission20002=Creați/modificați cererile dvs. de concediu (concediul și cele ale subordonaților dvs.)
-Permission20003=Şterge cererile de concediu
-Permission20004=Citiți toate solicitările de concediu (chiar și pentru utilizatori care nu sunt subordonați)
-Permission20005=Creați/modificați solicitările de concediu pentru toată lumea (chiar și pentru utilizatorii care nu sunt subordonați)
-Permission20006=Solicitări de concediu ale administrării (gestionare si actualizare balanţă)
-Permission23001=Citeste Joburi programate
-Permission23002=Creare/Modificare job programat
-Permission23003=Şterge Joburi programate
-Permission23004=Execută Joburi programate
 Permission2401=Citeşte acţiuni (evenimente sau sarcini) legate de acest cont
 Permission2402=Crea / modifica / delete acţiuni (evenimente sau sarcini) legate de acest cont
 Permission2403=Citeşte acţiuni (evenimente sau sarcini) de alţii
@@ -882,9 +882,41 @@ Permission2503=Trimite sau şterge documente
 Permission2515=Setup documente directoare
 Permission2801=Folosiți client FTP în modul de citire (numai navigare și descărcare )
 Permission2802=Folosiți client FTP în modul de scriere (ştergere şi încărcare fişiere )
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Citiți cererile de concediu (concediul dvs. și cele ale subordonaților dvs)
+Permission20002=Creați/modificați cererile dvs. de concediu (concediul și cele ale subordonaților dvs.)
+Permission20003=Şterge cererile de concediu
+Permission20004=Citiți toate solicitările de concediu (chiar și pentru utilizatori care nu sunt subordonați)
+Permission20005=Creați/modificați solicitările de concediu pentru toată lumea (chiar și pentru utilizatorii care nu sunt subordonați)
+Permission20006=Solicitări de concediu ale administrării (gestionare si actualizare balanţă)
+Permission23001=Citeste Joburi programate
+Permission23002=Creare/Modificare job programat
+Permission23003=Şterge Joburi programate
+Permission23004=Execută Joburi programate
 Permission50101=Utilizați punctul de vânzări
 Permission50201=Citeşte tranzacţii
 Permission50202=Tranzacţiilor de import
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Printare
 Permission55001=Cieşte sondaje
 Permission55002=Creare / Modificare sondaje
@@ -1078,7 +1110,7 @@ AreaForAdminOnly=Parametrii de configurare pot fi setați numai de <b> utilizato
 SystemInfoDesc=Sistemul de informare este diverse informaţii tehnice ai citit doar în modul şi vizibil doar pentru administratori.
 SystemAreaForAdminOnly=Acest zonă este disponibilă numai administratori. Permisiunile utilizatorilor Dolibarr nu pot modifica această restricție
 CompanyFundationDesc=Editați informațiile companiei / entității. Click pe "%s" sau "%s" din partea de jos a paginii.
-AccountantDesc=Editați detaliile contabilului/angajatului la contabilitate
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parametrii care afectează aspectul şi comportamentul  Dolibarr pot fi modificaţi aici.
 AvailableModules=Aplicații/module disponibile 
@@ -1891,3 +1923,5 @@ IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute s
 UrlForIFTTT=URL endpoint for IFTTT
 YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/ro_RO/banks.lang b/htdocs/langs/ro_RO/banks.lang
index bc5ea989653..fde1561a69e 100644
--- a/htdocs/langs/ro_RO/banks.lang
+++ b/htdocs/langs/ro_RO/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=Nu este conciliat
 CustomerInvoicePayment=Plată Client
 SupplierInvoicePayment=Plata furnizorului
 SubscriptionPayment=Plată cotizaţie
-WithdrawalPayment=Retragerea de plată
+WithdrawalPayment=Ordin de plată de debit
 SocialContributionPayment=Plata taxe sociale sau fiscale și tva
 BankTransfer=Virament bancar
 BankTransfers=Viramente 
diff --git a/htdocs/langs/ro_RO/cashdesk.lang b/htdocs/langs/ro_RO/cashdesk.lang
index 48bed8242c1..e2a977af7b8 100644
--- a/htdocs/langs/ro_RO/cashdesk.lang
+++ b/htdocs/langs/ro_RO/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/ro_RO/mails.lang b/htdocs/langs/ro_RO/mails.lang
index 73c32aac4bc..6a37037c8c4 100644
--- a/htdocs/langs/ro_RO/mails.lang
+++ b/htdocs/langs/ro_RO/mails.lang
@@ -19,6 +19,8 @@ MailTopic=Temă pentru e-mail
 MailText=Mesaj
 MailFile=Fişiere ataşate
 MailMessage=Continut Email
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
 ShowEMailing=Arata email-uri
 ListOfEMailings=Lista de emailings
 NewMailing=Nou email-uri
@@ -76,9 +78,9 @@ GroupEmails=Grup de emailuri
 OneEmailPerRecipient=Un email pentru fiecare destinatar (în mod implicit, un email selectat pentru fiecare înregistrare )
 WarningIfYouCheckOneRecipientPerEmail=Atenție, dacă bifați această casetă, înseamnă că va fi trimis un singur email pentru mai multe înregistrări sectate, deci dacă mesajul dvs. conține variabile de substituție care se referă la datele unei înregistrări, nu este posibil să le înlocuiți.
 ResultOfMailSending=Rezultatul trimiterii de email în masă
-NbSelected=Nr. selectat
-NbIgnored=Nr. ignorat
-NbSent=Nr. trimis
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages= %s Mesaj(e) trimise.
 ConfirmUnvalidateEmailing=Sigur doriți să schimbați emailul <b> %s </b> la starea de schiţă?
 MailingModuleDescContactsWithThirdpartyFilter=Contactați filtrele clienților
diff --git a/htdocs/langs/ro_RO/members.lang b/htdocs/langs/ro_RO/members.lang
index 38de939cf93..531ffe93732 100644
--- a/htdocs/langs/ro_RO/members.lang
+++ b/htdocs/langs/ro_RO/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=Alege statisticile pe care doriţi să le citiţi ...
 MenuMembersStats=Statistici
 LastMemberDate=Ultima dată de membru
 LatestSubscriptionDate=Ultima dată de abonament
-Nature=Personalitate juridică
+MemberNature=Nature of member
 Public=Profil public
 NewMemberbyWeb=Membru nou adăugat. În aşteptarea validării
 NewMemberForm=Formular Membru nou
diff --git a/htdocs/langs/ro_RO/products.lang b/htdocs/langs/ro_RO/products.lang
index 95a608ea2c7..2d55290f69f 100644
--- a/htdocs/langs/ro_RO/products.lang
+++ b/htdocs/langs/ro_RO/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Prețurile furnizorului
 SuppliersPricesOfProductsOrServices=Prețurile furnizorilor (de produse sau servicii)
 CustomCode=Cod Vamal / Marfă / SA
 CountryOrigin=Ţara de origine
-Nature=Tipul produsului (material / finisat)
+Nature=Nature of produt (material/finished)
 ShortLabel=Etichetă scurta
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/ro_RO/salaries.lang b/htdocs/langs/ro_RO/salaries.lang
index 5daf6f7a489..42fb640a9c2 100644
--- a/htdocs/langs/ro_RO/salaries.lang
+++ b/htdocs/langs/ro_RO/salaries.lang
@@ -1,18 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger 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=Contul contabil utilizat pentru terț utilizator
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Contul contabil dedicat definit pe cardul de utilizator va fi utilizat doar pentru contabilitatea subregistru. Aceasta va fi utilizată pentru Registrul general și ca valoare implicită a contabilității suregistru dacă nu este definită contul de contabilitate dedicat pentru utilizatori.
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Contul de contabilitate implicit pentru plata salariilor
 Salary=Salariu
 Salaries=Salarii
 NewSalaryPayment=Plata noua salariu
+AddSalaryPayment=Adăugați plata salarială
 SalaryPayment=Plata salariu
 SalariesPayments=Plati salarii
 ShowSalaryPayment=Arata plata salariu
-THM=Average hourly rate
-TJM=Average daily rate
+THM=Rata orară medie
+TJM=Rata medie zilnică
 CurrentSalary=Salariu curent
-THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
-TJMDescription=This value is currently as information only and is not used for any calculation
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
-SalariesStatistics=Statistiques salaires
+THMDescription=Această valoare poate fi utilizată pentru a calcula costul timpului consumat pe un proiect introdus de utilizatori dacă se utilizează un proiect de modul
+TJMDescription=Această valoare este în prezent doar informativă și nu este utilizată pentru niciun calcul
+LastSalaries=Cele mai recente %splăți salariale
+AllSalaries=Toate plățile salariale
+SalariesStatistics=Statistici salariale
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/ro_RO/stocks.lang b/htdocs/langs/ro_RO/stocks.lang
index f7a64cd0ed1..fb108f85f35 100644
--- a/htdocs/langs/ro_RO/stocks.lang
+++ b/htdocs/langs/ro_RO/stocks.lang
@@ -66,10 +66,12 @@ RuleForStockManagementIncrease=Alegeți regula pentru creșterea automată a sto
 DeStockOnBill=Reduceți stocurile reale la validarea facturii client / notei de credit
 DeStockOnValidateOrder=Reduceți stocurile reale la validarea ordinului de vânzări
 DeStockOnShipment=Descreşte stocul fizic bazat pe validarea livrarilor
-DeStockOnShipmentOnClosing=Reduceți stocurile reale la clasificarea maritimă închisă
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
 ReStockOnBill=Creșteți stocurile reale la validarea facturii vânzătorului / notei de credit
 ReStockOnValidateOrder=Creșterea stocurilor reale la aprobarea comenzii de achiziție
 ReStockOnDispatchOrder=Creșterea stocurilor reale la expedierea manuală în depozit, după primirea comenzii de cumpărare a bunurilor
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=Comanda nu mai este sau nu mai are  un statut care să permită dipecerizarea produselor în depozit
 StockDiffPhysicTeoric=Explicație pentru diferența dintre stocul fizic și virtual
 NoPredefinedProductToDispatch=Nu sunt produse predefinite pentru acest obiect. Deci, nici o dispecerizare  în stoc necesară.
diff --git a/htdocs/langs/ro_RO/website.lang b/htdocs/langs/ro_RO/website.lang
index f250cd13e96..88d70505887 100644
--- a/htdocs/langs/ro_RO/website.lang
+++ b/htdocs/langs/ro_RO/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/ro_RO/withdrawals.lang b/htdocs/langs/ro_RO/withdrawals.lang
index 05a69737f1f..8468953f95a 100644
--- a/htdocs/langs/ro_RO/withdrawals.lang
+++ b/htdocs/langs/ro_RO/withdrawals.lang
@@ -69,8 +69,8 @@ WithBankUsingBANBIC=Pentru conturile bancare folosind codul IBAN / BIC / SWIFT
 BankToReceiveWithdraw=Primirea contului bancar
 CreditDate=Credit pe
 WithdrawalFileNotCapable=Imposibil de a genera fișierul chitanţă de retragere pentru țara dvs %s (Țara dvs. nu este acceptată)
-ShowWithdraw=Arată Retragere
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Cu toate acestea, dacă factura are cel puțin o plată de retragere  încă neprelucrată, aceasta nu va fi setată ca plătită permite în  prealabil gestionarea retragerii.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=Această filă vă permite să solicitați un ordin de plată prin debitare directă. După ce ați terminat, accesați meniul Banca-> Comenzi de debit direct pentru a gestiona comanda de plată prin debitare directă. Atunci când ordinul de plată este închis, plata pe factură va fi înregistrată automat, iar factura va fi închisă dacă restul de plată este nul.
 WithdrawalFile=Fişier Retragere
 SetToStatusSent=Setează statusul "Fişier Trimis"
diff --git a/htdocs/langs/ru_RU/accountancy.lang b/htdocs/langs/ru_RU/accountancy.lang
index 2b7279ae30c..b4c2e9a6f16 100644
--- a/htdocs/langs/ru_RU/accountancy.lang
+++ b/htdocs/langs/ru_RU/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Consult here the list of third-party customers and vendors
 ListAccounts=Список бухгалтерских счетов
 UnknownAccountForThirdparty=Unknown third-party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
-Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Without valid dedicated account
 WithValidAccount=With valid dedicated account
 ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
 AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Range of accounting account
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
-
+DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
index 2356df7c003..c46c80ab9f8 100644
--- a/htdocs/langs/ru_RU/admin.lang
+++ b/htdocs/langs/ru_RU/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Очистить
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Удаление файлов журналов, включая <b>%s</b> определенный для модуля Syslog (без риска потери данных)
-PurgeDeleteTemporaryFiles=Удалить все временные файлы (без риска потери данных)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Удаление временных файлов
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Очистить сейчас
@@ -804,6 +804,7 @@ Permission401=Читать скидки
 Permission402=Создать / изменить скидки
 Permission403=Проверить скидки
 Permission404=Удалить скидки
+Permission430=Use Debug Bar
 Permission511=Read payments of salaries
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
@@ -818,6 +819,9 @@ Permission532=Создать / изменить услуги
 Permission534=Удаление услуг
 Permission536=Смотреть / Управлять скрытыми услугами
 Permission538=Экспорт услуг
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Просмотр пожертвований
 Permission702=Создание / изменение пожертвований
 Permission703=Удаление пожертвований
@@ -837,6 +841,12 @@ Permission1101=Просмотр доставки заказов
 Permission1102=Создание / изменение доставки заказов
 Permission1104=Подтверждение доставки заказов
 Permission1109=Удаление доставки заказов
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Просмотр поставщиков
 Permission1182=Read purchase orders
 Permission1183=Create/modify purchase orders
@@ -859,16 +869,6 @@ Permission1251=Запуск массового импорта внешних д
 Permission1321=Экспорт клиентом счета-фактуры, качества и платежей
 Permission1322=Повторно открыть оплаченный счет
 Permission1421=Export sales orders and attributes
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
-Permission20003=Удалить заявления на отпуск
-Permission20004=Читайте все запросы на отпуск (даже пользователь не подчиняется)
-Permission20005=Создавать/изменять запросы на отпуск для всех (даже для пользователей, не подчиненных)
-Permission20006=Запросы на отпуск для партнеров (настройка и обновление баланса)
-Permission23001=Просмотр Запланированных задач
-Permission23002=Создать/обновить Запланированную задачу
-Permission23003=Удалить Запланированную задачу
-Permission23004=Выполнить запланированную задачу
 Permission2401=Посмотреть действия (события или задачи), связанные с его учетной записью
 Permission2402=Создание / изменение / удаление действий (события или задачи), связанные с его учетной записью
 Permission2403=Удаление действий (задачи, события или) связанных с его учетной записью
@@ -882,9 +882,41 @@ Permission2503=Отправить или удалить документы
 Permission2515=Настройка директорий документов
 Permission2801=Использовать FTP  клиент в режиме только чтения (только просмотр и загрузка файлов)
 Permission2802=Использовать FTP клиент в режиме записи (удаление или выгрузка файлов)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
+Permission20003=Удалить заявления на отпуск
+Permission20004=Читайте все запросы на отпуск (даже пользователь не подчиняется)
+Permission20005=Создавать/изменять запросы на отпуск для всех (даже для пользователей, не подчиненных)
+Permission20006=Запросы на отпуск для партнеров (настройка и обновление баланса)
+Permission23001=Просмотр Запланированных задач
+Permission23002=Создать/обновить Запланированную задачу
+Permission23003=Удалить Запланированную задачу
+Permission23004=Выполнить запланированную задачу
 Permission50101=Use Point of Sale
 Permission50201=Просмотр транзакций
 Permission50202=Импорт транзакций
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Печать
 Permission55001=Открыть опросы
 Permission55002=Создать/изменить опросы
@@ -1078,7 +1110,7 @@ AreaForAdminOnly=Параметры настройки могут быть ус
 SystemInfoDesc=Система информации разного техническую информацию Вы получите в режиме только для чтения и видимые только для администраторов.
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
-AccountantDesc=Edit the details of your accountant/bookkeeper
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Доступное приложение/модули
@@ -1891,3 +1923,5 @@ IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute s
 UrlForIFTTT=URL endpoint for IFTTT
 YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/ru_RU/banks.lang b/htdocs/langs/ru_RU/banks.lang
index 825ad45c19c..a7b6fd67d61 100644
--- a/htdocs/langs/ru_RU/banks.lang
+++ b/htdocs/langs/ru_RU/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=Не согласовано
 CustomerInvoicePayment=Заказчиком оплаты
 SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Абонентская плата
-WithdrawalPayment=Снятие оплаты
+WithdrawalPayment=Debit payment order
 SocialContributionPayment=Социальный/налоговый сбор
 BankTransfer=Банковский перевод
 BankTransfers=Банковские переводы
diff --git a/htdocs/langs/ru_RU/cashdesk.lang b/htdocs/langs/ru_RU/cashdesk.lang
index fb42546d199..2a83680e420 100644
--- a/htdocs/langs/ru_RU/cashdesk.lang
+++ b/htdocs/langs/ru_RU/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/ru_RU/mails.lang b/htdocs/langs/ru_RU/mails.lang
index 8d9a2902213..b059b4ada96 100644
--- a/htdocs/langs/ru_RU/mails.lang
+++ b/htdocs/langs/ru_RU/mails.lang
@@ -19,6 +19,8 @@ MailTopic=Email topic
 MailText=Сообщение
 MailFile=Присоединенные файлы
 MailMessage=Текст Email
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
 ShowEMailing=Показать адреса
 ListOfEMailings=Список emailings
 NewMailing=Новый адрес
@@ -76,9 +78,9 @@ GroupEmails=Group emails
 OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
 WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
 ResultOfMailSending=Result of mass Email sending
-NbSelected=No. selected
-NbIgnored=No. ignored
-NbSent=No. sent
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
diff --git a/htdocs/langs/ru_RU/members.lang b/htdocs/langs/ru_RU/members.lang
index a4328089382..bb7d48fff39 100644
--- a/htdocs/langs/ru_RU/members.lang
+++ b/htdocs/langs/ru_RU/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=Выберите статистику вы хотите п
 MenuMembersStats=Статистика
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
-Nature=Природа
+MemberNature=Nature of member
 Public=Информационные общественности (нет = частных)
 NewMemberbyWeb=Новый участник добавил. В ожидании утверждения
 NewMemberForm=Новая форма члена
diff --git a/htdocs/langs/ru_RU/products.lang b/htdocs/langs/ru_RU/products.lang
index f394042923f..31e9c9901e9 100644
--- a/htdocs/langs/ru_RU/products.lang
+++ b/htdocs/langs/ru_RU/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Таможенный / Товарный / HS код
 CountryOrigin=Страна происхождения
-Nature=Product Type (material/finished)
+Nature=Nature of produt (material/finished)
 ShortLabel=Короткая метка
 Unit=Единица
 p=u.
diff --git a/htdocs/langs/ru_RU/salaries.lang b/htdocs/langs/ru_RU/salaries.lang
index 47be3c234a0..b8079813a21 100644
--- a/htdocs/langs/ru_RU/salaries.lang
+++ b/htdocs/langs/ru_RU/salaries.lang
@@ -1,18 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger 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_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
 Salary=Зарплата
 Salaries=Зарплаты
 NewSalaryPayment=Новая выплата зарплаты
+AddSalaryPayment=Add salary payment
 SalaryPayment=Выплата зарплаты
 SalariesPayments=Выплата зарплат
 ShowSalaryPayment=Показать выплату зарплаты
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Текущая зарплата
-THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
-TJMDescription=This value is currently as information only and is not used for any calculation
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
-SalariesStatistics=Statistiques salaires
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/ru_RU/stocks.lang b/htdocs/langs/ru_RU/stocks.lang
index acb796af830..ca909e13642 100644
--- a/htdocs/langs/ru_RU/stocks.lang
+++ b/htdocs/langs/ru_RU/stocks.lang
@@ -3,7 +3,7 @@ WarehouseCard=Карточка склада
 Warehouse=Склад
 Warehouses=Склады
 ParentWarehouse=Parent warehouse
-NewWarehouse=Новый склад / Фондовый области
+NewWarehouse=New warehouse / Stock Location
 WarehouseEdit=Редактировать склад
 MenuNewWarehouse=Новый склад
 WarehouseSource=Источник склад
@@ -29,6 +29,8 @@ MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Раздел "Склад"
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
 Location=Вместо
 LocationSummary=Сокращенное наименование расположение
 NumberOfDifferentProducts=Кол-во различных продуктов
@@ -44,7 +46,6 @@ TransferStock=Transfer stock
 MassStockTransferShort=Mass stock transfer
 StockMovement=Stock movement
 StockMovements=Stock movements
-LabelMovement=Отметка о перемещении
 NumberOfUnit=Количество единиц
 UnitPurchaseValue=Себестоимость единицы
 StockTooLow=Фондовый слишком низкими
@@ -54,21 +55,23 @@ PMPValue=Значение
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Склады стоимости
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Allow to add limit and desired stock per couple (product, warehouse) instead of per product
-IndependantSubProductStock=Запас товара на складе и запас суб-товара на складе не связаны
+AllowAddLimitStockByWarehouse=Manage also values for minimum and desired stock per pairing (product-warehouse) in addition to values per product
+IndependantSubProductStock=Product stock and subproduct stock are independent
 QtyDispatched=Количество направил
 QtyDispatchedShort=Кол-во отправлено
 QtyToDispatchShort=Кол-во на отправку
 OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
-RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
-DeStockOnBill=Снижение реальных запасов на счета / кредитных нот
-DeStockOnValidateOrder=Снижение реальных запасов по заказам записки
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
 DeStockOnShipment=Decrease real stocks on shipping validation
-DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification closed
-ReStockOnBill=Увеличение реальных запасов на счета / кредитных нот
-ReStockOnValidateOrder=Increase real stocks on purchase orders approbation
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=Заказ еще не или не более статуса, который позволяет отправку товаров на складе склады.
 StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
 NoPredefinedProductToDispatch=Нет предопределенного продуктов для данного объекта. Так что не диспетчеризации в акции не требуется.
@@ -76,12 +79,12 @@ DispatchVerb=Отправка
 StockLimitShort=Граница предупреждения
 StockLimit=Граница предупреждения о запасе на складе
 StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
-PhysicalStock=Физическая запас
+PhysicalStock=Physical Stock
 RealStock=Real фондовая
-RealStockDesc=Physical or real stock is the stock you currently have into your internal warehouses/emplacements.
-RealStockWillAutomaticallyWhen=The real stock will automatically change according to this rules (see stock module setup to change this):
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Виртуальный запас
-VirtualStockDesc=Virtual stock is the stock you will get once all open pending actions that affect stocks will be closed (supplier order received, customer order shipped, ...)
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
 IdWarehouse=Идентификатор склад
 DescWareHouse=Описание склада
 LieuWareHouse=Локализация склад
@@ -101,7 +104,7 @@ ThisWarehouseIsPersonalStock=Этот склад представляет соб
 SelectWarehouseForStockDecrease=Выберите хранилище, чтобы использовать для снижения акции
 SelectWarehouseForStockIncrease=Выберите склад для использования в запас увеличения
 NoStockAction=No stock action
-DesiredStock=Desired optimal stock
+DesiredStock=Desired Stock
 DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
 StockToBuy=На заказ
 Replenishment=Пополнение
@@ -114,13 +117,13 @@ CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Виртуальный запас
 CurentlyUsingPhysicalStock=Физический запас
 RuleForStockReplenishment=Правило для пополнения запасов
-SelectProductWithNotNullQty=Выберите как минимум один продукт с ненулевым кол-вом и Поставщика
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
 AlertOnly= Только предупреждения
 WarehouseForStockDecrease=Склад <b>%s</b> будет использован для уменьшения остатка
 WarehouseForStockIncrease=Склад <b>%s</b> будет использован для увеличения остатка
 ForThisWarehouse=Для этого склада
-ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is a list of all open supplier orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Пополнения
 NbOfProductBeforePeriod=Количество продукта %s в остатке на начало выбранного периода (< %s)
 NbOfProductAfterPeriod=Количество продукта %s в остатке на конец выбранного периода (< %s)
@@ -130,10 +133,11 @@ RecordMovement=Record transfer
 ReceivingForSameOrder=Получатели заказа
 StockMovementRecorded=Перемещения остатков записаны
 RuleForStockAvailability=Правила и требования к запасу на складе
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever is rule for automatic stock change)
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
+TypeMovement=Type of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -143,11 +147,11 @@ ShowWarehouse=Просмотр склада
 MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Перевозка товара %s на другой склад
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
 OpenAll=Open for all actions
 OpenInternal=Open only for internal actions
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on supplier order reception
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
 OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
 ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
 ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
@@ -171,16 +175,16 @@ inventoryValidate=Утверждена
 inventoryDraft=В работе
 inventorySelectWarehouse=Warehouse choice
 inventoryConfirmCreate=Создать
-inventoryOfWarehouse=Inventory for warehouse : %s
-inventoryErrorQtyAdd=Error : one quantity is leaser than zero
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
 inventoryMvtStock=By inventory
 inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Категория фильтр
-SelectFournisseur=Supplier filter
+SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
 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
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement has date of inventory
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
@@ -195,12 +199,16 @@ AddInventoryProduct=Add product to inventory
 AddProduct=Добавить
 ApplyPMP=Apply PMP
 FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action ?
+ConfirmFlushInventory=Do you confirm this action?
 InventoryFlushed=Inventory flushed
 ExitEditMode=Exit edition
 inventoryDeleteLine=Удалить строки
 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"
+StockSupportServices=Stock management supports Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
 ReceiveProducts=Receive items
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
diff --git a/htdocs/langs/ru_RU/website.lang b/htdocs/langs/ru_RU/website.lang
index 16241e44e31..42bffa2f68c 100644
--- a/htdocs/langs/ru_RU/website.lang
+++ b/htdocs/langs/ru_RU/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/ru_RU/withdrawals.lang b/htdocs/langs/ru_RU/withdrawals.lang
index 07c86aad8ec..661e530d09a 100644
--- a/htdocs/langs/ru_RU/withdrawals.lang
+++ b/htdocs/langs/ru_RU/withdrawals.lang
@@ -12,21 +12,21 @@ 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
+NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Сумма снятия
 WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
-ResponsibleUser=Ответственный пользователь
+ResponsibleUser=User Responsible
 WithdrawalsSetup=Direct debit payment setup
 WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
-ThirdPartyBankCode=Третьей стороной банковский код
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Классифицировать зачисленных
 ClassCreditedConfirm=Вы уверены, что хотите классифицировать это изъятие   как кредит на вашем счету в банке?
 TransData=Дата передачи
@@ -50,7 +50,7 @@ StatusMotif0=Не указано
 StatusMotif1=Предоставление insuffisante
 StatusMotif2=Тираж conteste
 StatusMotif3=No direct debit payment order
-StatusMotif4=Клиент Заказать
+StatusMotif4=Sales Order
 StatusMotif5=RIB inexploitable
 StatusMotif6=Счет без остатка
 StatusMotif7=Судебное решение
@@ -66,11 +66,11 @@ NotifyCredit=Снятие кредитную
 NumeroNationalEmetter=Национальный передатчик Количество
 WithBankUsingRIB=Для банковских счетов с использованием RIB
 WithBankUsingBANBIC=Для банковских счетов с использованием IBAN / BIC / SWIFT
-BankToReceiveWithdraw=Bank account to receive direct debit
+BankToReceiveWithdraw=Receiving Bank Account
 CreditDate=Кредит на
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
-ShowWithdraw=Показать Вывод
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Однако, если счет-фактура имеет по крайней мере один вывод оплаты еще не обработан, то он не будет установлен, как оплачиваются, чтобы управлять снятие ранее.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Файл изъятия средств
 SetToStatusSent=Установить статус "Файл отправлен"
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Статистика статуса по строкам
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -87,13 +87,13 @@ 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
+CreditorName=Creditor 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
+ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
@@ -102,6 +102,10 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/sk_SK/accountancy.lang b/htdocs/langs/sk_SK/accountancy.lang
index 8699ebfc2ad..e7127eb165b 100644
--- a/htdocs/langs/sk_SK/accountancy.lang
+++ b/htdocs/langs/sk_SK/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Consult here the list of third-party customers and vendors
 ListAccounts=Zoznam účtovných účtov
 UnknownAccountForThirdparty=Unknown third-party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
-Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Without valid dedicated account
 WithValidAccount=With valid dedicated account
 ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
 AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Rozsah účtovného účtu
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
-
+DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang
index 681dd2774b2..45c31a47e0d 100644
--- a/htdocs/langs/sk_SK/admin.lang
+++ b/htdocs/langs/sk_SK/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Očistiť
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Zmazať všetky dočasné súbory (bez risku straty dát)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Vyčistiť teraz
@@ -804,6 +804,7 @@ Permission401=Prečítajte zľavy
 Permission402=Vytvoriť / upraviť zľavy
 Permission403=Overiť zľavy
 Permission404=Odstrániť zľavy
+Permission430=Use Debug Bar
 Permission511=Read payments of salaries
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
@@ -818,6 +819,9 @@ Permission532=Vytvoriť / upraviť služby
 Permission534=Odstrániť služby
 Permission536=Pozri / správa skryté služby
 Permission538=Export služieb
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Prečítajte si dary
 Permission702=Vytvoriť / upraviť dary
 Permission703=Odstrániť dary
@@ -837,6 +841,12 @@ Permission1101=Prečítajte si dodacie
 Permission1102=Vytvoriť / upraviť dodacie
 Permission1104=Potvrdenie doručenia objednávky
 Permission1109=Odstrániť dodacie
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Prečítajte si dodávateľa
 Permission1182=Read purchase orders
 Permission1183=Create/modify purchase orders
@@ -859,16 +869,6 @@ Permission1251=Spustiť Hmotné dovozy externých dát do databázy (načítanie
 Permission1321=Export zákazníkov faktúry, atribúty a platby
 Permission1322=Znova otvoriť zaplatený účet
 Permission1421=Export sales orders and attributes
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those 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)
-Permission23001=Ukázať naplánovanú úlohu
-Permission23002=Vytvoriť / upraviť naplánovanú úlohu
-Permission23003=Odstrániť naplánovanú úlohu
-Permission23004=Spustiť naplánovanú úlohu
 Permission2401=Prečítajte akcie (udalosti alebo úlohy) ktoré súvisia s jeho účet
 Permission2402=Vytvoriť / upraviť akcie (udalosti alebo úlohy) ktoré súvisia s jeho účet
 Permission2403=Odstrániť akcie (udalosti alebo úlohy) ktoré súvisia s jeho účet
@@ -882,9 +882,41 @@ Permission2503=Vložte alebo odstraňovať dokumenty
 Permission2515=Nastavenie adresára dokumenty
 Permission2801=Pomocou FTP klienta v režime čítania (prezerať a sťahovať iba)
 Permission2802=Pomocou FTP klienta v režime zápisu (odstrániť alebo vkladať)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those 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)
+Permission23001=Ukázať naplánovanú úlohu
+Permission23002=Vytvoriť / upraviť naplánovanú úlohu
+Permission23003=Odstrániť naplánovanú úlohu
+Permission23004=Spustiť naplánovanú úlohu
 Permission50101=Use Point of Sale
 Permission50201=Prečítajte transakcie
 Permission50202=Importné operácie
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Vytlačiť
 Permission55001=Čítať anekety
 Permission55002=Vytvoriť/Upraviť anketu
@@ -1078,7 +1110,7 @@ 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=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
-AccountantDesc=Edit the details of your accountant/bookkeeper
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
@@ -1891,3 +1923,5 @@ IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute s
 UrlForIFTTT=URL endpoint for IFTTT
 YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/sk_SK/banks.lang b/htdocs/langs/sk_SK/banks.lang
index 9bb75e13891..266eda50852 100644
--- a/htdocs/langs/sk_SK/banks.lang
+++ b/htdocs/langs/sk_SK/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=Nezlúčené
 CustomerInvoicePayment=Klientská platba
 SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Odberatelská platba
-WithdrawalPayment=Odstúpenie platba
+WithdrawalPayment=Debit payment order
 SocialContributionPayment=Platba sociálnej/fiškálnej dane
 BankTransfer=Bankový prevod
 BankTransfers=Bankové prevody
diff --git a/htdocs/langs/sk_SK/cashdesk.lang b/htdocs/langs/sk_SK/cashdesk.lang
index 0a6729d26a6..0dce714a7a0 100644
--- a/htdocs/langs/sk_SK/cashdesk.lang
+++ b/htdocs/langs/sk_SK/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/sk_SK/mails.lang b/htdocs/langs/sk_SK/mails.lang
index 774f3898878..2235e30da51 100644
--- a/htdocs/langs/sk_SK/mails.lang
+++ b/htdocs/langs/sk_SK/mails.lang
@@ -19,6 +19,8 @@ MailTopic=Email topic
 MailText=Správa
 MailFile=Priložené súbory
 MailMessage=E-mail telo
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
 ShowEMailing=Zobraziť e-mailom
 ListOfEMailings=Zoznam emailings
 NewMailing=Nové posielanie e-mailov
@@ -76,9 +78,9 @@ GroupEmails=Group emails
 OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
 WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
 ResultOfMailSending=Result of mass Email sending
-NbSelected=No. selected
-NbIgnored=No. ignored
-NbSent=No. sent
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
diff --git a/htdocs/langs/sk_SK/members.lang b/htdocs/langs/sk_SK/members.lang
index b99cf3c9482..bfd88b2253b 100644
--- a/htdocs/langs/sk_SK/members.lang
+++ b/htdocs/langs/sk_SK/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=Zvoľte štatistík, ktoré chcete čítať ...
 MenuMembersStats=Štatistika
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
-Nature=Príroda
+MemberNature=Nature of member
 Public=Informácie sú verejné
 NewMemberbyWeb=Nový užívateľ pridaný. Čaká na schválenie
 NewMemberForm=Nový člen forma
diff --git a/htdocs/langs/sk_SK/products.lang b/htdocs/langs/sk_SK/products.lang
index bf1688aca37..a03df89e6d1 100644
--- a/htdocs/langs/sk_SK/products.lang
+++ b/htdocs/langs/sk_SK/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Krajina pôvodu
-Nature=Product Type (material/finished)
+Nature=Nature of produt (material/finished)
 ShortLabel=Krátky názov
 Unit=Jednotka
 p=u.
diff --git a/htdocs/langs/sk_SK/salaries.lang b/htdocs/langs/sk_SK/salaries.lang
index 65643010092..d1bc2feb8c7 100644
--- a/htdocs/langs/sk_SK/salaries.lang
+++ b/htdocs/langs/sk_SK/salaries.lang
@@ -1,18 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger 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_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
 Salary=Mzda
 Salaries=Mzdy
 NewSalaryPayment=Nová výplata mzdy
+AddSalaryPayment=Add salary payment
 SalaryPayment=Výplata mzdy
 SalariesPayments=Výplaty miezd
 ShowSalaryPayment=Ukázať výplatu mzdy
 THM=Priemerná hodinová mzda
 TJM=priemerná denná mzda
 CurrentSalary=Súčasná mzda
-THMDescription=Táto hodnota môže byť použitá pre výpočet ceny času stráveného na projekte užívateľom ak modul Projekt je použitý
-TJMDescription=Táto hoidnota je iba informačná a nie je použitá pre kalkulácie
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
-SalariesStatistics=Statistiques salaires
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/sk_SK/stocks.lang b/htdocs/langs/sk_SK/stocks.lang
index 2b46212f02f..af2c0edbe85 100644
--- a/htdocs/langs/sk_SK/stocks.lang
+++ b/htdocs/langs/sk_SK/stocks.lang
@@ -3,7 +3,7 @@ WarehouseCard=Skladová karta
 Warehouse=Sklad
 Warehouses=Sklady
 ParentWarehouse=Parent warehouse
-NewWarehouse=Nový sklad / skladová plocha
+NewWarehouse=New warehouse / Stock Location
 WarehouseEdit=Upraviť sklad
 MenuNewWarehouse=Nový sklad
 WarehouseSource=Zdrojový sklad
@@ -29,6 +29,8 @@ MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Oblasť skladov
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
 Location=Umiestnenie
 LocationSummary=Krátky názov umiestnenia
 NumberOfDifferentProducts=Počet rôznych výrobkov
@@ -44,7 +46,6 @@ TransferStock=Presunúť zásoby
 MassStockTransferShort=Masový presun zásob
 StockMovement=Presun zásob
 StockMovements=Presuny zásob
-LabelMovement=Pohyb štítok
 NumberOfUnit=Počet jednotiek
 UnitPurchaseValue=Jednotková kúpna cena
 StockTooLow=Stock príliš nízka
@@ -54,21 +55,23 @@ PMPValue=Vážená priemerná cena
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Sklady hodnota
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Allow to add limit and desired stock per couple (product, warehouse) instead of per product
-IndependantSubProductStock=Zásoby produktu a podriadeného produktu sú nezávislé
+AllowAddLimitStockByWarehouse=Manage also values for minimum and desired stock per pairing (product-warehouse) in addition to values per product
+IndependantSubProductStock=Product stock and subproduct stock are independent
 QtyDispatched=Množstvo odoslané
 QtyDispatchedShort=Odoslané množstvo
 QtyToDispatchShort=Množstvo na odoslanie
 OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Pravidlo pre automatické znižovanie zásob ( manuálne znižovanie je vždy možné aj ked automatické znižovanie je aktivované )
-RuleForStockManagementIncrease=Pravidlo pre automatické zvyšovanie zásob ( manuálne zvýšenie zásob je vždy možné aj ked automatické zvyšovanie je aktivované )
-DeStockOnBill=Pokles reálnej zásoby na zákazníkov faktúr / dobropisov validácia
-DeStockOnValidateOrder=Pokles reálnej zásoby na zákazníkov objednávky validáciu
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
 DeStockOnShipment=Znížiť skutočné zásoby po overení odoslania
-DeStockOnShipmentOnClosing=Znížiť skutočné zásoby pri označení zásielky ako uzatvorené
-ReStockOnBill=Zvýšenie reálnej zásoby na dodávateľa faktúr / dobropisov validácia
-ReStockOnValidateOrder=Increase real stocks on purchase orders approbation
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=Rád má ešte nie je, alebo viac postavenie, ktoré umožňuje zasielanie výrobkov na sklade skladoch.
 StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
 NoPredefinedProductToDispatch=Žiadne preddefinované produkty pre tento objekt. Takže žiadne dispečing skladom je nutná.
@@ -76,12 +79,12 @@ DispatchVerb=Odoslanie
 StockLimitShort=Limit pre výstrahu
 StockLimit=Limit zásob pre výstrahu
 StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
-PhysicalStock=Fyzický kapitál
+PhysicalStock=Physical Stock
 RealStock=Skutočné Stock
-RealStockDesc=Physical or real stock is the stock you currently have into your internal warehouses/emplacements.
-RealStockWillAutomaticallyWhen=The real stock will automatically change according to this rules (see stock module setup to change this):
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtuálny sklad
-VirtualStockDesc=Virtual stock is the stock you will get once all open pending actions that affect stocks will be closed (supplier order received, customer order shipped, ...)
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
 IdWarehouse=Id sklad
 DescWareHouse=Popis sklad
 LieuWareHouse=Lokalizácia sklad
@@ -101,7 +104,7 @@ ThisWarehouseIsPersonalStock=Tento sklad predstavuje osobnú zásobu %s %s
 SelectWarehouseForStockDecrease=Zvoľte sklad použiť pre zníženie skladom
 SelectWarehouseForStockIncrease=Zvoľte sklad použiť pre zvýšenie stavu zásob
 NoStockAction=Žiadne akcie skladom
-DesiredStock=Požadované optimálne zásoby
+DesiredStock=Desired Stock
 DesiredStockDesc=Táto hodnota zásob bude použidá pre doplnenie zásob pre  možnosť doplnenie zásob
 StockToBuy=Ak chcete objednať
 Replenishment=Naplnenie
@@ -114,13 +117,13 @@ CurentSelectionMode=Aktuálny vybraný mód
 CurentlyUsingVirtualStock=Virtuálne zásoby
 CurentlyUsingPhysicalStock=Fyzické zásoby
 RuleForStockReplenishment=Pravidlo pre doplňovanie zásob
-SelectProductWithNotNullQty=Vyberte aspoň jeden produkt s Množstvo NOT NULL a dodávateľom
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
 AlertOnly= Upozornenie iba
 WarehouseForStockDecrease=Skladová <b>%s</b> budú použité pre zníženie skladom
 WarehouseForStockIncrease=Skladová <b>%s</b> budú použité pre zvýšenie stavu zásob
 ForThisWarehouse=Z tohto skladu
-ReplenishmentStatusDesc=Toto je zoznam všetkých produktov so zásobou menšiou ako požadované zásoby ( alebo menšiou ako hodnota upozornenia ak je zaškrtnuté "iba upozorniť" ) Použitím zaškrtávacieho tlačidla môžete vytvoriť dodávatelskú objednávku pre doplnenie rozdielov 
-ReplenishmentOrdersDesc=Toto je zoznam otvorených dodávatelských objednávok. Iba objednávky ktoré majú vplyv na zásoby sú zobrazené.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Splátky
 NbOfProductBeforePeriod=Množstvo produktov %s na sklade, než zvolené obdobie (&lt;%s)
 NbOfProductAfterPeriod=Množstvo produktov %s na sklade po zvolené obdobie (&gt; %s)
@@ -130,10 +133,11 @@ RecordMovement=Record transfer
 ReceivingForSameOrder=Bločky tejto objednávky
 StockMovementRecorded=Zaznamenané pohyby zásob
 RuleForStockAvailability=Pravidlá skladových požiadaviek
-StockMustBeEnoughForInvoice=Výška zásov musí byť dostatočná pre pridanie produktu/služby na faktúru ( kontrolujú sa aktuálne skutočné zásoby pri pridávaní riadku na faktúru ak keď je nastavené pravidlo pre automatickú zmenu zásob )
-StockMustBeEnoughForOrder=Výška zásov musí byť dostatočná pre pridanie produktu/služby do objednávky ( kontrolujú sa aktuálne skutočné zásoby pri pridávaní riadku na faktúru ak keď je nastavené pravidlo pre automatickú zmenu zásob )
-StockMustBeEnoughForShipment= Výška zásov musí byť dostatočná pre pridanie produktu/služby do zásielky ( kontrolujú sa aktuálne skutočné zásoby pri pridávaní riadku na faktúru ak keď je nastavené pravidlo pre automatickú zmenu zásob )
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Štítok pohybu
+TypeMovement=Type of movement
 DateMovement=Date of movement
 InventoryCode=Presun alebo skladový kód
 IsInPackage=Vložené do balíka
@@ -143,11 +147,11 @@ ShowWarehouse=Ukázať sklad
 MovementCorrectStock=Uprava zásob pre produkt %s
 MovementTransferStock=Transfer zásoby produktu %s do iného skladu
 InventoryCodeShort=Inv./Mov. kód
-NoPendingReceptionOnSupplierOrder=Žiadné čajakúce na prijatie kôli otvoreným dodávatelským objednávkam
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
 ThisSerialAlreadyExistWithDifferentDate=Toto LOT/seriové číslo (<strong>%s</strong>) už existuje ale s rozdielným dátumom spotreby ( nájdené <strong>%s</strong> ale vy ste zadali <strong>%s</strong>).
 OpenAll=Otvoriť pre všetký akcie
 OpenInternal=Open only for internal actions
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on supplier order reception
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
 OptionMULTIPRICESIsOn=Možnosť "viacero cien pre oblasť" je zapnutá. To znamená že produkt mas viacero predajných cien čiže hodnota pre predaj nemôže vyť vypočítaná
 ProductStockWarehouseCreated=Limit zásob pre upozornenie a optimálne požadované zásoby správne vytvorené
 ProductStockWarehouseUpdated=Limit zásob pre upozornenie a optimálne požadované zásoby správne upravené
@@ -171,16 +175,16 @@ inventoryValidate=Overené
 inventoryDraft=Beh
 inventorySelectWarehouse=Warehouse choice
 inventoryConfirmCreate=Create
-inventoryOfWarehouse=Inventory for warehouse : %s
-inventoryErrorQtyAdd=Error : one quantity is leaser than zero
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
 inventoryMvtStock=By inventory
 inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Kategórie filtra
-SelectFournisseur=Supplier filter
+SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
 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
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement has date of inventory
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
@@ -195,12 +199,16 @@ AddInventoryProduct=Add product to inventory
 AddProduct=Pridať
 ApplyPMP=Apply PMP
 FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action ?
+ConfirmFlushInventory=Do you confirm this action?
 InventoryFlushed=Inventory flushed
 ExitEditMode=Exit edition
 inventoryDeleteLine=Odstránenie riadka
 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"
+StockSupportServices=Stock management supports Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
 ReceiveProducts=Receive items
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
diff --git a/htdocs/langs/sk_SK/website.lang b/htdocs/langs/sk_SK/website.lang
index 453b2664395..9678b6fd948 100644
--- a/htdocs/langs/sk_SK/website.lang
+++ b/htdocs/langs/sk_SK/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/sk_SK/withdrawals.lang b/htdocs/langs/sk_SK/withdrawals.lang
index 06ca50c5e0d..945b76876df 100644
--- a/htdocs/langs/sk_SK/withdrawals.lang
+++ b/htdocs/langs/sk_SK/withdrawals.lang
@@ -12,21 +12,21 @@ WithdrawalsLines=Riadky inkaso objednávok
 RequestStandingOrderToTreat=Žiadosť o spracovanie inkaso platby za objednávku
 RequestStandingOrderTreated=Žiadosť o spracovanie platobného príkazu inkaso 
 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
+NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Suma, ktorá má zrušiť
 WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
-ResponsibleUser=Zodpovedný užívateľ
+ResponsibleUser=User Responsible
 WithdrawalsSetup=Direct debit payment setup
 WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
-ThirdPartyBankCode=Treťou stranou kód banky
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Klasifikovať pripísaná
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
@@ -50,7 +50,7 @@ StatusMotif0=Nešpecifikovaný
 StatusMotif1=Insufficient funds
 StatusMotif2=Request contested
 StatusMotif3=No direct debit payment order
-StatusMotif4=Objednávky zákazníka
+StatusMotif4=Sales Order
 StatusMotif5=RIB unusable
 StatusMotif6=Účet bez rovnováhy
 StatusMotif7=Súdne rozhodnutia
@@ -66,11 +66,11 @@ NotifyCredit=Odstúpenie Credit
 NumeroNationalEmetter=Národná Vysielač číslo
 WithBankUsingRIB=U bankových účtov pomocou RIB
 WithBankUsingBANBIC=U bankových účtov pomocou IBAN / BIC / SWIFT
-BankToReceiveWithdraw=Bank account to receive direct debit
+BankToReceiveWithdraw=Receiving Bank Account
 CreditDate=Kredit na
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
-ShowWithdraw=Zobraziť Natiahnite
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Odstúpenie súbor
 SetToStatusSent=Nastavte na stav &quot;odoslaný súbor&quot;
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -87,13 +87,13 @@ 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
+CreditorName=Creditor Name
 SEPAFillForm=(B) Please complete all the fields marked *
 SEPAFormYourName=Vaše meno
 SEPAFormYourBAN=Your Bank Account Name (IBAN)
 SEPAFormYourBIC=Your Bank Identifier Code (BIC)
 SEPAFrstOrRecur=Type of payment
-ModeRECUR=Reccurent payment
+ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
@@ -102,6 +102,10 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/sl_SI/accountancy.lang b/htdocs/langs/sl_SI/accountancy.lang
index 919b362b2b9..ad54ed949cf 100644
--- a/htdocs/langs/sl_SI/accountancy.lang
+++ b/htdocs/langs/sl_SI/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Consult here the list of third-party customers and vendors
 ListAccounts=Seznam računovodskih računov
 UnknownAccountForThirdparty=Unknown third-party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
-Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Without valid dedicated account
 WithValidAccount=With valid dedicated account
 ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
 AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Range of accounting account
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
-
+DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index e3269c848b7..2991502b826 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Počisti
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Počisti zdaj
@@ -804,6 +804,7 @@ Permission401=Branje popustov
 Permission402=Kreiranje/spreminjanje popustov
 Permission403=Potrjevanje popustov
 Permission404=Brisanje popustov
+Permission430=Use Debug Bar
 Permission511=Read payments of salaries
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
@@ -818,6 +819,9 @@ Permission532=Kreiranje/spreminjanje storitev
 Permission534=Brisanje storitev
 Permission536=Pregled/upravljanje skritih storitev
 Permission538=Izvoz storitev
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Branje donacij
 Permission702=Kreiranje/spreminjanje donacij
 Permission703=Delete donacij
@@ -837,6 +841,12 @@ Permission1101=Branje dobavnic
 Permission1102=Kreiranje/spreminjanje dobavnic
 Permission1104=Potrjevanje dobavnic
 Permission1109=Brisanje dobavnic
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Branje dobaviteljev
 Permission1182=Read purchase orders
 Permission1183=Create/modify purchase orders
@@ -859,16 +869,6 @@ Permission1251=Izvajanje masovnega izvoza zunanjih podatkov v bazo podatkov (nal
 Permission1321=Izvoz računov za kupce, atributov in plačil
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
-Permission20003=Brisanje zahtevkov za dopust
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Administriranje zahtevkov za dopust (nastavitve in posodobitev stanja)
-Permission23001=Preberi načrtovano delo
-Permission23002=Ustvari/posodobi načrtovano delo
-Permission23003=Izbriši načrtovano delo
-Permission23004=Izvedi načrtovano delo
 Permission2401=Branje aktivnosti (dogodki ali naloge) povezanih s tem uporabnikom
 Permission2402=Kreiranje/spreminjanje aktivnosti (dogodki ali naloge) povezanih s tem uporabnikom
 Permission2403=Brisanje aktivnosti (dogodki ali naloge) povezanih s tem uporabnikom
@@ -882,9 +882,41 @@ Permission2503=Pošiljanje ali brisanje dokumentov
 Permission2515=Nastavitve map dokumentov
 Permission2801=Uporaba FTP klienta samo za branje (samo brskanje in prenašanje)
 Permission2802=Uporaba FTP klienta za pisanje (brisanje ali nalaganje datotek)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
+Permission20003=Brisanje zahtevkov za dopust
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
+Permission20006=Administriranje zahtevkov za dopust (nastavitve in posodobitev stanja)
+Permission23001=Preberi načrtovano delo
+Permission23002=Ustvari/posodobi načrtovano delo
+Permission23003=Izbriši načrtovano delo
+Permission23004=Izvedi načrtovano delo
 Permission50101=Use Point of Sale
 Permission50201=Branje prenosov
 Permission50202=Uvoz prenosov
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Tiskaj
 Permission55001=Branje anket
 Permission55002=Kreiranje/spreminjanje anket
@@ -1078,7 +1110,7 @@ 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=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
-AccountantDesc=Edit the details of your accountant/bookkeeper
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
@@ -1891,3 +1923,5 @@ IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute s
 UrlForIFTTT=URL endpoint for IFTTT
 YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/sl_SI/banks.lang b/htdocs/langs/sl_SI/banks.lang
index 3ed626d71d1..b63d23868e5 100644
--- a/htdocs/langs/sl_SI/banks.lang
+++ b/htdocs/langs/sl_SI/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=Not reconciled
 CustomerInvoicePayment=Plačilo kupca
 SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Plačilo naročnine
-WithdrawalPayment=Nakazano plačilo
+WithdrawalPayment=Debit payment order
 SocialContributionPayment=Plačilo socialnega/fiskalnega davka
 BankTransfer=Bančni transfer
 BankTransfers=Bančni transferji
diff --git a/htdocs/langs/sl_SI/cashdesk.lang b/htdocs/langs/sl_SI/cashdesk.lang
index d3f5c731ac5..71f3c65269d 100644
--- a/htdocs/langs/sl_SI/cashdesk.lang
+++ b/htdocs/langs/sl_SI/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/sl_SI/mails.lang b/htdocs/langs/sl_SI/mails.lang
index 408f0a3b725..ba9d3b65e69 100644
--- a/htdocs/langs/sl_SI/mails.lang
+++ b/htdocs/langs/sl_SI/mails.lang
@@ -19,6 +19,8 @@ MailTopic=Email topic
 MailText=Sporočilo
 MailFile=Priloge
 MailMessage=Vsebina Email-a
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
 ShowEMailing=Prikaži e-sporočila
 ListOfEMailings=Seznam e-sporočil
 NewMailing=Novo e-sporočilo
@@ -76,9 +78,9 @@ GroupEmails=Group emails
 OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
 WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
 ResultOfMailSending=Result of mass Email sending
-NbSelected=No. selected
-NbIgnored=No. ignored
-NbSent=No. sent
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
diff --git a/htdocs/langs/sl_SI/members.lang b/htdocs/langs/sl_SI/members.lang
index 077f7849c3e..1133d92665d 100644
--- a/htdocs/langs/sl_SI/members.lang
+++ b/htdocs/langs/sl_SI/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=Izberite statistiko, ki jo želite prebrati...
 MenuMembersStats=Statistika
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
-Nature=Narava
+MemberNature=Nature of member
 Public=Informacija je javna (ne=zasebno)
 NewMemberbyWeb=Dodan je nov član. Čaka potrditev.
 NewMemberForm=Obrazec za nove člane
diff --git a/htdocs/langs/sl_SI/products.lang b/htdocs/langs/sl_SI/products.lang
index c86769e3db1..050f1fe488d 100644
--- a/htdocs/langs/sl_SI/products.lang
+++ b/htdocs/langs/sl_SI/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Država porekla
-Nature=Product Type (material/finished)
+Nature=Nature of produt (material/finished)
 ShortLabel=Kratek naziv
 Unit=Enota
 p=e.
diff --git a/htdocs/langs/sl_SI/salaries.lang b/htdocs/langs/sl_SI/salaries.lang
index 3efbd465192..c9e828f84a3 100644
--- a/htdocs/langs/sl_SI/salaries.lang
+++ b/htdocs/langs/sl_SI/salaries.lang
@@ -1,18 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger 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_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
 Salary=Plača
 Salaries=Plače
 NewSalaryPayment=Novo izplačilo plače
+AddSalaryPayment=Add salary payment
 SalaryPayment=Izplačilo plače
 SalariesPayments=Izplačila plač
 ShowSalaryPayment=Prikaži izplačilo plač
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Trenutna plača
-THMDescription=Ta kalkulacija se lahko uporabi za izračun stroškov porabljenega časa na projektu, ki ga vnese uporabnik, če je uporabljen projektni modul
-TJMDescription=Ta vrednost je trenutno samo informativna in se ne uporablja v nobeni kalkulaciji
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
-SalariesStatistics=Statistiques salaires
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/sl_SI/stocks.lang b/htdocs/langs/sl_SI/stocks.lang
index 4af9e362e02..209d5c9684d 100644
--- a/htdocs/langs/sl_SI/stocks.lang
+++ b/htdocs/langs/sl_SI/stocks.lang
@@ -3,7 +3,7 @@ WarehouseCard=Skladiščna kartica
 Warehouse=Skladišče
 Warehouses=Skladišča
 ParentWarehouse=Parent warehouse
-NewWarehouse=Novo skladišče / skladiščni prostor
+NewWarehouse=New warehouse / Stock Location
 WarehouseEdit=Uredi skladišče
 MenuNewWarehouse=Novo skladišče
 WarehouseSource=Izvorno skladišče
@@ -29,6 +29,8 @@ MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Področje skladišč
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
 Location=Lokacija
 LocationSummary=Kratko ime lokacije
 NumberOfDifferentProducts=Število različnih proizvodov
@@ -44,7 +46,6 @@ TransferStock=Prenos zaloge
 MassStockTransferShort=Masovni prenos zalog
 StockMovement=Premik zaloge
 StockMovements=Premiki zalog
-LabelMovement=Označitev premika
 NumberOfUnit=Število enot
 UnitPurchaseValue=Nabavna cena enote
 StockTooLow=Zaloga je prenizka
@@ -54,21 +55,23 @@ PMPValue=Uravnotežena povprečna cena
 PMPValueShort=UPC
 EnhancedValueOfWarehouses=Vrednost skladišč
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Allow to add limit and desired stock per couple (product, warehouse) instead of per product
-IndependantSubProductStock=Zaloga proizvodov in zaloga komponent sta neodvisni
+AllowAddLimitStockByWarehouse=Manage also values for minimum and desired stock per pairing (product-warehouse) in addition to values per product
+IndependantSubProductStock=Product stock and subproduct stock are independent
 QtyDispatched=Odposlana količina
 QtyDispatchedShort=Odposlana količina
 QtyToDispatchShort=Količina za odpošiljanje
 OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
-RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
-DeStockOnBill=Zmanjšanje dejanske zaloge po potrditvi fakture/dobropisa (pozor, v tej verziji se zaloga spremeni samo v skladišču številka 1)
-DeStockOnValidateOrder=Zmanjšanje dejanske zaloge po potrditvi naročila (pozor, v tej verziji se zaloga spremeni samo v skladišču številka 1)
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
 DeStockOnShipment=Zmanjšanje dejanske zaloge po potrditvi odpreme
-DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification closed
-ReStockOnBill=Povečanje dejanske zaloge po potrditvi fakture/dobropisa (pozor, v tej verziji se zaloga spremeni samo v skladišču številka 1)
-ReStockOnValidateOrder=Increase real stocks on purchase orders approbation
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=Naročilo še nima ali nima več statusa, ki omogoča odpremo proizvoda iz skladišča.
 StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
 NoPredefinedProductToDispatch=Za ta objekt ni preddefiniranih proizvodov. Zato ni potrebna odprema iz skladišča.
@@ -76,12 +79,12 @@ DispatchVerb=Odprema
 StockLimitShort=Omejitev za opozorilo
 StockLimit=Omejitev zaloge za opozorilo
 StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
-PhysicalStock=Fizična zaloga
+PhysicalStock=Physical Stock
 RealStock=Dejanska zaloga
-RealStockDesc=Physical or real stock is the stock you currently have into your internal warehouses/emplacements.
-RealStockWillAutomaticallyWhen=The real stock will automatically change according to this rules (see stock module setup to change this):
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtualna zaloga
-VirtualStockDesc=Virtual stock is the stock you will get once all open pending actions that affect stocks will be closed (supplier order received, customer order shipped, ...)
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
 IdWarehouse=ID skladišča
 DescWareHouse=Opis skladišča
 LieuWareHouse=Lokalizacija skladišča
@@ -101,7 +104,7 @@ ThisWarehouseIsPersonalStock=To skladišče predstavlja osebno zalogo %s %s
 SelectWarehouseForStockDecrease=Izberite skladišče uporabiti za zmanjšanje zalog
 SelectWarehouseForStockIncrease=Izberite skladišče uporabiti za povečanje zalog
 NoStockAction=Ni aktivnosti zaloge
-DesiredStock=Desired optimal stock
+DesiredStock=Desired Stock
 DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
 StockToBuy=Za naročiti
 Replenishment=Obnavljanje
@@ -114,13 +117,13 @@ CurentSelectionMode=Trenuten način izbire
 CurentlyUsingVirtualStock=Virtualna zaloga
 CurentlyUsingPhysicalStock=Fizična zaloga
 RuleForStockReplenishment=Pravilo za obnavljanje zalog
-SelectProductWithNotNullQty=Izberite najmanj en proizvod, katerega stanje ni enako nič in ima dobavitelja
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
 AlertOnly= Samo opozorila
 WarehouseForStockDecrease=Skladiščee <b>%s</b> bo uporabljeno za zmanjšanje zaloge
 WarehouseForStockIncrease=Skladišče <b>%s</b> bo uporabljeno za povečanje zaloge
 ForThisWarehouse=Za to skladišče
-ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is a list of all open supplier orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Obnovitve
 NbOfProductBeforePeriod=Količina proizvoda %s na zalogi pred izbranim obdobjem (< %s)
 NbOfProductAfterPeriod=Količina proizvoda %s na zalogi po izbranem obdobju (> %s)
@@ -130,10 +133,11 @@ RecordMovement=Record transfer
 ReceivingForSameOrder=Prevzem tega naročila
 StockMovementRecorded=Zapisan premik zaloge
 RuleForStockAvailability=Pravila za zahtevane zaloge
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever is rule for automatic stock change)
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Nalepka gibanja
+TypeMovement=Type of movement
 DateMovement=Date of movement
 InventoryCode=Koda gibanja ali zaloge
 IsInPackage=Vsebina paketa
@@ -143,11 +147,11 @@ ShowWarehouse=Prikaži skladišče
 MovementCorrectStock=Korekcija zaloge za proizvod %s
 MovementTransferStock=Skladiščni prenos proizvoda %s v drugo skladišče
 InventoryCodeShort=Koda zaloge/premika
-NoPendingReceptionOnSupplierOrder=Ni odprtih prejemov na osnovi odprtih naročil pri dobavitelju
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
 ThisSerialAlreadyExistWithDifferentDate=Ta lot/serijska številka (<strong>%s</strong>) že obstaja, vendar z drugim datumom vstopa ali izstopa (najden je <strong>%s</strong>, vi pa ste vnesli <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
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
 OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
 ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
 ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
@@ -171,16 +175,16 @@ inventoryValidate=Potrjen
 inventoryDraft=V obdelavi
 inventorySelectWarehouse=Warehouse choice
 inventoryConfirmCreate=Ustvari
-inventoryOfWarehouse=Inventory for warehouse : %s
-inventoryErrorQtyAdd=Error : one quantity is leaser than zero
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
 inventoryMvtStock=By inventory
 inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Filter kategorij
-SelectFournisseur=Supplier filter
+SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
 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
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement has date of inventory
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
@@ -195,12 +199,16 @@ AddInventoryProduct=Add product to inventory
 AddProduct=Dodaj
 ApplyPMP=Apply PMP
 FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action ?
+ConfirmFlushInventory=Do you confirm this action?
 InventoryFlushed=Inventory flushed
 ExitEditMode=Exit edition
 inventoryDeleteLine=Izbriši vrstico
 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"
+StockSupportServices=Stock management supports Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
 ReceiveProducts=Receive items
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
diff --git a/htdocs/langs/sl_SI/website.lang b/htdocs/langs/sl_SI/website.lang
index bca375e3470..4a37a3efb93 100644
--- a/htdocs/langs/sl_SI/website.lang
+++ b/htdocs/langs/sl_SI/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/sl_SI/withdrawals.lang b/htdocs/langs/sl_SI/withdrawals.lang
index bb9dda18773..630e07a41e2 100644
--- a/htdocs/langs/sl_SI/withdrawals.lang
+++ b/htdocs/langs/sl_SI/withdrawals.lang
@@ -12,21 +12,21 @@ WithdrawalsLines=Direct debit order lines
 RequestStandingOrderToTreat=Request for direct debit payment order to process
 RequestStandingOrderTreated=Request for direct debit payment order processed
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Trenutno ni možno. Status nakazila je potrebno nastaviti na 'kreditiran' pred zavrnitvijo specifičnih vrstic.
-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
+NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Vrednost za nakazilo
 WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
-ResponsibleUser=Odgovorni uporabnik
+ResponsibleUser=User Responsible
 WithdrawalsSetup=Direct debit payment setup
 WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
-ThirdPartyBankCode=Bančna koda partnerja
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Označi kot prejeto
 ClassCreditedConfirm=Ali zares želite to potrdilo o nakazilu označiti kot »v dobro« na vašem bančnem računu ?
 TransData=Datum prenosa
@@ -50,7 +50,7 @@ StatusMotif0=Nedoločeno
 StatusMotif1=Nezadostno stanje
 StatusMotif2=Sporna izdaja
 StatusMotif3=No direct debit payment order
-StatusMotif4=Naročilo kupca
+StatusMotif4=Sales Order
 StatusMotif5=RIB ni možno izkoristiti
 StatusMotif6=Račun brez bilance
 StatusMotif7=Sodne odločbe
@@ -66,11 +66,11 @@ NotifyCredit=Nakazilo odobreno
 NumeroNationalEmetter=Nacionalna številka prenosa
 WithBankUsingRIB=Za bančne račune, ki uporabljajo RIB
 WithBankUsingBANBIC=Za bančne račune, ki uporabljajo IBAN/BIC/SWIFT
-BankToReceiveWithdraw=Bank account to receive direct debit
+BankToReceiveWithdraw=Receiving Bank Account
 CreditDate=Datum kredita
 WithdrawalFileNotCapable=Ni možno generirati datoteke za prejem nakazil za vašo državo %s (vaša država ni podprta)
-ShowWithdraw=Prikaži nakazilo
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Vendar, če ima račun najmanj eno neizvršeno nakazilo, ne bo označeno kot plačano, da bi bilo pred tem možno izvršiti nakazilo.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Datoteka nakazila
 SetToStatusSent=Nastavi status na "Datoteka poslana"
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistika po statusu vrstic
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -87,13 +87,13 @@ 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
+CreditorName=Creditor 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
+ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
@@ -102,6 +102,10 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/sq_AL/accountancy.lang b/htdocs/langs/sq_AL/accountancy.lang
index 882311e759f..076a59f3bea 100644
--- a/htdocs/langs/sq_AL/accountancy.lang
+++ b/htdocs/langs/sq_AL/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Consult here the list of third-party customers and vendors
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third-party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
-Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Without valid dedicated account
 WithValidAccount=With valid dedicated account
 ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
 AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Range of accounting account
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
-
+DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang
index 48c1c425808..1704e1b7cb0 100644
--- a/htdocs/langs/sq_AL/admin.lang
+++ b/htdocs/langs/sq_AL/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Spastro
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Spastro tani
@@ -804,6 +804,7 @@ Permission401=Read discounts
 Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
+Permission430=Use Debug Bar
 Permission511=Read payments of salaries
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
@@ -818,6 +819,9 @@ Permission532=Create/modify services
 Permission534=Delete services
 Permission536=See/manage hidden services
 Permission538=Export services
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
@@ -837,6 +841,12 @@ Permission1101=Read delivery orders
 Permission1102=Create/modify delivery orders
 Permission1104=Validate delivery orders
 Permission1109=Delete delivery orders
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Read suppliers
 Permission1182=Read purchase orders
 Permission1183=Create/modify purchase orders
@@ -859,16 +869,6 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those 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)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
 Permission2401=Read actions (events or tasks) linked to his account
 Permission2402=Create/modify actions (events or tasks) linked to his account
 Permission2403=Delete actions (events or tasks) linked to his account
@@ -882,9 +882,41 @@ Permission2503=Submit or delete documents
 Permission2515=Setup documents directories
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those 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)
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale
 Permission50201=Read transactions
 Permission50202=Import transactions
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Print
 Permission55001=Read polls
 Permission55002=Create/modify polls
@@ -1078,7 +1110,7 @@ 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 to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
-AccountantDesc=Edit the details of your accountant/bookkeeper
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
@@ -1891,3 +1923,5 @@ IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute s
 UrlForIFTTT=URL endpoint for IFTTT
 YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/sq_AL/banks.lang b/htdocs/langs/sq_AL/banks.lang
index 6acce654593..96427635739 100644
--- a/htdocs/langs/sq_AL/banks.lang
+++ b/htdocs/langs/sq_AL/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
 SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Subscription payment
-WithdrawalPayment=Withdrawal payment
+WithdrawalPayment=Debit payment order
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
diff --git a/htdocs/langs/sq_AL/cashdesk.lang b/htdocs/langs/sq_AL/cashdesk.lang
index 8fa37bcd430..d9144606356 100644
--- a/htdocs/langs/sq_AL/cashdesk.lang
+++ b/htdocs/langs/sq_AL/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/sq_AL/mails.lang b/htdocs/langs/sq_AL/mails.lang
index 8fb856db92b..5edad1a7673 100644
--- a/htdocs/langs/sq_AL/mails.lang
+++ b/htdocs/langs/sq_AL/mails.lang
@@ -19,6 +19,8 @@ MailTopic=Email topic
 MailText=Message
 MailFile=Attached files
 MailMessage=Email body
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
 ShowEMailing=Show emailing
 ListOfEMailings=List of emailings
 NewMailing=New emailing
@@ -76,9 +78,9 @@ GroupEmails=Group emails
 OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
 WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
 ResultOfMailSending=Result of mass Email sending
-NbSelected=No. selected
-NbIgnored=No. ignored
-NbSent=No. sent
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
diff --git a/htdocs/langs/sq_AL/members.lang b/htdocs/langs/sq_AL/members.lang
index 08ae75a6abc..aea5c761758 100644
--- a/htdocs/langs/sq_AL/members.lang
+++ b/htdocs/langs/sq_AL/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
-Nature=Nature
+MemberNature=Nature of member
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
diff --git a/htdocs/langs/sq_AL/products.lang b/htdocs/langs/sq_AL/products.lang
index 45afef4e9dc..629280cfda5 100644
--- a/htdocs/langs/sq_AL/products.lang
+++ b/htdocs/langs/sq_AL/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
-Nature=Product Type (material/finished)
+Nature=Nature of produt (material/finished)
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/sq_AL/salaries.lang b/htdocs/langs/sq_AL/salaries.lang
index 605df9436d4..3539d05cb2e 100644
--- a/htdocs/langs/sq_AL/salaries.lang
+++ b/htdocs/langs/sq_AL/salaries.lang
@@ -1,18 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger 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_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
 Salary=Rrogë
 Salaries=Rrogat
 NewSalaryPayment=Pagesë e re rroge
+AddSalaryPayment=Add salary payment
 SalaryPayment=Pagesë rroge
 SalariesPayments=Pagesat e rrogave
 ShowSalaryPayment=Trego pagesën e rrogës
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
-THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
-TJMDescription=This value is currently as information only and is not used for any calculation
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
-SalariesStatistics=Statistiques salaires
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/sq_AL/stocks.lang b/htdocs/langs/sq_AL/stocks.lang
index c67ee0e7c10..cc017a3f3e3 100644
--- a/htdocs/langs/sq_AL/stocks.lang
+++ b/htdocs/langs/sq_AL/stocks.lang
@@ -3,7 +3,7 @@ WarehouseCard=Warehouse card
 Warehouse=Warehouse
 Warehouses=Warehouses
 ParentWarehouse=Parent warehouse
-NewWarehouse=New warehouse / Stock area
+NewWarehouse=New warehouse / Stock Location
 WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
 WarehouseSource=Source warehouse
@@ -29,6 +29,8 @@ MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
 Location=Vendndodhja
 LocationSummary=Short name location
 NumberOfDifferentProducts=Number of different products
@@ -44,7 +46,6 @@ TransferStock=Transfer stock
 MassStockTransferShort=Mass stock transfer
 StockMovement=Stock movement
 StockMovements=Stock movements
-LabelMovement=Movement label
 NumberOfUnit=Number of units
 UnitPurchaseValue=Unit purchase price
 StockTooLow=Stock too low
@@ -54,21 +55,23 @@ PMPValue=Weighted average price
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Allow to add limit and desired stock per couple (product, warehouse) instead of per product
-IndependantSubProductStock=Product stock and subproduct stock are independant
+AllowAddLimitStockByWarehouse=Manage also values for minimum and desired stock per pairing (product-warehouse) in addition to values per product
+IndependantSubProductStock=Product stock and subproduct stock are independent
 QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
-RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
-DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
-DeStockOnValidateOrder=Decrease real stocks on customers orders validation
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
 DeStockOnShipment=Decrease real stocks on shipping validation
-DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification closed
-ReStockOnBill=Increase real stocks on suppliers invoices/credit notes validation
-ReStockOnValidateOrder=Increase real stocks on purchase orders approbation
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows dispatching of products in stock warehouses.
 StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
 NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required.
@@ -76,12 +79,12 @@ DispatchVerb=Dispatch
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
 StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
-PhysicalStock=Physical stock
+PhysicalStock=Physical Stock
 RealStock=Real Stock
-RealStockDesc=Physical or real stock is the stock you currently have into your internal warehouses/emplacements.
-RealStockWillAutomaticallyWhen=The real stock will automatically change according to this rules (see stock module setup to change this):
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
-VirtualStockDesc=Virtual stock is the stock you will get once all open pending actions that affect stocks will be closed (supplier order received, customer order shipped, ...)
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
@@ -101,7 +104,7 @@ ThisWarehouseIsPersonalStock=This warehouse represents personal stock of %s %s
 SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
 SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
 NoStockAction=No stock action
-DesiredStock=Desired optimal stock
+DesiredStock=Desired Stock
 DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
 StockToBuy=To order
 Replenishment=Replenishment
@@ -114,13 +117,13 @@ CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtual stock
 CurentlyUsingPhysicalStock=Physical stock
 RuleForStockReplenishment=Rule for stocks replenishment
-SelectProductWithNotNullQty=Select at least one product with a qty not null and a supplier
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
 AlertOnly= Alerts only
 WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is a list of all open supplier orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,10 +133,11 @@ RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever is rule for automatic stock change)
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
+TypeMovement=Type of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -143,11 +147,11 @@ ShowWarehouse=Show warehouse
 MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
 OpenAll=Open for all actions
 OpenInternal=Open only for internal actions
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on supplier order reception
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
 OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
 ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
 ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
@@ -171,16 +175,16 @@ inventoryValidate=Validated
 inventoryDraft=Running
 inventorySelectWarehouse=Warehouse choice
 inventoryConfirmCreate=Create
-inventoryOfWarehouse=Inventory for warehouse : %s
-inventoryErrorQtyAdd=Error : one quantity is leaser than zero
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
 inventoryMvtStock=By inventory
 inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
-SelectFournisseur=Supplier filter
+SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
 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
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement has date of inventory
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
@@ -195,12 +199,16 @@ AddInventoryProduct=Add product to inventory
 AddProduct=Add
 ApplyPMP=Apply PMP
 FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action ?
+ConfirmFlushInventory=Do you confirm this action?
 InventoryFlushed=Inventory flushed
 ExitEditMode=Exit edition
 inventoryDeleteLine=Delete line
 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"
+StockSupportServices=Stock management supports Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
 ReceiveProducts=Receive items
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
diff --git a/htdocs/langs/sq_AL/website.lang b/htdocs/langs/sq_AL/website.lang
index b4d894f55d7..534756ac932 100644
--- a/htdocs/langs/sq_AL/website.lang
+++ b/htdocs/langs/sq_AL/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/sq_AL/withdrawals.lang b/htdocs/langs/sq_AL/withdrawals.lang
index 3ded0e4cd36..4c146c2d43b 100644
--- a/htdocs/langs/sq_AL/withdrawals.lang
+++ b/htdocs/langs/sq_AL/withdrawals.lang
@@ -12,21 +12,21 @@ 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
+NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Amount to withdraw
 WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
-ResponsibleUser=Responsible user
+ResponsibleUser=User Responsible
 WithdrawalsSetup=Direct debit payment setup
 WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
-ThirdPartyBankCode=Third party bank code
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Classify credited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
@@ -50,7 +50,7 @@ StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
 StatusMotif2=Request contested
 StatusMotif3=No direct debit payment order
-StatusMotif4=Customer Order
+StatusMotif4=Sales Order
 StatusMotif5=RIB unusable
 StatusMotif6=Account without balance
 StatusMotif7=Judicial Decision
@@ -66,11 +66,11 @@ NotifyCredit=Withdrawal Credit
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=For bank accounts using RIB
 WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
-BankToReceiveWithdraw=Bank account to receive direct debit
+BankToReceiveWithdraw=Receiving Bank Account
 CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
-ShowWithdraw=Show Withdraw
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -87,13 +87,13 @@ 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
+CreditorName=Creditor 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
+ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
@@ -102,6 +102,10 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/sr_RS/accountancy.lang b/htdocs/langs/sr_RS/accountancy.lang
index 1adf3631eed..c567bb5ba78 100644
--- a/htdocs/langs/sr_RS/accountancy.lang
+++ b/htdocs/langs/sr_RS/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Consult here the list of third-party customers and vendors
 ListAccounts=Lista računovodstvenih naloga
 UnknownAccountForThirdparty=Unknown third-party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
-Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Without valid dedicated account
 WithValidAccount=With valid dedicated account
 ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
 AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Opseg knjižnih računa
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
-
+DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/sr_RS/admin.lang b/htdocs/langs/sr_RS/admin.lang
index cf4b00b3c02..c4d811485cb 100644
--- a/htdocs/langs/sr_RS/admin.lang
+++ b/htdocs/langs/sr_RS/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
@@ -804,6 +804,7 @@ Permission401=Read discounts
 Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
+Permission430=Use Debug Bar
 Permission511=Read payments of salaries
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
@@ -818,6 +819,9 @@ Permission532=Create/modify services
 Permission534=Delete services
 Permission536=See/manage hidden services
 Permission538=Export services
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
@@ -837,6 +841,12 @@ Permission1101=Read delivery orders
 Permission1102=Create/modify delivery orders
 Permission1104=Validate delivery orders
 Permission1109=Delete delivery orders
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Read suppliers
 Permission1182=Read purchase orders
 Permission1183=Create/modify purchase orders
@@ -859,16 +869,6 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
-Permission20003=Obriši zahteve za odsustvo
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Podešavanja zahteva za odsustvo (podešavanja i ažuriranje stanja)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
 Permission2401=Read actions (events or tasks) linked to his account
 Permission2402=Create/modify actions (events or tasks) linked to his account
 Permission2403=Delete actions (events or tasks) linked to his account
@@ -882,9 +882,41 @@ Permission2503=Submit or delete documents
 Permission2515=Setup documents directories
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
+Permission20003=Obriši zahteve za odsustvo
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
+Permission20006=Podešavanja zahteva za odsustvo (podešavanja i ažuriranje stanja)
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale
 Permission50201=Read transactions
 Permission50202=Import transactions
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Print
 Permission55001=Read polls
 Permission55002=Create/modify polls
@@ -1078,7 +1110,7 @@ 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 to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
-AccountantDesc=Edit the details of your accountant/bookkeeper
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
@@ -1891,3 +1923,5 @@ IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute s
 UrlForIFTTT=URL endpoint for IFTTT
 YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/sr_RS/banks.lang b/htdocs/langs/sr_RS/banks.lang
index 1fa32958ac5..3121ae02f40 100644
--- a/htdocs/langs/sr_RS/banks.lang
+++ b/htdocs/langs/sr_RS/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=Not reconciled
 CustomerInvoicePayment=Uplata kupca
 SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Uplata pretplate
-WithdrawalPayment=Povraćaj uplate
+WithdrawalPayment=Debit payment order
 SocialContributionPayment=Uplate poreza/doprinosa
 BankTransfer=Bankovni prenos
 BankTransfers=Bankovni prenosi
diff --git a/htdocs/langs/sr_RS/cashdesk.lang b/htdocs/langs/sr_RS/cashdesk.lang
index 0835c306481..1e992953e50 100644
--- a/htdocs/langs/sr_RS/cashdesk.lang
+++ b/htdocs/langs/sr_RS/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/sr_RS/mails.lang b/htdocs/langs/sr_RS/mails.lang
index ea2bf661a56..f218481df16 100644
--- a/htdocs/langs/sr_RS/mails.lang
+++ b/htdocs/langs/sr_RS/mails.lang
@@ -19,6 +19,8 @@ MailTopic=Email topic
 MailText=Poruka
 MailFile=Prilozi
 MailMessage=Sadržaj maila
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
 ShowEMailing=Prikaži emailing
 ListOfEMailings=Lista emailings
 NewMailing=Novi emailing
@@ -76,9 +78,9 @@ GroupEmails=Group emails
 OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
 WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
 ResultOfMailSending=Result of mass Email sending
-NbSelected=No. selected
-NbIgnored=No. ignored
-NbSent=No. sent
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
diff --git a/htdocs/langs/sr_RS/members.lang b/htdocs/langs/sr_RS/members.lang
index cc05a236ff0..ef9b8395290 100644
--- a/htdocs/langs/sr_RS/members.lang
+++ b/htdocs/langs/sr_RS/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=Izaberite statistike koje želite da konsultujete...
 MenuMembersStats=Statistike
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Datum najnovije pretplate
-Nature=Priroda
+MemberNature=Nature of member
 Public=Javne informacije
 NewMemberbyWeb=Novi član je dodat. Čeka se odobrenje.
 NewMemberForm=Forma za nove članove
diff --git a/htdocs/langs/sr_RS/products.lang b/htdocs/langs/sr_RS/products.lang
index 6cadd6b3787..47fc76a533e 100644
--- a/htdocs/langs/sr_RS/products.lang
+++ b/htdocs/langs/sr_RS/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Zemlja porekla
-Nature=Product Type (material/finished)
+Nature=Nature of produt (material/finished)
 ShortLabel=Kratak naziv
 Unit=Jedinica
 p=j.
diff --git a/htdocs/langs/sr_RS/salaries.lang b/htdocs/langs/sr_RS/salaries.lang
index 1fd5089c23b..43def73622c 100644
--- a/htdocs/langs/sr_RS/salaries.lang
+++ b/htdocs/langs/sr_RS/salaries.lang
@@ -1,18 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Konto koji se koristi za korisnike trećih lica
-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_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
 Salary=Plata
 Salaries=Plate
 NewSalaryPayment=Nova isplata zarade
+AddSalaryPayment=Add salary payment
 SalaryPayment=Isplata zarade
 SalariesPayments=Isplate zarada
 ShowSalaryPayment=Prikaži isplatu zarade
 THM=Prosečna cena sata
 TJM=Prosečna cena dana
 CurrentSalary=Trenutna plata
-THMDescription=Ova vrednost može biti korišćena za procenu cene vremena provedenog na projektu koje su korisnici uneli (ukoliko se koristi modul projekti)
-TJMDescription=Ova vrednost se trenutno koristi samo informativno i ne uzima se u obzir ni za koji obračun.
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
-SalariesStatistics=Statistiques salaires
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/sr_RS/stocks.lang b/htdocs/langs/sr_RS/stocks.lang
index a8efeca1984..9440ebfb778 100644
--- a/htdocs/langs/sr_RS/stocks.lang
+++ b/htdocs/langs/sr_RS/stocks.lang
@@ -3,7 +3,7 @@ WarehouseCard=Kartica magacina
 Warehouse=Magacin
 Warehouses=Magacini
 ParentWarehouse=Parent warehouse
-NewWarehouse=Novi magacin / Skladište
+NewWarehouse=New warehouse / Stock Location
 WarehouseEdit=Izmeni magacin
 MenuNewWarehouse=Novi magacin
 WarehouseSource=Izvorni magacin
@@ -29,6 +29,8 @@ MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Oblast magacina
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
 Location=Lokacija
 LocationSummary=Kratak naziv lokacije
 NumberOfDifferentProducts=Broj različitih proizvoda
@@ -44,7 +46,6 @@ TransferStock=Prenos zaliha
 MassStockTransferShort=Zbirni transfer zalliha
 StockMovement=Kretanje zaliha
 StockMovements=Kretanja zaliha
-LabelMovement=Naziv prometa
 NumberOfUnit=Broj jedinica
 UnitPurchaseValue=Kupovna cena jedinice
 StockTooLow=Zalihe su premale
@@ -54,21 +55,23 @@ PMPValue=Prosecna cena
 PMPValueShort=PC
 EnhancedValueOfWarehouses=Vrednost magacina
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Allow to add limit and desired stock per couple (product, warehouse) instead of per product
-IndependantSubProductStock=Zaliha proizvoda i pod-proizvoda su nezavisne
+AllowAddLimitStockByWarehouse=Manage also values for minimum and desired stock per pairing (product-warehouse) in addition to values per product
+IndependantSubProductStock=Product stock and subproduct stock are independent
 QtyDispatched=Raspoređena količina
 QtyDispatchedShort=Raspodeljena kol.
 QtyToDispatchShort=Kol. za raspodelu
 OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Pravila za automatsko smanjivanje zaliha (ručno smanjivanje je uvek moguće, čak i kada je automatsko pravilo aktivirano)
-RuleForStockManagementIncrease=Pravila za automatsko uvećanje zaliha (ručno uvećanje je uvek moguće, čak i kada je automatsko pravilo aktivirano)
-DeStockOnBill=Smanji realne zalihe nakon potvrde računa/kreditne note klijenta
-DeStockOnValidateOrder=Smanji realne zalihe nakon potvrde narudžbine klijenta
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
 DeStockOnShipment=Smanji realne zalihe nakon potvrde računa/kreditne note dobavljača
-DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification closed
-ReStockOnBill=Povećaj realne zalihe nakon potvrde računa/kreditne note dobavljača
-ReStockOnValidateOrder=Increase real stocks on purchase orders approbation
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=Narudžbina nema status koji omogućava otpremu proizvoda u magacin.
 StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
 NoPredefinedProductToDispatch=Nema predefinisanih proizvoda za ovaj objekat. Stoga otprema u zalihu nije potrebna.
@@ -76,12 +79,12 @@ DispatchVerb=Raspodela
 StockLimitShort=Limit za alertiranje
 StockLimit=Limit zalihe za alertiranje
 StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
-PhysicalStock=Fizička zaliha
+PhysicalStock=Physical Stock
 RealStock=Realna zaliha
-RealStockDesc=Physical or real stock is the stock you currently have into your internal warehouses/emplacements.
-RealStockWillAutomaticallyWhen=The real stock will automatically change according to this rules (see stock module setup to change this):
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Fiktivna zaliha
-VirtualStockDesc=Virtual stock is the stock you will get once all open pending actions that affect stocks will be closed (supplier order received, customer order shipped, ...)
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
 IdWarehouse=Id magacina
 DescWareHouse=Opis magacina
 LieuWareHouse=Lokacija magacina
@@ -101,7 +104,7 @@ ThisWarehouseIsPersonalStock=Ovaj magacin predstavlja ličnu zalihu od %s %s
 SelectWarehouseForStockDecrease=Izaberi magacin za smanjenje zalihe
 SelectWarehouseForStockIncrease=Izaberi magacin za povećanje zalihe
 NoStockAction=Nema akcija zalihe
-DesiredStock=Desired optimal stock
+DesiredStock=Desired Stock
 DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
 StockToBuy=Za narudžbinu
 Replenishment=Dopunjavanje
@@ -114,13 +117,13 @@ CurentSelectionMode=Trenutan način selekcije
 CurentlyUsingVirtualStock=Fiktivna zaliha
 CurentlyUsingPhysicalStock=Fzička zaliha
 RuleForStockReplenishment=Pravilo za dopunjavanje zalihe
-SelectProductWithNotNullQty=Izaberite barem jedan prozvod sa pozitivnom količinom i dobavljača
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
 AlertOnly= Samo alertiranja
 WarehouseForStockDecrease=Magacin <b>%s</b> će biti upotrebljen za smanjenje zalihe
 WarehouseForStockIncrease=Magacin <b>%s</b> će biti upotrebljen za uvećanje zalihe
 ForThisWarehouse=Za ovaj magacin
-ReplenishmentStatusDesc=Ovo je lista svih proizvoda sa zalihom manjom od poželjne (ili manjom od vrednosti upozorenja ukoiko je opcija "samo upozorenje" selktirana). Ovom opcijom, možete kreirati narudžbine dobavljača kako biste ispunili razliku.
-ReplenishmentOrdersDesc=This is a list of all open supplier orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Dopunjavanja
 NbOfProductBeforePeriod=Količina proizvoda %s u zalihama pre selektiranog perioda (< %s)
 NbOfProductAfterPeriod=Količina proizvoda %s u zalihama posle selektiranog perioda (> %s)
@@ -130,10 +133,11 @@ RecordMovement=Record transfer
 ReceivingForSameOrder=Prijemnice za ovu narudžbinu
 StockMovementRecorded=Snimljeni prometi zalihe
 RuleForStockAvailability=Pravila na zahtevima zaliha
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever is rule for automatic stock change)
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Naziv prometa
+TypeMovement=Type of movement
 DateMovement=Date of movement
 InventoryCode=Promet ili inventarski kod
 IsInPackage=Sadržan u paketu
@@ -143,11 +147,11 @@ ShowWarehouse=Prikaži magacin
 MovementCorrectStock=Ispravka zalihe za proizvod %s
 MovementTransferStock=Transfer zaliha proizvoda %s u drugi magacin
 InventoryCodeShort=Kod Inv./Krt.
-NoPendingReceptionOnSupplierOrder=Nema prijema po narudžbini dobavljača na čekanju
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
 ThisSerialAlreadyExistWithDifferentDate=Ova serija (<strong>%s</strong>) već postoji, ali sa različitim rokom trajanja/prodaje (nađeno je <strong>%s</strong> ali ste uneli <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
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
 OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
 ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
 ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
@@ -171,16 +175,16 @@ inventoryValidate=Potvrđen
 inventoryDraft=Aktivan
 inventorySelectWarehouse=Warehouse choice
 inventoryConfirmCreate=Kreiraj
-inventoryOfWarehouse=Inventory for warehouse : %s
-inventoryErrorQtyAdd=Error : one quantity is leaser than zero
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
 inventoryMvtStock=By inventory
 inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Filter po kategoriji
-SelectFournisseur=Supplier filter
+SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
 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
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement has date of inventory
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
@@ -195,12 +199,16 @@ AddInventoryProduct=Add product to inventory
 AddProduct=Dodaj
 ApplyPMP=Apply PMP
 FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action ?
+ConfirmFlushInventory=Do you confirm this action?
 InventoryFlushed=Inventory flushed
 ExitEditMode=Exit edition
 inventoryDeleteLine=Obriši red
 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"
+StockSupportServices=Stock management supports Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
 ReceiveProducts=Receive items
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
diff --git a/htdocs/langs/sr_RS/withdrawals.lang b/htdocs/langs/sr_RS/withdrawals.lang
index 867942c51b8..0c7d5011f58 100644
--- a/htdocs/langs/sr_RS/withdrawals.lang
+++ b/htdocs/langs/sr_RS/withdrawals.lang
@@ -12,21 +12,21 @@ WithdrawalsLines=Direct debit order lines
 RequestStandingOrderToTreat=Request for direct debit payment order to process
 RequestStandingOrderTreated=Request for direct debit payment order processed
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Još nije moguće. Status podizanja mora biti podešen na "kreditiran" pre odbijanja određenih linija.
-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
+NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Svota za podizanje
 WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
-ResponsibleUser=Odgovorni korisnik
+ResponsibleUser=User Responsible
 WithdrawalsSetup=Direct debit payment setup
 WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
-ThirdPartyBankCode=Bankarski kod subjekta
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Označi kreditirano
 ClassCreditedConfirm=Da li ste sigurni da želite da označite ovaj račun podizanja kao kreditiran na Vašem bankovnom računu ?
 TransData=Datum prenosa
@@ -50,7 +50,7 @@ StatusMotif0=Neodređen
 StatusMotif1=Nedovoljno sredstava
 StatusMotif2=Primedba na zahtev uložena
 StatusMotif3=No direct debit payment order
-StatusMotif4=Narudžbina klijenta
+StatusMotif4=Sales Order
 StatusMotif5=Neupotrebljiv IBAN
 StatusMotif6=Nema sredstava na računu
 StatusMotif7=Pravna odluka
@@ -66,11 +66,11 @@ NotifyCredit=Kredit podizanja
 NumeroNationalEmetter=Nacionalni Broj Pošiljaoca
 WithBankUsingRIB=Za bankovne račune koji koriste RIB
 WithBankUsingBANBIC=Za bankovne račune koji koriste IBAN/BIC/SWIFT
-BankToReceiveWithdraw=Bank account to receive direct debit
+BankToReceiveWithdraw=Receiving Bank Account
 CreditDate=Kreditiraj na
 WithdrawalFileNotCapable=Nemoguće generisati račun podizanja za Vašu zemlju %s (Vaša zemlja nije podržana)
-ShowWithdraw=Prikaži podizanje
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Međutim, ukoliko faktura ima bar jedno podizanje koje još uvek nije obrađeno, neće biti označena kao plaćena kako bi omogućila upravljanje podizanjima.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Fajl podizanja
 SetToStatusSent=Podesi status "Fajl poslat"
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistike po statusu linija
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -87,13 +87,13 @@ 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
+CreditorName=Creditor 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
+ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
@@ -102,6 +102,10 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/sv_SE/accountancy.lang b/htdocs/langs/sv_SE/accountancy.lang
index cc4e983de30..1e46c6e213c 100644
--- a/htdocs/langs/sv_SE/accountancy.lang
+++ b/htdocs/langs/sv_SE/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Här kan du se listan över tredje partskunder och säljare
 ListAccounts=Förteckning över redovisningskonton
 UnknownAccountForThirdparty=Okänt tredje part konto. Vi använder %s
 UnknownAccountForThirdpartyBlocking=Okänt tredje part konto. Blockeringsfel
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Tredjepartskonto ej definierat eller tredjepart okänt. Blockeringsfel.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Okänt tredje part konto och väntande konto inte definierat. Blockeringsfel
 PaymentsNotLinkedToProduct=Betalning som inte är kopplad till någon produkt / tjänst
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Exportera till Cogilog
 Modelcsv_agiris=Exportera till Agiris
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Exportera CSV konfigurerbar
-Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Diagram över konton Id
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Utan giltigt dedikerat konto
 WithValidAccount=Med giltigt dedikerat konto
 ValueNotIntoChartOfAccount=Detta värde på bokföringskonto finns inte i kontoplan
 AccountRemovedFromGroup=Konto borttaget från grupp
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Räckvidd av bokföringskonto
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Linjer som ännu inte är bundna, använd menyn <a hr
 
 ## Import
 ImportAccountingEntries=Redovisningsposter
-
+DateExport=Date export
 WarningReportNotReliable=Varning, den här rapporten är inte baserad på huvudboken-modulen, så den innehåller inte transaktioner modifierad manuellt i huvudboken. Om din bokföring är uppdaterad är bokföringsvisningen mer exakt.
 ExpenseReportJournal=Kostnadsrapportsloggbok
 InventoryJournal=Inventarieloggbok
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index fb58a213e47..b967f1948a8 100644
--- a/htdocs/langs/sv_SE/admin.lang
+++ b/htdocs/langs/sv_SE/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=Detta område ger administrationsfunktioner. Använd menyn f
 Purge=Rensa
 PurgeAreaDesc=På den här sidan kan du radera alla filer som genereras eller lagras av Dolibarr (temporära filer eller alla filer i <b> %s </b> katalog). Att använda den här funktionen är normalt inte nödvändig. Den tillhandahålls som en lösning för användare vars Dolibarr är värd av en leverantör som inte erbjuder behörigheter för att radera filer som genereras av webbservern.
 PurgeDeleteLogFile=Ta bort loggfiler, inklusive <b> %s </b> definierad för Syslog-modulen (ingen risk att förlora data)
-PurgeDeleteTemporaryFiles=Ta bort alla tillfälliga filer (ingen risk för att du förlorar data)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Ta bort temporära filer
 PurgeDeleteAllFilesInDocumentsDir=Ta bort alla filer i katalogen: <b> %s </b>. <br> Detta tar bort alla genererade dokument relaterade till elementer (tredje part, fakturor etc ...), filer som laddas upp i ECM-modulen, databassäkerhetskopior och tillfälliga filer.
 PurgeRunNow=Rensa nu
@@ -804,6 +804,7 @@ Permission401=Läs rabatter
 Permission402=Skapa / ändra rabatter
 Permission403=Bekräfta rabatter
 Permission404=Ta bort rabatter
+Permission430=Use Debug Bar
 Permission511=Läs lönesättning
 Permission512=Skapa / ändra lönesättning
 Permission514=Radera löner
@@ -818,6 +819,9 @@ Permission532=Skapa / modifiera tjänster
 Permission534=Ta bort tjänster
 Permission536=Se / Hantera dolda tjänster
 Permission538=Exportera tjänster
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Läs donationer
 Permission702=Skapa / ändra donationer
 Permission703=Ta bort donationer
@@ -837,6 +841,12 @@ Permission1101=Läs leveransorder
 Permission1102=Skapa / ändra leveransorder
 Permission1104=Bekräfta leveransorder
 Permission1109=Ta bort leveransorder
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Läs leverantörer
 Permission1182=Läs köporder
 Permission1183=Skapa / ändra inköpsorder
@@ -859,16 +869,6 @@ Permission1251=Kör massiv import av externa data till databasen (data last)
 Permission1321=Export kundfakturor, attribut och betalningar
 Permission1322=Öppna en betald faktura igen
 Permission1421=Exportera försäljningsorder och attribut
-Permission20001=Läs ledighetsförfrågningar (din ledighet och dina underordnade)
-Permission20002=Skapa / ändra dina förfrågningar (din ledighet och dina underordnade)
-Permission20003=Radera ledighets förfrågningar
-Permission20004=Läs alla lämnar förfrågningar (även om användare inte är underordnade)
-Permission20005=Skapa / ändra ledighetsbegäran för alla (även av användare som inte är underordnade)
-Permission20006=Admins ledighetsansökan (upprätta och uppdatera balanser)
-Permission23001=Läs Planerad jobb
-Permission23002=Skapa / uppdatera Schemalagt jobb
-Permission23003=Radera schemalagt jobb
-Permission23004=Utför schemalagt jobb
 Permission2401=Läs åtgärder (händelser eller uppgifter) kopplade till sitt konto
 Permission2402=Skapa / ändra åtgärder (händelser eller uppgifter) kopplade till sitt konto
 Permission2403=Radera åtgärder (händelser eller uppgifter) kopplade till sitt konto
@@ -882,9 +882,41 @@ Permission2503=Lämna eller ta bort dokument
 Permission2515=Setup dokument kataloger
 Permission2801=Använd FTP-klient i läsläge (bläddra och ladda endast)
 Permission2802=Använd FTP-klient i skrivläge (radera eller ladda upp filer)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Läs ledighetsförfrågningar (din ledighet och dina underordnade)
+Permission20002=Skapa / ändra dina förfrågningar (din ledighet och dina underordnade)
+Permission20003=Radera ledighets förfrågningar
+Permission20004=Läs alla lämnar förfrågningar (även om användare inte är underordnade)
+Permission20005=Skapa / ändra ledighetsbegäran för alla (även av användare som inte är underordnade)
+Permission20006=Admins ledighetsansökan (upprätta och uppdatera balanser)
+Permission23001=Läs Planerad jobb
+Permission23002=Skapa / uppdatera Schemalagt jobb
+Permission23003=Radera schemalagt jobb
+Permission23004=Utför schemalagt jobb
 Permission50101=Använd försäljningsstället
 Permission50201=Läs transaktioner
 Permission50202=Importera transaktioner
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Print
 Permission55001=Läs omröstningar
 Permission55002=Skapa / ändra omröstningar
@@ -1078,7 +1110,7 @@ AreaForAdminOnly=Inställningsparametrar kan ställas in av <b> endast administr
 SystemInfoDesc=System information diverse teknisk information får du i skrivskyddad läge och synlig för administratörer bara.
 SystemAreaForAdminOnly=Det här området är endast tillgängligt för administratörsanvändare. Dolibarr användarbehörigheter kan inte ändra denna begränsning.
 CompanyFundationDesc=Redigera företagets / enhetens uppgifter. Klicka på "%s" eller "%s" knappen längst ner på sidan.
-AccountantDesc=Redigera uppgifter från din revisor / bokförare
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parametrar som påverkar utseende och beteende hos Dolibarr kan ändras här.
 AvailableModules=Tillgängliga app / moduler
@@ -1891,3 +1923,5 @@ IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute s
 UrlForIFTTT=URL endpoint for IFTTT
 YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/sv_SE/banks.lang b/htdocs/langs/sv_SE/banks.lang
index d277961d233..362ce017000 100644
--- a/htdocs/langs/sv_SE/banks.lang
+++ b/htdocs/langs/sv_SE/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=Inte avstämd
 CustomerInvoicePayment=Kundbetalning
 SupplierInvoicePayment=Leverantörsbetalning
 SubscriptionPayment=Teckning betalning
-WithdrawalPayment=Tillbakadragande betalning
+WithdrawalPayment=Debit payment order
 SocialContributionPayment=Sociala och skattemässiga betalningar
 BankTransfer=Banköverföring
 BankTransfers=Banköverföringar
diff --git a/htdocs/langs/sv_SE/cashdesk.lang b/htdocs/langs/sv_SE/cashdesk.lang
index d2fbafb545e..3198cfb4ebe 100644
--- a/htdocs/langs/sv_SE/cashdesk.lang
+++ b/htdocs/langs/sv_SE/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/sv_SE/mails.lang b/htdocs/langs/sv_SE/mails.lang
index 869c13ac765..b9b24d111c8 100644
--- a/htdocs/langs/sv_SE/mails.lang
+++ b/htdocs/langs/sv_SE/mails.lang
@@ -19,6 +19,8 @@ MailTopic=E-postämne
 MailText=Meddelande
 MailFile=Bifogade filer
 MailMessage=E-organ
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
 ShowEMailing=Visa e-post
 ListOfEMailings=Lista över emailings
 NewMailing=Ny e-post
@@ -31,20 +33,20 @@ CreateMailing=Skapa e-post
 TestMailing=Testa e-post
 ValidMailing=Gäller e-post
 MailingStatusDraft=Förslag
-MailingStatusValidated=Validerad
+MailingStatusValidated=Bekräftat
 MailingStatusSent=Skickat
 MailingStatusSentPartialy=Skickas partiellt
 MailingStatusSentCompletely=Skickade helt
 MailingStatusError=Fel
 MailingStatusNotSent=Skickas inte
 MailSuccessfulySent=E-post (från %s till %s) godkänd för leverans
-MailingSuccessfullyValidated=E-post validerades
+MailingSuccessfullyValidated=E-post bekräftades
 MailUnsubcribe=Avanmälan
 MailingStatusNotContact=Kontakta inte längre
 MailingStatusReadAndUnsubscribe=Läs och avsluta prenumerationen
 ErrorMailRecipientIsEmpty=E-postmottagare är tom
 WarningNoEMailsAdded=Inga nya E-posta lägga till mottagarens lista.
-ConfirmValidMailing=Är du säker på att du vill validera den här e-posten?
+ConfirmValidMailing=Är du säker på att du vill bekräfta den här e-posten?
 ConfirmResetMailing=Varning, genom att återinitiera e-post <b> %s </b>, tillåter du att sända det här mejlet i en bulkutskick. Är du säker på att du vill göra det här?
 ConfirmDeleteMailing=Är du säker på att du vill radera den här e-posten?
 NbOfUniqueEMails=Antal unika e-postmeddelanden
@@ -76,9 +78,9 @@ GroupEmails=Grupp e-postmeddelanden
 OneEmailPerRecipient=Ett e-postmeddelande per mottagare (som standard, en e-post per post vald)
 WarningIfYouCheckOneRecipientPerEmail=Varning! Om du markerar den här rutan betyder det att endast ett e-postmeddelande skickas för flera olika poster, så om ditt meddelande innehåller substitutionsvariabler som refererar till data i en post, blir det inte möjligt att ersätta dem.
 ResultOfMailSending=Resultat av massleverans av e-post
-NbSelected=Nej valt
-NbIgnored=Nej, ignorerad
-NbSent=Nej skickat
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s meddelande (s) skickade.
 ConfirmUnvalidateEmailing=Är du säker på att du vill ändra e-post <b> %s </b> till utkastsstatus?
 MailingModuleDescContactsWithThirdpartyFilter=Kontakt med kundfilter
@@ -99,7 +101,7 @@ MailingArea=EMailings område
 LastMailings=Senaste %s e-postmeddelanden
 TargetsStatistics=Mål statistik
 NbOfCompaniesContacts=Unika kontakter av företag
-MailNoChangePossible=Mottagare för validerade e-post kan inte ändras
+MailNoChangePossible=Mottagare för bekräftades e-post kan inte ändras
 SearchAMailing=Sök utskick
 SendMailing=Skicka e-post
 SentBy=Skickat av
diff --git a/htdocs/langs/sv_SE/members.lang b/htdocs/langs/sv_SE/members.lang
index a71a15fc6b1..c9a52db62c9 100644
--- a/htdocs/langs/sv_SE/members.lang
+++ b/htdocs/langs/sv_SE/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=Välj statistik du vill läsa ...
 MenuMembersStats=Statistik
 LastMemberDate=Senaste medlemsdatum
 LatestSubscriptionDate=Senaste prenumerationsdatum
-Nature=Naturen
+MemberNature=Nature of member
 Public=Information är offentliga
 NewMemberbyWeb=Ny ledamot till. Väntar på godkännande
 NewMemberForm=Ny medlem formen
diff --git a/htdocs/langs/sv_SE/products.lang b/htdocs/langs/sv_SE/products.lang
index 4af84e3ef1b..2497e61f09e 100644
--- a/htdocs/langs/sv_SE/products.lang
+++ b/htdocs/langs/sv_SE/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Leverantörspriser
 SuppliersPricesOfProductsOrServices=Leverantörspriser (av produkter eller tjänster)
 CustomCode=Tull / Varu / HS-kod
 CountryOrigin=Ursprungsland
-Nature=Produkttyp (material / färdig)
+Nature=Nature of produt (material/finished)
 ShortLabel=Kort etikett
 Unit=Enhet
 p=u.
diff --git a/htdocs/langs/sv_SE/salaries.lang b/htdocs/langs/sv_SE/salaries.lang
index 04335dd79a2..73cef33a5e8 100644
--- a/htdocs/langs/sv_SE/salaries.lang
+++ b/htdocs/langs/sv_SE/salaries.lang
@@ -1,18 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger 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=Redovisningskonto som används för tredje part
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Det dedikerade bokföringskontot som definieras på användarkortet kommer endast att användas för Subledger-bokföring. Den här kommer att användas för huvudboken och som standardvärde för Subledger-bokföring om ett dedikerat användarkonto på användare inte är definierat.
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Redovisningskonto som standard för lönebetalningar
 Salary=Lön
 Salaries=Löner
 NewSalaryPayment=Ny löneutbetalning
+AddSalaryPayment=Lägg till lönbetalning
 SalaryPayment=Lönebetalning
 SalariesPayments=Löneutbetalningar
 ShowSalaryPayment=Visa löneutbetalning
-THM=Average hourly rate
-TJM=Average daily rate
-CurrentSalary=Current salary
-THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
-TJMDescription=This value is currently as information only and is not used for any calculation
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
-SalariesStatistics=Statistiques salaires
+THM=Genomsnittlig timpris
+TJM=Genomsnittlig dagskurs
+CurrentSalary=Nuvarande lön
+THMDescription=Det här värdet kan användas för att beräkna kostnaden för tidskrävande på ett projekt som användaren har infört om modulprojekt används
+TJMDescription=Detta värde är för närvarande endast för information och används inte för någon beräkning
+LastSalaries=Senaste %s lönebetalningar
+AllSalaries=Alla lönebetalningar
+SalariesStatistics=Lönestatistik
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/sv_SE/stocks.lang b/htdocs/langs/sv_SE/stocks.lang
index d00ddad0d0a..67a040b0d4d 100644
--- a/htdocs/langs/sv_SE/stocks.lang
+++ b/htdocs/langs/sv_SE/stocks.lang
@@ -27,7 +27,7 @@ ListOfStockMovements=Lista över lagerförändringar
 ListOfInventories=Förteckning över varulager
 MovementId=Rörelse-ID
 StockMovementForId=Rörelse ID %d
-ListMouvementStockProject=Förteckning över aktierörelser förknippade med projektet
+ListMouvementStockProject=Förteckning över lagerpoströrelser förknippade med projektet
 StocksArea=Lager område
 AllWarehouses=Alla lager
 IncludeAlsoDraftOrders=Inkludera även utkast till order
@@ -63,13 +63,15 @@ QtyToDispatchShort=Antal att skicka
 OrderDispatch=Varukvitton
 RuleForStockManagementDecrease=Välj Regel för automatisk lagerminskning (manuell minskning är alltid möjlig, även om en automatisk minskningsregel är aktiverad)
 RuleForStockManagementIncrease=Välj Regel för automatisk lagerhöjning (manuell ökning är alltid möjlig, även om en automatisk ökningsregel är aktiverad)
-DeStockOnBill=Minska reella aktier vid valideringen av kundfaktura / kreditnot
-DeStockOnValidateOrder=Minska reella aktier vid valideringen av försäljningsordern
-DeStockOnShipment=Minska reella lager på fraktvalidering
-DeStockOnShipmentOnClosing=Minska reella lager på fraktklassificering stängd
-ReStockOnBill=Öka reella aktier vid validering av leverantörsfaktura / kreditnot
-ReStockOnValidateOrder=Öka reella aktier vid köpordergodkännande
+DeStockOnBill=Minska reella lagerposter vid bekräftandet av kundfaktura / kreditnot
+DeStockOnValidateOrder=Minska reella lagerposter vid bekräftandet av försäljningsordern
+DeStockOnShipment=Minska reella lager på fraktbekräftande
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Öka reella lagerposter vid bekräftande av leverantörsfaktura / kreditnot
+ReStockOnValidateOrder=Öka reella lagerposter vid köpordergodkännande
 ReStockOnDispatchOrder=Öka reella lager vid manuell leverans till lager, efter inköpsorderfrist av varor
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=Beställningen har ännu inte / inte längre status som tillåter sändning av produkter till lager.
 StockDiffPhysicTeoric=Förklaring till skillnad mellan fysiskt och virtuellt lager
 NoPredefinedProductToDispatch=Inga fördefinierade produkter för det här objektet. Så ingen sändning till lager krävs.
@@ -82,7 +84,7 @@ RealStock=Real Stock
 RealStockDesc=Fysisk / reell lager är beståndet för närvarande i lagerlokalerna.
 RealStockWillAutomaticallyWhen=Den reala beståndet kommer att ändras enligt denna regel (enligt definitionen i Stock-modulen):
 VirtualStock=Virtuellt lager
-VirtualStockDesc=Virtuellt lager är det beräknade lagret tillgängligt när alla öppna / pågående åtgärder (som påverkar aktierna) är stängda (inköpsorder mottagna, beställda leveransorder etc.)
+VirtualStockDesc=Virtuellt lager är det beräknade lagret tillgängligt när alla öppna / pågående åtgärder (som påverkar lagerposterna) är stängda (inköpsorder mottagna, beställda leveransorder etc.)
 IdWarehouse=Id lager
 DescWareHouse=Beskrivning lager
 LieuWareHouse=Lokalisering lager
@@ -146,7 +148,7 @@ MovementCorrectStock=Lagerkorrigering för produkt %s
 MovementTransferStock=Lagerförflyttning av produkt %s till ett annat lager
 InventoryCodeShort=Inv./Mov. koda
 NoPendingReceptionOnSupplierOrder=Ingen väntande mottagning på grund av öppen inköpsorder
-ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
+ThisSerialAlreadyExistWithDifferentDate=Detta parti / serienummer (<strong> %s </strong>) existerar redan men med olika eatby eller sellby datum (hittade <strong> %s </strong> men du anger <strong> %s </strong>).
 OpenAll=Öppna för alla åtgärder
 OpenInternal=Öppnas endast för interna åtgärder
 UseDispatchStatus=Använd en leveransstatus (godkänna / neka) för produktlinjer vid inköpsordermottagning
@@ -162,14 +164,14 @@ inventorySetup = Inventory Setup
 inventoryCreatePermission=Skapa ny inventering
 inventoryReadPermission=Visa varulager
 inventoryWritePermission=Uppdatera varulager
-inventoryValidatePermission=Validera inventering
+inventoryValidatePermission=Bekräfta inventering
 inventoryTitle=Lager
 inventoryListTitle=varulager
 inventoryListEmpty=Ingen inventering pågår
 inventoryCreateDelete=Skapa / Radera inventering
 inventoryCreate=Skapa ny
 inventoryEdit=Redigera
-inventoryValidate=Validerade
+inventoryValidate=Bekräftade
 inventoryDraft=Löpande
 inventorySelectWarehouse=Lagerval
 inventoryConfirmCreate=Skapa
diff --git a/htdocs/langs/sv_SE/website.lang b/htdocs/langs/sv_SE/website.lang
index 79c01a8b4aa..bdecce66d17 100644
--- a/htdocs/langs/sv_SE/website.lang
+++ b/htdocs/langs/sv_SE/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/sv_SE/withdrawals.lang b/htdocs/langs/sv_SE/withdrawals.lang
index 6d4dbee2daf..46e809839dc 100644
--- a/htdocs/langs/sv_SE/withdrawals.lang
+++ b/htdocs/langs/sv_SE/withdrawals.lang
@@ -27,8 +27,8 @@ MakeWithdrawRequest=Gör en förskottsbetalningsförfrågan
 WithdrawRequestsDone=%s begärda betalningsförfrågningar
 ThirdPartyBankCode=Tredjeparts bankkod
 NoInvoiceCouldBeWithdrawed=Ingen faktura debiteras framgångsrikt. Kontrollera att fakturor är på företag med en giltig IBAN och att IBAN har en UMR (Unique Mandate Reference) med läget <strong> %s </strong>.
-ClassCredited=Klassificera krediteras
-ClassCreditedConfirm=Är du säker på att du vill klassificera detta tillbakadragande mottagande som krediteras på ditt bankkonto?
+ClassCredited=Märk krediterad
+ClassCreditedConfirm=Är du säker på att du vill märka detta tillbakadragande mottagande som krediteras på ditt bankkonto?
 TransData=Datum Transmission
 TransMetod=Metod Transmission
 Send=Skicka
@@ -69,12 +69,12 @@ WithBankUsingBANBIC=För bankkonton som använder IBAN / BIC / SWIFT
 BankToReceiveWithdraw=Mottagande bankkonto
 CreditDate=Krediter på
 WithdrawalFileNotCapable=Det går inte att skapa uttags kvitto fil för ditt land %s (ditt land stöds inte)
-ShowWithdraw=Visa Dra
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Om faktura har minst ett uttag betalning som ännu inte behandlats, kommer det inte anges som betalas för att hantera uttag innan.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=Med den här fliken kan du begära en order för direktbetalning. När du är klar, gå till menyn Bank-> Direktbetalningsorder för att hantera betalningsordern. När betalningsordern är stängd registreras betalning på faktura automatiskt och fakturan stängs om återstoden betalas är null.
 WithdrawalFile=Utträde fil
 SetToStatusSent=Ställ in på status "File Skickat"
-ThisWillAlsoAddPaymentOnInvoice=Detta kommer också att registrera betalningar till fakturor och klassificera dem som "Betalda" om det kvarstår att betala är null
+ThisWillAlsoAddPaymentOnInvoice=Detta kommer också att registrera betalningar till fakturor och märka dem som "Betalda" om det kvarstår att betala är noll
 StatisticsByLineStatus=Statistik efter status linjer
 RUM=UMR
 RUMLong=Unik Mandatreferens
diff --git a/htdocs/langs/sw_SW/accountancy.lang b/htdocs/langs/sw_SW/accountancy.lang
index daa5b4ef413..bb141cb9eb0 100644
--- a/htdocs/langs/sw_SW/accountancy.lang
+++ b/htdocs/langs/sw_SW/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Consult here the list of third-party customers and vendors
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third-party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
-Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Without valid dedicated account
 WithValidAccount=With valid dedicated account
 ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
 AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Range of accounting account
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
-
+DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/sw_SW/admin.lang b/htdocs/langs/sw_SW/admin.lang
index e8a5dda7efb..9eaa12ec9be 100644
--- a/htdocs/langs/sw_SW/admin.lang
+++ b/htdocs/langs/sw_SW/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
@@ -804,6 +804,7 @@ Permission401=Read discounts
 Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
+Permission430=Use Debug Bar
 Permission511=Read payments of salaries
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
@@ -818,6 +819,9 @@ Permission532=Create/modify services
 Permission534=Delete services
 Permission536=See/manage hidden services
 Permission538=Export services
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
@@ -837,6 +841,12 @@ Permission1101=Read delivery orders
 Permission1102=Create/modify delivery orders
 Permission1104=Validate delivery orders
 Permission1109=Delete delivery orders
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Read suppliers
 Permission1182=Read purchase orders
 Permission1183=Create/modify purchase orders
@@ -859,16 +869,6 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those 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)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
 Permission2401=Read actions (events or tasks) linked to his account
 Permission2402=Create/modify actions (events or tasks) linked to his account
 Permission2403=Delete actions (events or tasks) linked to his account
@@ -882,9 +882,41 @@ Permission2503=Submit or delete documents
 Permission2515=Setup documents directories
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those 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)
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale
 Permission50201=Read transactions
 Permission50202=Import transactions
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Print
 Permission55001=Read polls
 Permission55002=Create/modify polls
@@ -1078,7 +1110,7 @@ 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 to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
-AccountantDesc=Edit the details of your accountant/bookkeeper
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
@@ -1891,3 +1923,5 @@ IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute s
 UrlForIFTTT=URL endpoint for IFTTT
 YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/sw_SW/banks.lang b/htdocs/langs/sw_SW/banks.lang
index cb39150b627..c77158e07b7 100644
--- a/htdocs/langs/sw_SW/banks.lang
+++ b/htdocs/langs/sw_SW/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
 SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Subscription payment
-WithdrawalPayment=Withdrawal payment
+WithdrawalPayment=Debit payment order
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
diff --git a/htdocs/langs/sw_SW/cashdesk.lang b/htdocs/langs/sw_SW/cashdesk.lang
index 006097b7e82..ea0e660ed2d 100644
--- a/htdocs/langs/sw_SW/cashdesk.lang
+++ b/htdocs/langs/sw_SW/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/sw_SW/mails.lang b/htdocs/langs/sw_SW/mails.lang
index b50faffe2fa..8b92cef3103 100644
--- a/htdocs/langs/sw_SW/mails.lang
+++ b/htdocs/langs/sw_SW/mails.lang
@@ -19,6 +19,8 @@ MailTopic=Email topic
 MailText=Message
 MailFile=Attached files
 MailMessage=Email body
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
 ShowEMailing=Show emailing
 ListOfEMailings=List of emailings
 NewMailing=New emailing
@@ -76,9 +78,9 @@ GroupEmails=Group emails
 OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
 WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
 ResultOfMailSending=Result of mass Email sending
-NbSelected=No. selected
-NbIgnored=No. ignored
-NbSent=No. sent
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
diff --git a/htdocs/langs/sw_SW/members.lang b/htdocs/langs/sw_SW/members.lang
index 9517568846c..9993e05428f 100644
--- a/htdocs/langs/sw_SW/members.lang
+++ b/htdocs/langs/sw_SW/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
-Nature=Nature
+MemberNature=Nature of member
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
diff --git a/htdocs/langs/sw_SW/products.lang b/htdocs/langs/sw_SW/products.lang
index 402779cb00f..7b68f5b3ebd 100644
--- a/htdocs/langs/sw_SW/products.lang
+++ b/htdocs/langs/sw_SW/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
-Nature=Product Type (material/finished)
+Nature=Nature of produt (material/finished)
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/sw_SW/salaries.lang b/htdocs/langs/sw_SW/salaries.lang
index 6a82354edae..7c3c08a65bd 100644
--- a/htdocs/langs/sw_SW/salaries.lang
+++ b/htdocs/langs/sw_SW/salaries.lang
@@ -1,18 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger 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_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
 Salary=Salary
 Salaries=Salaries
 NewSalaryPayment=New salary payment
+AddSalaryPayment=Add salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
 ShowSalaryPayment=Show salary payment
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
-THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
-TJMDescription=This value is currently as information only and is not used for any calculation
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
-SalariesStatistics=Statistiques salaires
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/sw_SW/stocks.lang b/htdocs/langs/sw_SW/stocks.lang
index 8178a8918b7..d42f1a82243 100644
--- a/htdocs/langs/sw_SW/stocks.lang
+++ b/htdocs/langs/sw_SW/stocks.lang
@@ -3,7 +3,7 @@ WarehouseCard=Warehouse card
 Warehouse=Warehouse
 Warehouses=Warehouses
 ParentWarehouse=Parent warehouse
-NewWarehouse=New warehouse / Stock area
+NewWarehouse=New warehouse / Stock Location
 WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
 WarehouseSource=Source warehouse
@@ -29,6 +29,8 @@ MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
 LocationSummary=Short name location
 NumberOfDifferentProducts=Number of different products
@@ -44,7 +46,6 @@ TransferStock=Transfer stock
 MassStockTransferShort=Mass stock transfer
 StockMovement=Stock movement
 StockMovements=Stock movements
-LabelMovement=Movement label
 NumberOfUnit=Number of units
 UnitPurchaseValue=Unit purchase price
 StockTooLow=Stock too low
@@ -54,21 +55,23 @@ PMPValue=Weighted average price
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Allow to add limit and desired stock per couple (product, warehouse) instead of per product
-IndependantSubProductStock=Product stock and subproduct stock are independant
+AllowAddLimitStockByWarehouse=Manage also values for minimum and desired stock per pairing (product-warehouse) in addition to values per product
+IndependantSubProductStock=Product stock and subproduct stock are independent
 QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
-RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
-DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
-DeStockOnValidateOrder=Decrease real stocks on customers orders validation
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
 DeStockOnShipment=Decrease real stocks on shipping validation
-DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification closed
-ReStockOnBill=Increase real stocks on suppliers invoices/credit notes validation
-ReStockOnValidateOrder=Increase real stocks on purchase orders approbation
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows dispatching of products in stock warehouses.
 StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
 NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required.
@@ -76,12 +79,12 @@ DispatchVerb=Dispatch
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
 StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
-PhysicalStock=Physical stock
+PhysicalStock=Physical Stock
 RealStock=Real Stock
-RealStockDesc=Physical or real stock is the stock you currently have into your internal warehouses/emplacements.
-RealStockWillAutomaticallyWhen=The real stock will automatically change according to this rules (see stock module setup to change this):
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
-VirtualStockDesc=Virtual stock is the stock you will get once all open pending actions that affect stocks will be closed (supplier order received, customer order shipped, ...)
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
@@ -101,7 +104,7 @@ ThisWarehouseIsPersonalStock=This warehouse represents personal stock of %s %s
 SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
 SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
 NoStockAction=No stock action
-DesiredStock=Desired optimal stock
+DesiredStock=Desired Stock
 DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
 StockToBuy=To order
 Replenishment=Replenishment
@@ -114,13 +117,13 @@ CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtual stock
 CurentlyUsingPhysicalStock=Physical stock
 RuleForStockReplenishment=Rule for stocks replenishment
-SelectProductWithNotNullQty=Select at least one product with a qty not null and a supplier
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
 AlertOnly= Alerts only
 WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is a list of all open supplier orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,10 +133,11 @@ RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever is rule for automatic stock change)
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
+TypeMovement=Type of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -143,11 +147,11 @@ ShowWarehouse=Show warehouse
 MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
 OpenAll=Open for all actions
 OpenInternal=Open only for internal actions
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on supplier order reception
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
 OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
 ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
 ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
@@ -171,16 +175,16 @@ inventoryValidate=Validated
 inventoryDraft=Running
 inventorySelectWarehouse=Warehouse choice
 inventoryConfirmCreate=Create
-inventoryOfWarehouse=Inventory for warehouse : %s
-inventoryErrorQtyAdd=Error : one quantity is leaser than zero
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
 inventoryMvtStock=By inventory
 inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
-SelectFournisseur=Supplier filter
+SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
 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
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement has date of inventory
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
@@ -195,12 +199,16 @@ AddInventoryProduct=Add product to inventory
 AddProduct=Add
 ApplyPMP=Apply PMP
 FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action ?
+ConfirmFlushInventory=Do you confirm this action?
 InventoryFlushed=Inventory flushed
 ExitEditMode=Exit edition
 inventoryDeleteLine=Delete line
 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"
+StockSupportServices=Stock management supports Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
 ReceiveProducts=Receive items
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
diff --git a/htdocs/langs/sw_SW/withdrawals.lang b/htdocs/langs/sw_SW/withdrawals.lang
index 3defcec975a..cbca2b2f103 100644
--- a/htdocs/langs/sw_SW/withdrawals.lang
+++ b/htdocs/langs/sw_SW/withdrawals.lang
@@ -12,21 +12,21 @@ 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
+NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Amount to withdraw
 WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
-ResponsibleUser=Responsible user
+ResponsibleUser=User Responsible
 WithdrawalsSetup=Direct debit payment setup
 WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
-ThirdPartyBankCode=Third party bank code
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Classify credited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
@@ -50,7 +50,7 @@ StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
 StatusMotif2=Request contested
 StatusMotif3=No direct debit payment order
-StatusMotif4=Customer Order
+StatusMotif4=Sales Order
 StatusMotif5=RIB unusable
 StatusMotif6=Account without balance
 StatusMotif7=Judicial Decision
@@ -66,11 +66,11 @@ NotifyCredit=Withdrawal Credit
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=For bank accounts using RIB
 WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
-BankToReceiveWithdraw=Bank account to receive direct debit
+BankToReceiveWithdraw=Receiving Bank Account
 CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
-ShowWithdraw=Show Withdraw
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -87,13 +87,13 @@ 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
+CreditorName=Creditor 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
+ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
@@ -102,6 +102,10 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/th_TH/accountancy.lang b/htdocs/langs/th_TH/accountancy.lang
index 49afe5a1c3f..b895dec5004 100644
--- a/htdocs/langs/th_TH/accountancy.lang
+++ b/htdocs/langs/th_TH/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Consult here the list of third-party customers and vendors
 ListAccounts=รายการบัญชีที่บัญชี
 UnknownAccountForThirdparty=Unknown third-party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
-Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Without valid dedicated account
 WithValidAccount=With valid dedicated account
 ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
 AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Range of accounting account
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
-
+DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang
index 5e29578df8b..1dc638b8ef8 100644
--- a/htdocs/langs/th_TH/admin.lang
+++ b/htdocs/langs/th_TH/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=ล้าง
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=ล้างในขณะนี้
@@ -804,6 +804,7 @@ Permission401=อ่านส่วนลด
 Permission402=สร้าง / แก้ไขส่วนลด
 Permission403=ตรวจสอบส่วนลด
 Permission404=ลบส่วนลด
+Permission430=Use Debug Bar
 Permission511=Read payments of salaries
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
@@ -818,6 +819,9 @@ Permission532=สร้าง / แก้ไขบริการ
 Permission534=ลบบริการ
 Permission536=ดู / จัดการบริการซ่อน
 Permission538=บริการส่งออก
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=อ่านบริจาค
 Permission702=สร้าง / แก้ไขการบริจาค
 Permission703=ลบบริจาค
@@ -837,6 +841,12 @@ Permission1101=อ่านคำสั่งซื้อการจัดส
 Permission1102=สร้าง / แก้ไขคำสั่งซื้อการจัดส่ง
 Permission1104=ตรวจสอบการสั่งซื้อการจัดส่ง
 Permission1109=ลบคำสั่งซื้อการจัดส่ง
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=อ่านซัพพลายเออร์
 Permission1182=Read purchase orders
 Permission1183=Create/modify purchase orders
@@ -859,16 +869,6 @@ Permission1251=เรียกมวลของการนำเข้าข
 Permission1321=ส่งออกใบแจ้งหนี้ของลูกค้าคุณลักษณะและการชำระเงิน
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
-Permission20003=ลบออกจากการร้องขอ
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=ธุรการร้องขอลา (การติดตั้งและการปรับปรุงความสมดุล)
-Permission23001=อ่านงานที่กำหนดเวลาไว้
-Permission23002=สร้าง / การปรับปรุงกำหนดเวลางาน
-Permission23003=ลบงานที่กำหนด
-Permission23004=การดำเนินงานที่กำหนด
 Permission2401=อ่านการกระทำ (เหตุการณ์หรืองาน) ที่เชื่อมโยงกับบัญชีของเขา
 Permission2402=สร้าง / แก้ไขการกระทำ (เหตุการณ์หรืองาน) ที่เชื่อมโยงกับบัญชีของเขา
 Permission2403=ลบการกระทำ (เหตุการณ์หรืองาน) ที่เชื่อมโยงกับบัญชีของเขา
@@ -882,9 +882,41 @@ Permission2503=ส่งเอกสารหรือลบ
 Permission2515=ไดเรกทอรีเอกสารการติดตั้ง
 Permission2801=ใช้โปรแกรม FTP ในโหมดอ่าน (เรียกดูและดาวน์โหลดเท่านั้น)
 Permission2802=ใช้โปรแกรม FTP ในโหมดเขียน (ลบหรืออัปโหลดไฟล์)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
+Permission20003=ลบออกจากการร้องขอ
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
+Permission20006=ธุรการร้องขอลา (การติดตั้งและการปรับปรุงความสมดุล)
+Permission23001=อ่านงานที่กำหนดเวลาไว้
+Permission23002=สร้าง / การปรับปรุงกำหนดเวลางาน
+Permission23003=ลบงานที่กำหนด
+Permission23004=การดำเนินงานที่กำหนด
 Permission50101=Use Point of Sale
 Permission50201=อ่านการทำธุรกรรม
 Permission50202=การทำธุรกรรมนำเข้า
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=พิมพ์
 Permission55001=อ่านโพลล์
 Permission55002=สร้าง / แก้ไขโพลล์
@@ -1078,7 +1110,7 @@ AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=ข้อมูลระบบข้อมูลทางด้านเทคนิคอื่น ๆ ที่คุณได้รับในโหมดอ่านอย่างเดียวและมองเห็นสำหรับผู้ดูแลระบบเท่านั้น
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
-AccountantDesc=Edit the details of your accountant/bookkeeper
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
@@ -1891,3 +1923,5 @@ IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute s
 UrlForIFTTT=URL endpoint for IFTTT
 YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/th_TH/banks.lang b/htdocs/langs/th_TH/banks.lang
index dba838ca5e5..0c53745fb4c 100644
--- a/htdocs/langs/th_TH/banks.lang
+++ b/htdocs/langs/th_TH/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=Not reconciled
 CustomerInvoicePayment=การชำระเงินของลูกค้า
 SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=การชำระเงินการสมัครสมาชิก
-WithdrawalPayment=การชำระเงินการถอนเงิน
+WithdrawalPayment=Debit payment order
 SocialContributionPayment=สังคม / ชำระภาษีการคลัง
 BankTransfer=โอนเงินผ่านธนาคาร
 BankTransfers=ธนาคารโอน
diff --git a/htdocs/langs/th_TH/cashdesk.lang b/htdocs/langs/th_TH/cashdesk.lang
index 571571abd1e..5169a6d4e38 100644
--- a/htdocs/langs/th_TH/cashdesk.lang
+++ b/htdocs/langs/th_TH/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/th_TH/mails.lang b/htdocs/langs/th_TH/mails.lang
index 11fee5e616a..74c88d35808 100644
--- a/htdocs/langs/th_TH/mails.lang
+++ b/htdocs/langs/th_TH/mails.lang
@@ -19,6 +19,8 @@ MailTopic=Email topic
 MailText=ข่าวสาร
 MailFile=ไฟล์ที่แนบมา
 MailMessage=ร่างกายอีเมล์
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
 ShowEMailing=แสดงการส่งอีเมล
 ListOfEMailings=รายการ emailings
 NewMailing=ส่งอีเมลใหม่
@@ -76,9 +78,9 @@ GroupEmails=Group emails
 OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
 WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
 ResultOfMailSending=Result of mass Email sending
-NbSelected=No. selected
-NbIgnored=No. ignored
-NbSent=No. sent
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
diff --git a/htdocs/langs/th_TH/members.lang b/htdocs/langs/th_TH/members.lang
index ee30645427f..af17c1e554c 100644
--- a/htdocs/langs/th_TH/members.lang
+++ b/htdocs/langs/th_TH/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=เลือกสถิติที่คุณต้อ
 MenuMembersStats=สถิติ
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
-Nature=ธรรมชาติ
+MemberNature=Nature of member
 Public=ข้อมูลเป็นสาธารณะ
 NewMemberbyWeb=สมาชิกใหม่ที่เพิ่ม รอการอนุมัติ
 NewMemberForm=แบบฟอร์มการสมัครสมาชิกใหม่
diff --git a/htdocs/langs/th_TH/products.lang b/htdocs/langs/th_TH/products.lang
index 6794219d028..ce6d14c6dc6 100644
--- a/htdocs/langs/th_TH/products.lang
+++ b/htdocs/langs/th_TH/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=ประเทศแหล่งกำเนิดสินค้า
-Nature=Product Type (material/finished)
+Nature=Nature of produt (material/finished)
 ShortLabel=ป้ายสั้น
 Unit=หน่วย
 p=ยู
diff --git a/htdocs/langs/th_TH/salaries.lang b/htdocs/langs/th_TH/salaries.lang
index 0e8786f7eb8..c9e3d27c545 100644
--- a/htdocs/langs/th_TH/salaries.lang
+++ b/htdocs/langs/th_TH/salaries.lang
@@ -1,18 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger 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_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
 Salary=เงินเดือน
 Salaries=เงินเดือน
 NewSalaryPayment=การชำระเงินเงินเดือนใหม่
+AddSalaryPayment=Add salary payment
 SalaryPayment=การชำระเงินเงินเดือน
 SalariesPayments=การชำระเงินเงินเดือน
 ShowSalaryPayment=แสดงการชำระเงินเงินเดือน
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=เงินเดือนปัจจุบัน
-THMDescription=ค่านี้อาจจะใช้ในการคำนวณค่าใช้จ่ายของเวลาที่ใช้ในโครงการที่ป้อนโดยผู้ใช้หากโครงการโมดูลถูกนำมาใช้
-TJMDescription=ค่านี้เป็นในปัจจุบันเป็นข้อมูลเท่านั้นและไม่ได้ใช้ในการคำนวณใด ๆ
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
-SalariesStatistics=Statistiques salaires
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/th_TH/stocks.lang b/htdocs/langs/th_TH/stocks.lang
index 935cc286a5d..c211054ac56 100644
--- a/htdocs/langs/th_TH/stocks.lang
+++ b/htdocs/langs/th_TH/stocks.lang
@@ -3,7 +3,7 @@ WarehouseCard=บัตรคลังสินค้า
 Warehouse=คลังสินค้า
 Warehouses=โกดัง
 ParentWarehouse=Parent warehouse
-NewWarehouse=คลังสินค้าใหม่ / พื้นที่สต็อก
+NewWarehouse=New warehouse / Stock Location
 WarehouseEdit=แก้ไขคลังสินค้า
 MenuNewWarehouse=คลังสินค้าใหม่
 WarehouseSource=คลังสินค้าที่มา
@@ -29,6 +29,8 @@ MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=พื้นที่โกดัง
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
 Location=สถานที่
 LocationSummary=ที่ตั้งชื่อสั้น
 NumberOfDifferentProducts=จำนวนของผลิตภัณฑ์ที่แตกต่างกัน
@@ -44,7 +46,6 @@ TransferStock=Transfer stock
 MassStockTransferShort=Mass stock transfer
 StockMovement=Stock movement
 StockMovements=Stock movements
-LabelMovement=ป้ายเคลื่อนไหว
 NumberOfUnit=จำนวนหน่วย
 UnitPurchaseValue=ราคาซื้อหน่วย
 StockTooLow=หุ้นต่ำเกินไป
@@ -54,21 +55,23 @@ PMPValue=ราคาเฉลี่ยถ่วงน้ำหนัก
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=ค่าโกดัง
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Allow to add limit and desired stock per couple (product, warehouse) instead of per product
-IndependantSubProductStock=สต็อกสินค้าและสต็อก subproduct เป็นอิสระ
+AllowAddLimitStockByWarehouse=Manage also values for minimum and desired stock per pairing (product-warehouse) in addition to values per product
+IndependantSubProductStock=Product stock and subproduct stock are independent
 QtyDispatched=ปริมาณส่ง
 QtyDispatchedShort=จำนวนส่ง
 QtyToDispatchShort=จำนวนการจัดส่ง
 OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
-RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
-DeStockOnBill=ลดหุ้นที่แท้จริงในใบแจ้งหนี้ลูกค้า / บันทึกการตรวจสอบเครดิต
-DeStockOnValidateOrder=ลดหุ้นที่แท้จริงในการตรวจสอบการสั่งซื้อของลูกค้า
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
 DeStockOnShipment=Decrease real stocks on shipping validation
-DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification closed
-ReStockOnBill=เพิ่มหุ้นที่แท้จริงในใบแจ้งหนี้ซัพพลายเออร์ / บันทึกการตรวจสอบเครดิต
-ReStockOnValidateOrder=Increase real stocks on purchase orders approbation
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=การสั่งซื้อที่ยังไม่ได้มีหรือไม่ขึ้นสถานะที่ช่วยให้การจัดส่งสินค้าในคลังสินค้าหุ้น
 StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
 NoPredefinedProductToDispatch=ไม่มีสินค้าที่กำหนดไว้ล่วงหน้าสำหรับวัตถุนี้ จึงไม่มีการฝึกอบรมในสต็อกจะต้อง
@@ -76,12 +79,12 @@ DispatchVerb=ฆ่า
 StockLimitShort=จำกัด สำหรับการแจ้งเตือน
 StockLimit=ขีด จำกัด ของสต็อกสำหรับการแจ้งเตือน
 StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
-PhysicalStock=หุ้นทางกายภาพ
+PhysicalStock=Physical Stock
 RealStock=หุ้นจริง
-RealStockDesc=Physical or real stock is the stock you currently have into your internal warehouses/emplacements.
-RealStockWillAutomaticallyWhen=The real stock will automatically change according to this rules (see stock module setup to change this):
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=หุ้นเสมือนจริง
-VirtualStockDesc=Virtual stock is the stock you will get once all open pending actions that affect stocks will be closed (supplier order received, customer order shipped, ...)
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
 IdWarehouse=คลังสินค้า Id
 DescWareHouse=คลังสินค้ารายละเอียด
 LieuWareHouse=คลังสินค้าภาษาท้องถิ่น
@@ -101,7 +104,7 @@ ThisWarehouseIsPersonalStock=คลังสินค้านี้เป็น
 SelectWarehouseForStockDecrease=เลือกคลังสินค้าที่จะใช้สำหรับการลดลงของหุ้น
 SelectWarehouseForStockIncrease=เลือกคลังสินค้าที่จะใช้สำหรับการเพิ่มขึ้นของหุ้น
 NoStockAction=ไม่มีการกระทำหุ้น
-DesiredStock=Desired optimal stock
+DesiredStock=Desired Stock
 DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
 StockToBuy=ต้องการสั่งซื้อ
 Replenishment=การเสริมกำลัง
@@ -114,13 +117,13 @@ CurentSelectionMode=โหมดการเลือกปัจจุบัน
 CurentlyUsingVirtualStock=หุ้นเสมือนจริง
 CurentlyUsingPhysicalStock=หุ้นทางกายภาพ
 RuleForStockReplenishment=กฎสำหรับหุ้นการเติมเต็ม
-SelectProductWithNotNullQty=เลือกผลิตภัณฑ์อย่างน้อยหนึ่งที่มีจำนวนไม่เป็นโมฆะและผู้จัดจำหน่าย
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
 AlertOnly= การแจ้งเตือนเท่านั้น
 WarehouseForStockDecrease=<b>s คลังสินค้า%</b> จะใช้สำหรับการลดลงของหุ้น
 WarehouseForStockIncrease=<b>คลังสินค้า% s</b> จะใช้สำหรับการเพิ่มขึ้นของหุ้น
 ForThisWarehouse=สำหรับคลังสินค้านี้
-ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is a list of all open supplier orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=replenishments
 NbOfProductBeforePeriod=ปริมาณของ% s สินค้าในสต็อกก่อนระยะเวลาที่เลือก (<% s)
 NbOfProductAfterPeriod=จำนวนของผลิตภัณฑ์% s ในสต็อกหลังจากระยะเวลาที่เลือก (>% s)
@@ -130,10 +133,11 @@ RecordMovement=Record transfer
 ReceivingForSameOrder=ใบเสร็จรับเงินสำหรับการสั่งซื้อนี้
 StockMovementRecorded=การเคลื่อนไหวของหุ้นที่บันทึกไว้
 RuleForStockAvailability=หลักเกณฑ์ในการความต้องการหุ้น
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever is rule for automatic stock change)
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=ป้ายของการเคลื่อนไหว
+TypeMovement=Type of movement
 DateMovement=Date of movement
 InventoryCode=การเคลื่อนไหวหรือรหัสสินค้าคงคลัง
 IsInPackage=เป็นแพคเกจที่มีอยู่
@@ -143,11 +147,11 @@ ShowWarehouse=แสดงคลังสินค้า
 MovementCorrectStock=แก้ไขหุ้นสำหรับผลิตภัณฑ์% s
 MovementTransferStock=การโอนหุ้นของผลิตภัณฑ์% s เข้าไปในโกดังอีก
 InventoryCodeShort=Inv. / Mov รหัส
-NoPendingReceptionOnSupplierOrder=ไม่มีการรับสัญญาณอยู่ระหว่างการพิจารณากำหนดจะเปิดเพื่อจัดจำหน่าย
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
 ThisSerialAlreadyExistWithDifferentDate=จำนวนมากนี้ / หมายเลขประจำเครื่อง <strong>(% s)</strong> อยู่แล้ว แต่ด้วยความแตกต่างกันหรือ eatby วัน sellby <strong>(ที่พบ% s แต่คุณป้อน% 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
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
 OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
 ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
 ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
@@ -171,16 +175,16 @@ inventoryValidate=ผ่านการตรวจสอบ
 inventoryDraft=วิ่ง
 inventorySelectWarehouse=Warehouse choice
 inventoryConfirmCreate=สร้าง
-inventoryOfWarehouse=Inventory for warehouse : %s
-inventoryErrorQtyAdd=Error : one quantity is leaser than zero
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
 inventoryMvtStock=By inventory
 inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=ตัวกรองหมวดหมู่
-SelectFournisseur=Supplier filter
+SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
 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
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement has date of inventory
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
@@ -195,12 +199,16 @@ AddInventoryProduct=Add product to inventory
 AddProduct=เพิ่ม
 ApplyPMP=Apply PMP
 FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action ?
+ConfirmFlushInventory=Do you confirm this action?
 InventoryFlushed=Inventory flushed
 ExitEditMode=Exit edition
 inventoryDeleteLine=ลบบรรทัด
 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"
+StockSupportServices=Stock management supports Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
 ReceiveProducts=Receive items
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
diff --git a/htdocs/langs/th_TH/website.lang b/htdocs/langs/th_TH/website.lang
index a6ec5d08d6b..5b59ac7627d 100644
--- a/htdocs/langs/th_TH/website.lang
+++ b/htdocs/langs/th_TH/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/th_TH/withdrawals.lang b/htdocs/langs/th_TH/withdrawals.lang
index a6a19e78f95..b46cf195258 100644
--- a/htdocs/langs/th_TH/withdrawals.lang
+++ b/htdocs/langs/th_TH/withdrawals.lang
@@ -12,21 +12,21 @@ WithdrawalsLines=Direct debit order lines
 RequestStandingOrderToTreat=Request for direct debit payment order to process
 RequestStandingOrderTreated=Request for direct debit payment order processed
 NotPossibleForThisStatusOfWithdrawReceiptORLine=ยังไม่ได้เป็นไปได้ สถานะถอนจะต้องตั้งค่า 'เครดิต' ก่อนที่จะประกาศปฏิเสธสายที่เฉพาะเจาะจง
-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
+NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=จำนวนเงินที่จะถอนตัว
 WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
-ResponsibleUser=ผู้ใช้ที่มีความรับผิดชอบ
+ResponsibleUser=User Responsible
 WithdrawalsSetup=Direct debit payment setup
 WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
-ThirdPartyBankCode=รหัสธนาคารของบุคคลที่สาม
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=จำแนกเครดิต
 ClassCreditedConfirm=คุณแน่ใจว่าคุณต้องการที่จะจำแนกได้รับการถอนนี้เป็นเครดิตในบัญชีธนาคารของคุณ?
 TransData=วันที่ส่ง
@@ -50,7 +50,7 @@ StatusMotif0=ยังไม่ระบุ
 StatusMotif1=เงินไม่เพียงพอ
 StatusMotif2=ขอเข้าร่วมแข่งขัน
 StatusMotif3=No direct debit payment order
-StatusMotif4=สั่งซื้อของลูกค้า
+StatusMotif4=Sales Order
 StatusMotif5=RIB ใช้ไม่ได้
 StatusMotif6=บัญชีโดยไม่สมดุล
 StatusMotif7=การตัดสินใจการพิจารณาคดี
@@ -66,11 +66,11 @@ NotifyCredit=การถอนเครดิต
 NumeroNationalEmetter=จำนวนเครื่องส่งสัญญาณแห่งชาติ
 WithBankUsingRIB=สำหรับบัญชีเงินฝากธนาคารโดยใช้ RIB
 WithBankUsingBANBIC=สำหรับบัญชีเงินฝากธนาคารโดยใช้ IBAN / BIC / SWIFT
-BankToReceiveWithdraw=Bank account to receive direct debit
+BankToReceiveWithdraw=Receiving Bank Account
 CreditDate=เกี่ยวกับบัตรเครดิต
 WithdrawalFileNotCapable=ไม่สามารถสร้างไฟล์ใบเสร็จรับเงินการถอนเงินสำหรับประเทศ% s ของคุณ (ประเทศของคุณไม่ได้รับการสนับสนุน)
-ShowWithdraw=แสดงถอน
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=แต่ถ้าใบแจ้งหนี้ที่มีอย่างน้อยหนึ่งการชำระเงินการถอนเงินยังไม่ได้ดำเนินการก็จะไม่ได้รับการกำหนดให้เป็นจ่ายเพื่อให้การจัดการถอนก่อน
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=ไฟล์ถอนเงิน
 SetToStatusSent=ตั้งสถานะ "แฟ้มส่ง"
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=สถิติตามสถานะของสาย
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -87,13 +87,13 @@ 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
+CreditorName=Creditor 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
+ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
@@ -102,6 +102,10 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/tr_TR/accountancy.lang b/htdocs/langs/tr_TR/accountancy.lang
index 58285ac174f..109fb69160e 100644
--- a/htdocs/langs/tr_TR/accountancy.lang
+++ b/htdocs/langs/tr_TR/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Consult here the list of third-party customers and vendors
 ListAccounts=Muhasebe hesapları listesi
 UnknownAccountForThirdparty=Bilinmeyen üçüncü parti hesabı. %s kullanacağız
 UnknownAccountForThirdpartyBlocking=Bilinmeyen üçüncü parti hesabı. Engelleme hatası
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
-Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Hesap planı Id
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Without valid dedicated account
 WithValidAccount=With valid dedicated account
 ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
 AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Muhasebe hesabı aralığı
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Muhasebe girişleri
-
+DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
index 4e828666f62..29901665231 100644
--- a/htdocs/langs/tr_TR/admin.lang
+++ b/htdocs/langs/tr_TR/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=Bu alan yönetim işlevlerini sunar. İstenilen özelliği s
 Purge=Temizleme
 PurgeAreaDesc=Bu sayfa Dolibarr tarafından oluşturulan veya depolanan tüm dosyaları silmenizi sağlar (<b>%s</b> dizinindeki geçici veya tüm dosyalar). Bu özelliğin kullanılması normalde gerekli değildir. Bu araç, Dolibarr yazılımı web sunucusu tarafından oluşturulan dosyaların silinmesine izin vermeyen bir sağlayıcı tarafından barındırılan kullanıcılar için geçici bir çözüm olarak sunulur.
 PurgeDeleteLogFile=Syslog modülü için tanımlı <b>%s</b> dosyası da dahil olmak üzere günlük dosyalarını sil (veri kaybetme riskiniz yoktur)
-PurgeDeleteTemporaryFiles=Tüm geçici dosyaları sil (veri kaybetme riskiniz yoktur)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Geçici dosyaları sil
 PurgeDeleteAllFilesInDocumentsDir=<b>%s</b> dizinindeki bütün dosyaları sil.<br>Bu işlem, öğelerle (üçüncü partiler, faturalar, v.s.) ilgili oluşturulan tüm dosyaları, ECM modülüne yüklenen dosyaları, veritabanı yedekleme dökümlerini ve geçici dosyaları silecektir.
 PurgeRunNow=Şimdi temizle
@@ -804,6 +804,7 @@ Permission401=İndirim oku
 Permission402=İndirim oluştur/değiştir
 Permission403=İndirim doğrula
 Permission404=İndirim sil
+Permission430=Use Debug Bar
 Permission511=Maaş ödemelerini okuyun
 Permission512=Maaş ödemeleri oluşturun/değiştirin
 Permission514=Maaş ödemelerini silin
@@ -818,6 +819,9 @@ Permission532=Hizmet oluştur/değiştir
 Permission534=Hizmet sil
 Permission536=Gizli hizmetleri gör/yönet
 Permission538=Hizmet dışaaktar
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Bağış oluştur/değiştir
 Permission702=Bağış sil
 Permission703=Bağış sil
@@ -837,6 +841,12 @@ Permission1101=Teslimat emirlerini oku
 Permission1102=Teslimat emri oluştur/değiştir
 Permission1104=Teslimat emri doğrula
 Permission1109=Teslim emri sil
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Tedarikçi oku
 Permission1182=Tedarikçi siparişlerini oku
 Permission1183=Tedarikçi siparişleri oluştur/değiştir
@@ -859,16 +869,6 @@ Permission1251=Dış verilerin veritabanına toplu olarak alınmasını çalış
 Permission1321=Müşteri faturalarını, özniteliklerin ve ödemelerini dışaaktar
 Permission1322=Ödenmiş bir faturayı yeniden aç
 Permission1421=Müşteri siparişleri ve niteliklerini dışa aktar
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
-Permission20003=İzin isteği sil
-Permission20004=Read all leave requests (even of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
-Permission20006=Yönetici izin istekleri (ayarla ve bakiye güncelle)
-Permission23001=Planlı iş oku
-Permission23002=Planlı iş oluştur/güncelle
-Permission23003=Planlı iş sil
-Permission23004=Planlı iş yürüt
 Permission2401=Onun hesabına bağlı eylemleri (etkinlikleri veya görevleri) oku
 Permission2402=Onun hesabına bağlı eylemler (etkinlikler veya görevler) oluştur/değiştir
 Permission2403=Onun hesabına bağlı eylemleri (etkinlikleri veya görevleri) sil
@@ -882,9 +882,41 @@ Permission2503=Belge gönder ya da sil
 Permission2515=Belge dizinlerini kur
 Permission2801=Okuma modunda FTP istemcisi kullan (yalnızca tara ve indir)
 Permission2802=Yazma modunda FTP istemcisi kullan (sil ya da dosya yükle)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
+Permission20003=İzin isteği sil
+Permission20004=Read all leave requests (even of user not subordinates)
+Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
+Permission20006=Yönetici izin istekleri (ayarla ve bakiye güncelle)
+Permission23001=Planlı iş oku
+Permission23002=Planlı iş oluştur/güncelle
+Permission23003=Planlı iş sil
+Permission23004=Planlı iş yürüt
 Permission50101=Satış Noktası Kullan
 Permission50201=Işlemleri oku
 Permission50202=İçeaktarma işlemleri
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Yazdır
 Permission55001=Anket oku
 Permission55002=Anket oluştur/düzenle
@@ -1078,7 +1110,7 @@ AreaForAdminOnly=Kurulum parametreleri sadece <b>yönetici olan kullanıcılar</
 SystemInfoDesc=Sistem bilgileri sadece okuma modunda ve yöneticiler için görüntülenen çeşitli teknik bilgilerdir.
 SystemAreaForAdminOnly=Bu alan yalnızca yönetici kullanıcılar tarafından kullanılabilir. Dolibarr kullanıcı izinleri bu kısıtlamayı değiştiremez.
 CompanyFundationDesc=Şirketin/varlığın bilgilerini düzenleyin. Sayfanın sonunda yer alan "%s" veya "%s" butonuna tıklayın.
-AccountantDesc=Muhasebecinizin veya şirket hesabınızı tutanların ayrıntılarını düzenleyin
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Muhasebeci kodu
 DisplayDesc=Dolibarr'ın görünümünü ve davranışını etkileyen parametreler buradan özelleştirilebilir.
 AvailableModules=Mevcut uygulamalar/modüller
@@ -1891,3 +1923,5 @@ IFTTTDesc=Bu modül IFTTT'deki etkinlikleri tetiklemek ve/veya harici IFTTT teti
 UrlForIFTTT=IFTTT için URL bitiş noktası
 YouWillFindItOnYourIFTTTAccount=Onu IFTTT hesabınızda bulacaksınız
 EndPointFor=%s için bitiş noktası: %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/tr_TR/banks.lang b/htdocs/langs/tr_TR/banks.lang
index f7fb3a97cf4..e3bbbb68146 100644
--- a/htdocs/langs/tr_TR/banks.lang
+++ b/htdocs/langs/tr_TR/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=Uzlaştırılmadı
 CustomerInvoicePayment=Müşteri ödemesi
 SupplierInvoicePayment=Tedarikçi ödemesi
 SubscriptionPayment=Abonelik ödemesi
-WithdrawalPayment=Para çekme ödemesi
+WithdrawalPayment=Borç ödeme talimatı
 SocialContributionPayment=Sosyal/mali vergi ödemesi
 BankTransfer=Banka havalesi
 BankTransfers=Banka havaleleri
diff --git a/htdocs/langs/tr_TR/cashdesk.lang b/htdocs/langs/tr_TR/cashdesk.lang
index d0a483cb397..ab1dc51a7b7 100644
--- a/htdocs/langs/tr_TR/cashdesk.lang
+++ b/htdocs/langs/tr_TR/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/tr_TR/mails.lang b/htdocs/langs/tr_TR/mails.lang
index 63dc16dda53..dbdba7c025d 100644
--- a/htdocs/langs/tr_TR/mails.lang
+++ b/htdocs/langs/tr_TR/mails.lang
@@ -78,9 +78,9 @@ GroupEmails=Grup e-postaları
 OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
 WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
 ResultOfMailSending=Result of mass Email sending
-NbSelected=No. selected
-NbIgnored=No. ignored
-NbSent=No. sent
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s mesaj gönderildi.
 ConfirmUnvalidateEmailing=<b>%s</b> e-postasını taslak durumuna değiştirmek istediğinizden emin misiniz?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
diff --git a/htdocs/langs/tr_TR/members.lang b/htdocs/langs/tr_TR/members.lang
index 2fb4baffad7..9258e778700 100644
--- a/htdocs/langs/tr_TR/members.lang
+++ b/htdocs/langs/tr_TR/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=Görmek istediğiniz istatistikleri seçin...
 MenuMembersStats=İstatistikler
 LastMemberDate=Son üye tarihi
 LatestSubscriptionDate=Son abonelik tarihi
-Nature=Niteliği
+MemberNature=Nature of member
 Public=Bilgiler geneldir
 NewMemberbyWeb=Yeni üye eklendi. Onay bekliyor
 NewMemberForm=Yeni üyelik formu
diff --git a/htdocs/langs/tr_TR/products.lang b/htdocs/langs/tr_TR/products.lang
index 7870e9a7a65..5266a52fe58 100644
--- a/htdocs/langs/tr_TR/products.lang
+++ b/htdocs/langs/tr_TR/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Tedarikçi fiyatları
 SuppliersPricesOfProductsOrServices=Tedarikçi fiyatları (ürün veya hizmetlerin)
 CustomCode=G.T.İ.P Numarası
 CountryOrigin=Menşei ülke
-Nature=Ürün türü (bitmiş ürün/ham madde)
+Nature=Nature of produt (material/finished)
 ShortLabel=Kısa etiket
 Unit=Birim
 p=Adet
diff --git a/htdocs/langs/tr_TR/salaries.lang b/htdocs/langs/tr_TR/salaries.lang
index ee0da272fdd..f24f0523b95 100644
--- a/htdocs/langs/tr_TR/salaries.lang
+++ b/htdocs/langs/tr_TR/salaries.lang
@@ -17,3 +17,5 @@ TJMDescription=Bu değer şu anda yalnızca bilgi amaçlıdır ve herhangi bir h
 LastSalaries=Son %s maaş ödemeleri
 AllSalaries=Tüm maaş ödemeleri
 SalariesStatistics=Maaş istatistikleri
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/tr_TR/stocks.lang b/htdocs/langs/tr_TR/stocks.lang
index 132a024526d..2e2b7fe7b73 100644
--- a/htdocs/langs/tr_TR/stocks.lang
+++ b/htdocs/langs/tr_TR/stocks.lang
@@ -66,10 +66,12 @@ RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual
 DeStockOnBill=Müşteri faturası/alacak dekontunun doğrulanması ile ilgili gerçek stokları azalt
 DeStockOnValidateOrder=Satış siparişinin doğrulanması ile ilgili gerçek stokları azalt
 DeStockOnShipment=Sevkiyatın onaylanmasıyla gerçek stoku eksilt
-DeStockOnShipmentOnClosing=Sevkiyatın kapalı olarak sınıflandırılmasıyla gerçek stoğu eksilt
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
 ReStockOnBill=Tedarikçi faturası/alacak dekontunun doğrulanması ile ilgili gerçek stokları arttır
 ReStockOnValidateOrder=Tedarikçi siparişinin doğrulanması ile gerçek stokları arttır
 ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=Sipariş henüz yoksa veya stok deposundan gönderime izin veren bir durum varsa.
 StockDiffPhysicTeoric=Fiziki ve sanal stok arasındaki farkın açıklaması
 NoPredefinedProductToDispatch=Bu nesne için önceden tanımlanmış ürünlenyok. Yani stoktan sevk gerekli değildir.
diff --git a/htdocs/langs/tr_TR/website.lang b/htdocs/langs/tr_TR/website.lang
index 4eb1fbba800..85648d7cc51 100644
--- a/htdocs/langs/tr_TR/website.lang
+++ b/htdocs/langs/tr_TR/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Web sitesi içeriğini değiştir
 DeleteAlsoJs=Bu web sitesine özgü tüm javascript dosyaları da silinsin mi?
 DeleteAlsoMedias=Bu web sitesine özgü tüm medya dosyaları da silinsin mi?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/tr_TR/withdrawals.lang b/htdocs/langs/tr_TR/withdrawals.lang
index 29da17c1e3a..001dacc9c1e 100644
--- a/htdocs/langs/tr_TR/withdrawals.lang
+++ b/htdocs/langs/tr_TR/withdrawals.lang
@@ -69,8 +69,8 @@ WithBankUsingBANBIC=IBAN/BIC/SWIFT kullanan banka hesapları için
 BankToReceiveWithdraw=Receiving Bank Account
 CreditDate=Alacak tarihi
 WithdrawalFileNotCapable=Ülkeniz %s için para çekme makbuzu oluşturulamıyor (Ülkeniz desteklenmiyor)
-ShowWithdraw=Para çekme göster
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Faturaya henüz enaz bir ödeme tahsilatı işlenmemişse, para çekme yönetimine izin vermek için ödendi olarak ayarlanamaz.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Para çekme dosyası
 SetToStatusSent="Dosya Gönderildi" durumuna ayarla
diff --git a/htdocs/langs/uk_UA/accountancy.lang b/htdocs/langs/uk_UA/accountancy.lang
index 2052169f9ab..2f8b14ad135 100644
--- a/htdocs/langs/uk_UA/accountancy.lang
+++ b/htdocs/langs/uk_UA/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Consult here the list of third-party customers and vendors
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third-party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
-Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Without valid dedicated account
 WithValidAccount=With valid dedicated account
 ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
 AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Range of accounting account
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
-
+DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang
index ceb2c679946..fe7d48b8ac7 100644
--- a/htdocs/langs/uk_UA/admin.lang
+++ b/htdocs/langs/uk_UA/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
@@ -804,6 +804,7 @@ Permission401=Read discounts
 Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
+Permission430=Use Debug Bar
 Permission511=Read payments of salaries
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
@@ -818,6 +819,9 @@ Permission532=Create/modify services
 Permission534=Delete services
 Permission536=See/manage hidden services
 Permission538=Export services
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
@@ -837,6 +841,12 @@ Permission1101=Read delivery orders
 Permission1102=Create/modify delivery orders
 Permission1104=Validate delivery orders
 Permission1109=Delete delivery orders
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Read suppliers
 Permission1182=Read purchase orders
 Permission1183=Create/modify purchase orders
@@ -859,16 +869,6 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those 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)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
 Permission2401=Read actions (events or tasks) linked to his account
 Permission2402=Create/modify actions (events or tasks) linked to his account
 Permission2403=Delete actions (events or tasks) linked to his account
@@ -882,9 +882,41 @@ Permission2503=Submit or delete documents
 Permission2515=Setup documents directories
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those 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)
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale
 Permission50201=Read transactions
 Permission50202=Import transactions
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Print
 Permission55001=Read polls
 Permission55002=Create/modify polls
@@ -1078,7 +1110,7 @@ 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 to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
-AccountantDesc=Edit the details of your accountant/bookkeeper
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
@@ -1891,3 +1923,5 @@ IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute s
 UrlForIFTTT=URL endpoint for IFTTT
 YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/uk_UA/banks.lang b/htdocs/langs/uk_UA/banks.lang
index 4d678f11e47..092f572878d 100644
--- a/htdocs/langs/uk_UA/banks.lang
+++ b/htdocs/langs/uk_UA/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
 SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Subscription payment
-WithdrawalPayment=Withdrawal payment
+WithdrawalPayment=Debit payment order
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
diff --git a/htdocs/langs/uk_UA/cashdesk.lang b/htdocs/langs/uk_UA/cashdesk.lang
index 17a4e391222..cde699f6e39 100644
--- a/htdocs/langs/uk_UA/cashdesk.lang
+++ b/htdocs/langs/uk_UA/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/uk_UA/mails.lang b/htdocs/langs/uk_UA/mails.lang
index bd73c77347c..5650dbb3967 100644
--- a/htdocs/langs/uk_UA/mails.lang
+++ b/htdocs/langs/uk_UA/mails.lang
@@ -19,6 +19,8 @@ MailTopic=Email topic
 MailText=Message
 MailFile=Attached files
 MailMessage=Email body
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
 ShowEMailing=Show emailing
 ListOfEMailings=List of emailings
 NewMailing=New emailing
@@ -76,9 +78,9 @@ GroupEmails=Group emails
 OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
 WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
 ResultOfMailSending=Result of mass Email sending
-NbSelected=No. selected
-NbIgnored=No. ignored
-NbSent=No. sent
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
diff --git a/htdocs/langs/uk_UA/members.lang b/htdocs/langs/uk_UA/members.lang
index 650336f6c8b..41ac4f38c21 100644
--- a/htdocs/langs/uk_UA/members.lang
+++ b/htdocs/langs/uk_UA/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
-Nature=Nature
+MemberNature=Nature of member
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
diff --git a/htdocs/langs/uk_UA/products.lang b/htdocs/langs/uk_UA/products.lang
index 66e62de38c9..f57c6b76c36 100644
--- a/htdocs/langs/uk_UA/products.lang
+++ b/htdocs/langs/uk_UA/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
-Nature=Product Type (material/finished)
+Nature=Nature of produt (material/finished)
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/uk_UA/salaries.lang b/htdocs/langs/uk_UA/salaries.lang
index 6a82354edae..7c3c08a65bd 100644
--- a/htdocs/langs/uk_UA/salaries.lang
+++ b/htdocs/langs/uk_UA/salaries.lang
@@ -1,18 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger 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_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
 Salary=Salary
 Salaries=Salaries
 NewSalaryPayment=New salary payment
+AddSalaryPayment=Add salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
 ShowSalaryPayment=Show salary payment
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
-THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
-TJMDescription=This value is currently as information only and is not used for any calculation
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
-SalariesStatistics=Statistiques salaires
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/uk_UA/stocks.lang b/htdocs/langs/uk_UA/stocks.lang
index 3dcc762f3d6..5009344db78 100644
--- a/htdocs/langs/uk_UA/stocks.lang
+++ b/htdocs/langs/uk_UA/stocks.lang
@@ -3,7 +3,7 @@ WarehouseCard=Warehouse card
 Warehouse=Warehouse
 Warehouses=Warehouses
 ParentWarehouse=Parent warehouse
-NewWarehouse=New warehouse / Stock area
+NewWarehouse=New warehouse / Stock Location
 WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
 WarehouseSource=Source warehouse
@@ -29,6 +29,8 @@ MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
 Location=Розташування
 LocationSummary=Short name location
 NumberOfDifferentProducts=Number of different products
@@ -44,7 +46,6 @@ TransferStock=Transfer stock
 MassStockTransferShort=Mass stock transfer
 StockMovement=Stock movement
 StockMovements=Stock movements
-LabelMovement=Movement label
 NumberOfUnit=Number of units
 UnitPurchaseValue=Unit purchase price
 StockTooLow=Stock too low
@@ -54,21 +55,23 @@ PMPValue=Weighted average price
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Allow to add limit and desired stock per couple (product, warehouse) instead of per product
-IndependantSubProductStock=Product stock and subproduct stock are independant
+AllowAddLimitStockByWarehouse=Manage also values for minimum and desired stock per pairing (product-warehouse) in addition to values per product
+IndependantSubProductStock=Product stock and subproduct stock are independent
 QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
-RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
-DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
-DeStockOnValidateOrder=Decrease real stocks on customers orders validation
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
 DeStockOnShipment=Decrease real stocks on shipping validation
-DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification closed
-ReStockOnBill=Increase real stocks on suppliers invoices/credit notes validation
-ReStockOnValidateOrder=Increase real stocks on purchase orders approbation
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows dispatching of products in stock warehouses.
 StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
 NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required.
@@ -76,12 +79,12 @@ DispatchVerb=Dispatch
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
 StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
-PhysicalStock=Physical stock
+PhysicalStock=Physical Stock
 RealStock=Real Stock
-RealStockDesc=Physical or real stock is the stock you currently have into your internal warehouses/emplacements.
-RealStockWillAutomaticallyWhen=The real stock will automatically change according to this rules (see stock module setup to change this):
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
-VirtualStockDesc=Virtual stock is the stock you will get once all open pending actions that affect stocks will be closed (supplier order received, customer order shipped, ...)
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
@@ -101,7 +104,7 @@ ThisWarehouseIsPersonalStock=This warehouse represents personal stock of %s %s
 SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
 SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
 NoStockAction=No stock action
-DesiredStock=Desired optimal stock
+DesiredStock=Desired Stock
 DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
 StockToBuy=To order
 Replenishment=Replenishment
@@ -114,13 +117,13 @@ CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtual stock
 CurentlyUsingPhysicalStock=Physical stock
 RuleForStockReplenishment=Rule for stocks replenishment
-SelectProductWithNotNullQty=Select at least one product with a qty not null and a supplier
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
 AlertOnly= Alerts only
 WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is a list of all open supplier orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,10 +133,11 @@ RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever is rule for automatic stock change)
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
+TypeMovement=Type of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -143,11 +147,11 @@ ShowWarehouse=Show warehouse
 MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
 OpenAll=Open for all actions
 OpenInternal=Open only for internal actions
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on supplier order reception
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
 OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
 ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
 ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
@@ -171,16 +175,16 @@ inventoryValidate=Підтверджений
 inventoryDraft=Running
 inventorySelectWarehouse=Warehouse choice
 inventoryConfirmCreate=Create
-inventoryOfWarehouse=Inventory for warehouse : %s
-inventoryErrorQtyAdd=Error : one quantity is leaser than zero
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
 inventoryMvtStock=By inventory
 inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
-SelectFournisseur=Supplier filter
+SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
 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
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement has date of inventory
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
@@ -195,12 +199,16 @@ AddInventoryProduct=Add product to inventory
 AddProduct=Add
 ApplyPMP=Apply PMP
 FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action ?
+ConfirmFlushInventory=Do you confirm this action?
 InventoryFlushed=Inventory flushed
 ExitEditMode=Exit edition
 inventoryDeleteLine=Delete line
 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"
+StockSupportServices=Stock management supports Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
 ReceiveProducts=Receive items
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
diff --git a/htdocs/langs/uk_UA/website.lang b/htdocs/langs/uk_UA/website.lang
index 3a1c6f95d05..2f387580ebc 100644
--- a/htdocs/langs/uk_UA/website.lang
+++ b/htdocs/langs/uk_UA/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/uk_UA/withdrawals.lang b/htdocs/langs/uk_UA/withdrawals.lang
index 3defcec975a..cbca2b2f103 100644
--- a/htdocs/langs/uk_UA/withdrawals.lang
+++ b/htdocs/langs/uk_UA/withdrawals.lang
@@ -12,21 +12,21 @@ 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
+NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Amount to withdraw
 WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
-ResponsibleUser=Responsible user
+ResponsibleUser=User Responsible
 WithdrawalsSetup=Direct debit payment setup
 WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
-ThirdPartyBankCode=Third party bank code
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Classify credited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
@@ -50,7 +50,7 @@ StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
 StatusMotif2=Request contested
 StatusMotif3=No direct debit payment order
-StatusMotif4=Customer Order
+StatusMotif4=Sales Order
 StatusMotif5=RIB unusable
 StatusMotif6=Account without balance
 StatusMotif7=Judicial Decision
@@ -66,11 +66,11 @@ NotifyCredit=Withdrawal Credit
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=For bank accounts using RIB
 WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
-BankToReceiveWithdraw=Bank account to receive direct debit
+BankToReceiveWithdraw=Receiving Bank Account
 CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
-ShowWithdraw=Show Withdraw
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -87,13 +87,13 @@ 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
+CreditorName=Creditor 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
+ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
@@ -102,6 +102,10 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/uz_UZ/accountancy.lang b/htdocs/langs/uz_UZ/accountancy.lang
index daa5b4ef413..bb141cb9eb0 100644
--- a/htdocs/langs/uz_UZ/accountancy.lang
+++ b/htdocs/langs/uz_UZ/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Consult here the list of third-party customers and vendors
 ListAccounts=List of the accounting accounts
 UnknownAccountForThirdparty=Unknown third-party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
-Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Without valid dedicated account
 WithValidAccount=With valid dedicated account
 ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
 AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Range of accounting account
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
-
+DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang
index e8a5dda7efb..9eaa12ec9be 100644
--- a/htdocs/langs/uz_UZ/admin.lang
+++ b/htdocs/langs/uz_UZ/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Purge now
@@ -804,6 +804,7 @@ Permission401=Read discounts
 Permission402=Create/modify discounts
 Permission403=Validate discounts
 Permission404=Delete discounts
+Permission430=Use Debug Bar
 Permission511=Read payments of salaries
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
@@ -818,6 +819,9 @@ Permission532=Create/modify services
 Permission534=Delete services
 Permission536=See/manage hidden services
 Permission538=Export services
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
@@ -837,6 +841,12 @@ Permission1101=Read delivery orders
 Permission1102=Create/modify delivery orders
 Permission1104=Validate delivery orders
 Permission1109=Delete delivery orders
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Read suppliers
 Permission1182=Read purchase orders
 Permission1183=Create/modify purchase orders
@@ -859,16 +869,6 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those 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)
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
 Permission2401=Read actions (events or tasks) linked to his account
 Permission2402=Create/modify actions (events or tasks) linked to his account
 Permission2403=Delete actions (events or tasks) linked to his account
@@ -882,9 +882,41 @@ Permission2503=Submit or delete documents
 Permission2515=Setup documents directories
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those 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)
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale
 Permission50201=Read transactions
 Permission50202=Import transactions
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=Print
 Permission55001=Read polls
 Permission55002=Create/modify polls
@@ -1078,7 +1110,7 @@ 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 to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
-AccountantDesc=Edit the details of your accountant/bookkeeper
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
@@ -1891,3 +1923,5 @@ IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute s
 UrlForIFTTT=URL endpoint for IFTTT
 YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/uz_UZ/banks.lang b/htdocs/langs/uz_UZ/banks.lang
index cb39150b627..c77158e07b7 100644
--- a/htdocs/langs/uz_UZ/banks.lang
+++ b/htdocs/langs/uz_UZ/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
 SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Subscription payment
-WithdrawalPayment=Withdrawal payment
+WithdrawalPayment=Debit payment order
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
diff --git a/htdocs/langs/uz_UZ/cashdesk.lang b/htdocs/langs/uz_UZ/cashdesk.lang
index 006097b7e82..ea0e660ed2d 100644
--- a/htdocs/langs/uz_UZ/cashdesk.lang
+++ b/htdocs/langs/uz_UZ/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/uz_UZ/mails.lang b/htdocs/langs/uz_UZ/mails.lang
index b50faffe2fa..8b92cef3103 100644
--- a/htdocs/langs/uz_UZ/mails.lang
+++ b/htdocs/langs/uz_UZ/mails.lang
@@ -19,6 +19,8 @@ MailTopic=Email topic
 MailText=Message
 MailFile=Attached files
 MailMessage=Email body
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
 ShowEMailing=Show emailing
 ListOfEMailings=List of emailings
 NewMailing=New emailing
@@ -76,9 +78,9 @@ GroupEmails=Group emails
 OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
 WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
 ResultOfMailSending=Result of mass Email sending
-NbSelected=No. selected
-NbIgnored=No. ignored
-NbSent=No. sent
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
diff --git a/htdocs/langs/uz_UZ/members.lang b/htdocs/langs/uz_UZ/members.lang
index 9517568846c..9993e05428f 100644
--- a/htdocs/langs/uz_UZ/members.lang
+++ b/htdocs/langs/uz_UZ/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=Choose statistics you want to read...
 MenuMembersStats=Statistics
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
-Nature=Nature
+MemberNature=Nature of member
 Public=Information are public
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
diff --git a/htdocs/langs/uz_UZ/products.lang b/htdocs/langs/uz_UZ/products.lang
index 402779cb00f..7b68f5b3ebd 100644
--- a/htdocs/langs/uz_UZ/products.lang
+++ b/htdocs/langs/uz_UZ/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
-Nature=Product Type (material/finished)
+Nature=Nature of produt (material/finished)
 ShortLabel=Short label
 Unit=Unit
 p=u.
diff --git a/htdocs/langs/uz_UZ/salaries.lang b/htdocs/langs/uz_UZ/salaries.lang
index 6a82354edae..7c3c08a65bd 100644
--- a/htdocs/langs/uz_UZ/salaries.lang
+++ b/htdocs/langs/uz_UZ/salaries.lang
@@ -1,18 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger 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_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
 Salary=Salary
 Salaries=Salaries
 NewSalaryPayment=New salary payment
+AddSalaryPayment=Add salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
 ShowSalaryPayment=Show salary payment
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
-THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
-TJMDescription=This value is currently as information only and is not used for any calculation
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
-SalariesStatistics=Statistiques salaires
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/uz_UZ/stocks.lang b/htdocs/langs/uz_UZ/stocks.lang
index 8178a8918b7..d42f1a82243 100644
--- a/htdocs/langs/uz_UZ/stocks.lang
+++ b/htdocs/langs/uz_UZ/stocks.lang
@@ -3,7 +3,7 @@ WarehouseCard=Warehouse card
 Warehouse=Warehouse
 Warehouses=Warehouses
 ParentWarehouse=Parent warehouse
-NewWarehouse=New warehouse / Stock area
+NewWarehouse=New warehouse / Stock Location
 WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
 WarehouseSource=Source warehouse
@@ -29,6 +29,8 @@ MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
 LocationSummary=Short name location
 NumberOfDifferentProducts=Number of different products
@@ -44,7 +46,6 @@ TransferStock=Transfer stock
 MassStockTransferShort=Mass stock transfer
 StockMovement=Stock movement
 StockMovements=Stock movements
-LabelMovement=Movement label
 NumberOfUnit=Number of units
 UnitPurchaseValue=Unit purchase price
 StockTooLow=Stock too low
@@ -54,21 +55,23 @@ PMPValue=Weighted average price
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Allow to add limit and desired stock per couple (product, warehouse) instead of per product
-IndependantSubProductStock=Product stock and subproduct stock are independant
+AllowAddLimitStockByWarehouse=Manage also values for minimum and desired stock per pairing (product-warehouse) in addition to values per product
+IndependantSubProductStock=Product stock and subproduct stock are independent
 QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
-RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
-DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
-DeStockOnValidateOrder=Decrease real stocks on customers orders validation
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
 DeStockOnShipment=Decrease real stocks on shipping validation
-DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification closed
-ReStockOnBill=Increase real stocks on suppliers invoices/credit notes validation
-ReStockOnValidateOrder=Increase real stocks on purchase orders approbation
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows dispatching of products in stock warehouses.
 StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
 NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required.
@@ -76,12 +79,12 @@ DispatchVerb=Dispatch
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
 StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
-PhysicalStock=Physical stock
+PhysicalStock=Physical Stock
 RealStock=Real Stock
-RealStockDesc=Physical or real stock is the stock you currently have into your internal warehouses/emplacements.
-RealStockWillAutomaticallyWhen=The real stock will automatically change according to this rules (see stock module setup to change this):
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
-VirtualStockDesc=Virtual stock is the stock you will get once all open pending actions that affect stocks will be closed (supplier order received, customer order shipped, ...)
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
@@ -101,7 +104,7 @@ ThisWarehouseIsPersonalStock=This warehouse represents personal stock of %s %s
 SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
 SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
 NoStockAction=No stock action
-DesiredStock=Desired optimal stock
+DesiredStock=Desired Stock
 DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
 StockToBuy=To order
 Replenishment=Replenishment
@@ -114,13 +117,13 @@ CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Virtual stock
 CurentlyUsingPhysicalStock=Physical stock
 RuleForStockReplenishment=Rule for stocks replenishment
-SelectProductWithNotNullQty=Select at least one product with a qty not null and a supplier
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
 AlertOnly= Alerts only
 WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is a list of all open supplier orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,10 +133,11 @@ RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever is rule for automatic stock change)
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
+TypeMovement=Type of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -143,11 +147,11 @@ ShowWarehouse=Show warehouse
 MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
 OpenAll=Open for all actions
 OpenInternal=Open only for internal actions
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on supplier order reception
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
 OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
 ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
 ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
@@ -171,16 +175,16 @@ inventoryValidate=Validated
 inventoryDraft=Running
 inventorySelectWarehouse=Warehouse choice
 inventoryConfirmCreate=Create
-inventoryOfWarehouse=Inventory for warehouse : %s
-inventoryErrorQtyAdd=Error : one quantity is leaser than zero
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
 inventoryMvtStock=By inventory
 inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
-SelectFournisseur=Supplier filter
+SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
 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
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement has date of inventory
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
@@ -195,12 +199,16 @@ AddInventoryProduct=Add product to inventory
 AddProduct=Add
 ApplyPMP=Apply PMP
 FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action ?
+ConfirmFlushInventory=Do you confirm this action?
 InventoryFlushed=Inventory flushed
 ExitEditMode=Exit edition
 inventoryDeleteLine=Delete line
 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"
+StockSupportServices=Stock management supports Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
 ReceiveProducts=Receive items
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
diff --git a/htdocs/langs/uz_UZ/withdrawals.lang b/htdocs/langs/uz_UZ/withdrawals.lang
index 3defcec975a..cbca2b2f103 100644
--- a/htdocs/langs/uz_UZ/withdrawals.lang
+++ b/htdocs/langs/uz_UZ/withdrawals.lang
@@ -12,21 +12,21 @@ 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
+NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Amount to withdraw
 WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
-ResponsibleUser=Responsible user
+ResponsibleUser=User Responsible
 WithdrawalsSetup=Direct debit payment setup
 WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
-ThirdPartyBankCode=Third party bank code
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Classify credited
 ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
 TransData=Transmission date
@@ -50,7 +50,7 @@ StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
 StatusMotif2=Request contested
 StatusMotif3=No direct debit payment order
-StatusMotif4=Customer Order
+StatusMotif4=Sales Order
 StatusMotif5=RIB unusable
 StatusMotif6=Account without balance
 StatusMotif7=Judicial Decision
@@ -66,11 +66,11 @@ NotifyCredit=Withdrawal Credit
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=For bank accounts using RIB
 WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
-BankToReceiveWithdraw=Bank account to receive direct debit
+BankToReceiveWithdraw=Receiving Bank Account
 CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
-ShowWithdraw=Show Withdraw
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -87,13 +87,13 @@ 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
+CreditorName=Creditor 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
+ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
@@ -102,6 +102,10 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/vi_VN/accountancy.lang b/htdocs/langs/vi_VN/accountancy.lang
index 06ff329a997..f5d169e2819 100644
--- a/htdocs/langs/vi_VN/accountancy.lang
+++ b/htdocs/langs/vi_VN/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Consult here the list of third-party customers and vendors
 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
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
-Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=Chart of accounts Id
 
@@ -316,6 +317,9 @@ WithoutValidAccount=Without valid dedicated account
 WithValidAccount=With valid dedicated account
 ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
 AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=Range of accounting account
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
-
+DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
index 6d29d3ab5e3..788eb246e10 100644
--- a/htdocs/langs/vi_VN/admin.lang
+++ b/htdocs/langs/vi_VN/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Thanh lọc
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Xóa tập tin nhật ký <b>%s</b> được tạo bởi mô-đun Syslog (không gây nguy hiểm mất dữ liệu)
-PurgeDeleteTemporaryFiles=Xóa toàn bộ các tập tin tạm (không gây nguy hiểm mất dữ liệu)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Thanh lọc bây giờ
@@ -804,6 +804,7 @@ Permission401=Xem giảm giá
 Permission402=Tạo/chỉnh sửa giảm giá
 Permission403=Xác nhận giảm giá
 Permission404=Xóa giảm giá
+Permission430=Use Debug Bar
 Permission511=Read payments of salaries
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
@@ -818,6 +819,9 @@ Permission532=Tạo/chỉnh sửa dịch vụ
 Permission534=Xóa dịch vụ
 Permission536=Xem/quản lý dịch vụ ẩn
 Permission538=Xuất dữ liệu Dịch vụ
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=Đọc thông tin Tài trợ
 Permission702=Tạo/sửa đổi Tài trợ
 Permission703=Xóa tài trợ
@@ -837,6 +841,12 @@ Permission1101=Xem phiếu xuất kho
 Permission1102=Tạo/chỉnh sửa phiếu xuất kho
 Permission1104=Xác nhận phiếu xuất kho
 Permission1109=Xóa phiếu xuất kho
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=Xem nhà cung cấp
 Permission1182=Read purchase orders
 Permission1183=Create/modify purchase orders
@@ -859,16 +869,6 @@ Permission1251=Chạy nhập dữ liệu khối cho dữ liệu bên ngoài vào
 Permission1321=Xuất dữ liệu Hóa đơn khách hàng, các thuộc tính và thanh toán
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
-Permission20003=Xóa yêu cầu nghỉ phép
-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)
-Permission23001=Xem công việc theo lịch trình
-Permission23002=Tạo/cập nhật công việc theo lịch trình
-Permission23003=Xóa công việc theo lịch trình
-Permission23004=Thực thi công việc theo lịch trình
 Permission2401=Xem hành động (sự kiện hay tác vụ) liên quan đến tài khoản của mình
 Permission2402=Tạo/chỉnh sửa hành động (sự kiện hay tác vụ) liên quan đến tài khoản của mình
 Permission2403=Xóa hành động (sự kiện hay tác vụ) liên quan đến tài khoản của mình
@@ -882,9 +882,41 @@ Permission2503=Gửi hoặc xóa tài liệu
 Permission2515=Cài đặt thư mục tài liệu
 Permission2801=Sử dụng FTP client trong chế độ đọc (chỉ duyệt và tải về)
 Permission2802=Sử dụng FTP client trong chế độ ghi (xóa hoặc tải lên các tập tin)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
+Permission20003=Xóa yêu cầu nghỉ phép
+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)
+Permission23001=Xem công việc theo lịch trình
+Permission23002=Tạo/cập nhật công việc theo lịch trình
+Permission23003=Xóa công việc theo lịch trình
+Permission23004=Thực thi công việc theo lịch trình
 Permission50101=Use Point of Sale
 Permission50201=Xem giao dịch
 Permission50202=Giao dịch nhập dữ liệu
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=In
 Permission55001=Xem các thăm dò
 Permission55002=Tạo/chỉnh sửa các thăm dò
@@ -1078,7 +1110,7 @@ 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=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
-AccountantDesc=Edit the details of your accountant/bookkeeper
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=Available app/modules
@@ -1891,3 +1923,5 @@ IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute s
 UrlForIFTTT=URL endpoint for IFTTT
 YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/vi_VN/banks.lang b/htdocs/langs/vi_VN/banks.lang
index 9077e99eff7..8e0f391d5ad 100644
--- a/htdocs/langs/vi_VN/banks.lang
+++ b/htdocs/langs/vi_VN/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=Chưa đối chiếu
 CustomerInvoicePayment=Thanh toán của khách hàng
 SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Thanh toán mô tả
-WithdrawalPayment=Thanh toán rút
+WithdrawalPayment=Debit payment order
 SocialContributionPayment=Thanh toán xã hội/ fiscal tax
 BankTransfer=Chuyển khoản ngân hàng
 BankTransfers=Chuyển khoản ngân hàng
diff --git a/htdocs/langs/vi_VN/cashdesk.lang b/htdocs/langs/vi_VN/cashdesk.lang
index c6d0e61bdd9..db79631b281 100644
--- a/htdocs/langs/vi_VN/cashdesk.lang
+++ b/htdocs/langs/vi_VN/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/vi_VN/mails.lang b/htdocs/langs/vi_VN/mails.lang
index 65847d16a21..d1b43c93928 100644
--- a/htdocs/langs/vi_VN/mails.lang
+++ b/htdocs/langs/vi_VN/mails.lang
@@ -19,6 +19,8 @@ MailTopic=Email topic
 MailText=Tin nhắn
 MailFile=File đính kèm
 MailMessage=Thân email
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
 ShowEMailing=Hiện gửi email
 ListOfEMailings=Danh sách emailings
 NewMailing=Gửi email mới
@@ -76,9 +78,9 @@ GroupEmails=Group emails
 OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
 WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
 ResultOfMailSending=Result of mass Email sending
-NbSelected=No. selected
-NbIgnored=No. ignored
-NbSent=No. sent
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
diff --git a/htdocs/langs/vi_VN/members.lang b/htdocs/langs/vi_VN/members.lang
index 944a3874227..e01bf313a28 100644
--- a/htdocs/langs/vi_VN/members.lang
+++ b/htdocs/langs/vi_VN/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=Chọn thống kê mà bạn muốn đọc ...
 MenuMembersStats=Thống kê
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
-Nature=Tự nhiên
+MemberNature=Nature of member
 Public=Thông tin được công khai
 NewMemberbyWeb=Thành viên mới được bổ sung. Đang chờ phê duyệt
 NewMemberForm=Hình thức thành viên mới
diff --git a/htdocs/langs/vi_VN/products.lang b/htdocs/langs/vi_VN/products.lang
index a4ef841f267..48b032f77fc 100644
--- a/htdocs/langs/vi_VN/products.lang
+++ b/htdocs/langs/vi_VN/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Nước xuất xứ
-Nature=Product Type (material/finished)
+Nature=Nature of produt (material/finished)
 ShortLabel=Nhãn ngắn
 Unit=Đơn vị
 p=u.
diff --git a/htdocs/langs/vi_VN/salaries.lang b/htdocs/langs/vi_VN/salaries.lang
index 941078203cf..2565b881e40 100644
--- a/htdocs/langs/vi_VN/salaries.lang
+++ b/htdocs/langs/vi_VN/salaries.lang
@@ -1,18 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger 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_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
 Salary=Mức lương
 Salaries=Tiền lương
 NewSalaryPayment=Thanh toán tiền lương mới
+AddSalaryPayment=Add salary payment
 SalaryPayment=Thanh toán tiền lương
 SalariesPayments=Lương thanh toán
 ShowSalaryPayment=Hiện thanh toán tiền lương
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
-THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
-TJMDescription=This value is currently as information only and is not used for any calculation
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
-SalariesStatistics=Statistiques salaires
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/vi_VN/stocks.lang b/htdocs/langs/vi_VN/stocks.lang
index caaa455973b..dd71f1f441b 100644
--- a/htdocs/langs/vi_VN/stocks.lang
+++ b/htdocs/langs/vi_VN/stocks.lang
@@ -3,7 +3,7 @@ WarehouseCard=Thẻ kho
 Warehouse=Kho
 Warehouses=Các kho hàng
 ParentWarehouse=Parent warehouse
-NewWarehouse=Kho mới / khu vực kho
+NewWarehouse=New warehouse / Stock Location
 WarehouseEdit=Sửa kho
 MenuNewWarehouse=Kho mới
 WarehouseSource=Nguồn kho
@@ -29,6 +29,8 @@ MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
 Location=Đến từ
 LocationSummary=Ngắn vị trí tên
 NumberOfDifferentProducts=Số lượng sản phẩm khác nhau
@@ -44,7 +46,6 @@ TransferStock=Transfer stock
 MassStockTransferShort=Mass stock transfer
 StockMovement=Stock movement
 StockMovements=Stock movements
-LabelMovement=Nhãn Chuyển kho
 NumberOfUnit=Số đơn vị
 UnitPurchaseValue=Giá mua đơn vị
 StockTooLow=Tồn kho quá thấp
@@ -54,21 +55,23 @@ PMPValue=Giá bình quân gia quyền
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Các kho hàng giá trị
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Allow to add limit and desired stock per couple (product, warehouse) instead of per product
-IndependantSubProductStock=Product stock and subproduct stock are independant
+AllowAddLimitStockByWarehouse=Manage also values for minimum and desired stock per pairing (product-warehouse) in addition to values per product
+IndependantSubProductStock=Product stock and subproduct stock are independent
 QtyDispatched=Số lượng cử
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
-RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
-DeStockOnBill=Giảm kho thực tế trên hoá đơn khách hàng / tín dụng ghi xác nhận
-DeStockOnValidateOrder=Giảm tồn kho thực trên khách hàng xác nhận đơn đặt hàng
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
 DeStockOnShipment=Decrease real stocks on shipping validation
-DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification closed
-ReStockOnBill=Tăng tồn kho thực tế các nhà cung cấp hoá đơn tín dụng / ghi xác nhận
-ReStockOnValidateOrder=Increase real stocks on purchase orders approbation
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=Đặt hàng vẫn chưa hoặc không có thêm một trạng thái cho phép điều phối các sản phẩm trong kho kho.
 StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
 NoPredefinedProductToDispatch=Không có sản phẩm được xác định trước cho đối tượng này. Vì vậy, không có điều phối trong kho là bắt buộc.
@@ -76,12 +79,12 @@ DispatchVerb=Công văn
 StockLimitShort=Hạn cảnh báo
 StockLimit=Hạn tồn kho cho cảnh báo
 StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
-PhysicalStock=Tồn kho vật lý
+PhysicalStock=Physical Stock
 RealStock=Tồn kho thực
-RealStockDesc=Physical or real stock is the stock you currently have into your internal warehouses/emplacements.
-RealStockWillAutomaticallyWhen=The real stock will automatically change according to this rules (see stock module setup to change this):
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Tồn kho ảo
-VirtualStockDesc=Virtual stock is the stock you will get once all open pending actions that affect stocks will be closed (supplier order received, customer order shipped, ...)
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
 IdWarehouse=Mã kho
 DescWareHouse=Mô tả kho
 LieuWareHouse=Địa phương hóa kho
@@ -101,7 +104,7 @@ ThisWarehouseIsPersonalStock=Kho này đại diện cho tồn kho cá nhân củ
 SelectWarehouseForStockDecrease=Chọn nhà kho để sử dụng cho kho giảm
 SelectWarehouseForStockIncrease=Chọn nhà kho để sử dụng cho kho tăng
 NoStockAction=Không có hành động kho
-DesiredStock=Desired optimal stock
+DesiredStock=Desired Stock
 DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
 StockToBuy=Để đặt hàng
 Replenishment=Bổ sung
@@ -114,13 +117,13 @@ CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=Tồn kho ảo
 CurentlyUsingPhysicalStock=Tồn kho vật lý
 RuleForStockReplenishment=Quy tắc cho tồn kho bổ sung
-SelectProductWithNotNullQty=Chọn ít nhất một sản phẩm với một SL không null và một nhà cung cấp
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
 AlertOnly= Cảnh báo chỉ
 WarehouseForStockDecrease=<b>Kho% s</b> sẽ được sử dụng cho kho giảm
 WarehouseForStockIncrease=<b>Kho% s</b> sẽ được sử dụng cho kho tăng
 ForThisWarehouse=Đối với kho này
-ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is a list of all open supplier orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Số lượng sản phẩm% s trong kho trước khi thời gian được lựa chọn (<% s)
 NbOfProductAfterPeriod=Số lượng sản phẩm% s trong kho sau khi được lựa chọn thời gian (>% s)
@@ -130,10 +133,11 @@ RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Chuyển động kho được ghi nhận
 RuleForStockAvailability=Quy định về yêu cầu kho
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever is rule for automatic stock change)
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
+TypeMovement=Type of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -143,11 +147,11 @@ ShowWarehouse=Hiện kho
 MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
 OpenAll=Open for all actions
 OpenInternal=Open only for internal actions
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on supplier order reception
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
 OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
 ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
 ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
@@ -171,16 +175,16 @@ inventoryValidate=Đã xác nhận
 inventoryDraft=Đang hoạt động
 inventorySelectWarehouse=Warehouse choice
 inventoryConfirmCreate=Tạo
-inventoryOfWarehouse=Inventory for warehouse : %s
-inventoryErrorQtyAdd=Error : one quantity is leaser than zero
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
 inventoryMvtStock=By inventory
 inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Bộ lọc phân nhóm
-SelectFournisseur=Supplier filter
+SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
 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
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement has date of inventory
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
@@ -195,12 +199,16 @@ AddInventoryProduct=Add product to inventory
 AddProduct=Thêm
 ApplyPMP=Apply PMP
 FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action ?
+ConfirmFlushInventory=Do you confirm this action?
 InventoryFlushed=Inventory flushed
 ExitEditMode=Exit edition
 inventoryDeleteLine=Xóa dòng
 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"
+StockSupportServices=Stock management supports Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
 ReceiveProducts=Receive items
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
diff --git a/htdocs/langs/vi_VN/website.lang b/htdocs/langs/vi_VN/website.lang
index 17a54210b46..3bc8b32f9f0 100644
--- a/htdocs/langs/vi_VN/website.lang
+++ b/htdocs/langs/vi_VN/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/vi_VN/withdrawals.lang b/htdocs/langs/vi_VN/withdrawals.lang
index b023431d670..43a21ea82c2 100644
--- a/htdocs/langs/vi_VN/withdrawals.lang
+++ b/htdocs/langs/vi_VN/withdrawals.lang
@@ -1,32 +1,32 @@
 # 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
+StandingOrdersPayment=Lậnh thanh toán thấu chi trực tiếp
 StandingOrderPayment=Lệnh thanh toán thấu chi trực tiếp
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=Để xử lý
-WithdrawalsReceipts=Direct debit orders
+WithdrawalsReceipts=Lệnh ghi nợ trực tiếp
 WithdrawalReceipt=Lệnh ghi nợ trực tiếp
 LastWithdrawalReceipts=Latest %s direct debit files
 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
+NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Số tiền rút
 WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
-ResponsibleUser=Người sử dụng có trách nhiệm
+ResponsibleUser=User Responsible
 WithdrawalsSetup=Direct debit payment setup
 WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
-ThirdPartyBankCode=Mã ngân hàng của bên thứ ba
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Phân loại ghi
 ClassCreditedConfirm=Bạn có chắc chắn bạn muốn phân loại nhận thu hồi này là ghi có vào tài khoản ngân hàng của bạn?
 TransData=Ngày truyền
@@ -41,7 +41,7 @@ RefusedReason=Lý do từ chối
 RefusedInvoicing=Thanh toán từ chối
 NoInvoiceRefused=Không sạc từ chối
 InvoiceRefused=Hóa đơn bị từ chối (Khách hàng từ chối thanh toán)
-StatusDebitCredit=Status debit/credit
+StatusDebitCredit=Trạng thái thẻ/nợ
 StatusWaiting=Chờ
 StatusTrans=Gửi
 StatusCredited=Ghi
@@ -49,8 +49,8 @@ StatusRefused=Từ chối
 StatusMotif0=Không quy định
 StatusMotif1=Không đủ tiền
 StatusMotif2=Yêu cầu tranh chấp
-StatusMotif3=No direct debit payment order
-StatusMotif4=Khách hàng tự
+StatusMotif3=Không có lệnh thanh toán thấu chi trực tiếp
+StatusMotif4=Sales Order
 StatusMotif5=RIB không sử dụng được
 StatusMotif6=Tài khoản mà không cân bằng
 StatusMotif7=Quyết định tư pháp
@@ -66,11 +66,11 @@ NotifyCredit=Thu hồi tín dụng
 NumeroNationalEmetter=Số quốc gia phát
 WithBankUsingRIB=Đối với tài khoản ngân hàng sử dụng RIB
 WithBankUsingBANBIC=Đối với tài khoản ngân hàng sử dụng IBAN / BIC / SWIFT
-BankToReceiveWithdraw=Bank account to receive direct debit
+BankToReceiveWithdraw=Receiving Bank Account
 CreditDate=Về tín dụng
 WithdrawalFileNotCapable=Không thể tạo file biên lai rút tiền cho quốc gia của bạn %s (Quốc gia của bạn không được hỗ trợ)
-ShowWithdraw=Hiện Rút
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Tuy nhiên, nếu hóa đơn có ít nhất một thanh toán rút chưa qua chế biến, nó sẽ không được thiết lập như là trả tiền để cho phép quản lý thu hồi trước.
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Thu hồi tập tin
 SetToStatusSent=Thiết lập để tình trạng "File gửi"
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -87,13 +87,13 @@ 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
+CreditorName=Creditor 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
+SEPAFormYourName=Tên của bạn
+SEPAFormYourBAN=Tên tài khoản ngân hàng (IBAN)
+SEPAFormYourBIC=Mã định danh ngân hàng (BIC)
+SEPAFrstOrRecur=Loại thanh toán
+ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
@@ -102,6 +102,10 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
diff --git a/htdocs/langs/zh_CN/accountancy.lang b/htdocs/langs/zh_CN/accountancy.lang
index 2691fc68b69..402922e3079 100644
--- a/htdocs/langs/zh_CN/accountancy.lang
+++ b/htdocs/langs/zh_CN/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Consult here the list of third-party customers and vendors
 ListAccounts=会计科目清单
 UnknownAccountForThirdparty=Unknown third-party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=付款未与任何产品/服务相关联
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=导出CSV可配置
-Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=会计科目表ID
 
@@ -316,6 +317,9 @@ WithoutValidAccount=没有有效的专用帐户
 WithValidAccount=有效的专用帐户
 ValueNotIntoChartOfAccount=会计科目的这个值不存在于会计科目表中
 AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=会计科目范围
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=会计分录
-
+DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=费用报告日常报表
 InventoryJournal=库存日常报表
diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang
index cf26b76069e..6373129e03e 100644
--- a/htdocs/langs/zh_CN/admin.lang
+++ b/htdocs/langs/zh_CN/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=清空
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=删除系统日志模块定义的日志文件<b>%s</b>(无数据丢失风险)
-PurgeDeleteTemporaryFiles=删除所有临时文件(无数据丢失风险)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=删除临时文件
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=立即清空
@@ -804,6 +804,7 @@ Permission401=读取折扣
 Permission402=创建/变更折扣
 Permission403=确认折扣
 Permission404=删除折扣
+Permission430=Use Debug Bar
 Permission511=Read payments of salaries
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
@@ -818,6 +819,9 @@ Permission532=创建/变更服务
 Permission534=删除服务
 Permission536=查看/隐藏服务管理
 Permission538=导出服务
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=读取捐款资料
 Permission702=创建/变更捐款资料
 Permission703=删除捐款资料
@@ -837,6 +841,12 @@ Permission1101=读取发货单
 Permission1102=创建/变更发货单
 Permission1104=确认发货单
 Permission1109=删除发货单
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=读取供应商资料
 Permission1182=Read purchase orders
 Permission1183=Create/modify purchase orders
@@ -859,16 +869,6 @@ Permission1251=导入大量外部数据到数据库(载入资料)
 Permission1321=导出客户发票、属性及其付款资料
 Permission1322=重新开立付费账单
 Permission1421=Export sales orders and attributes
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
-Permission20003=删除请假申请
-Permission20004=阅读所有请假申请（即使是非下属用户）
-Permission20005=为每个人创建/修改请假申请（即使是非下属用户）
-Permission20006=管理员请假申请 (setup and update balance)
-Permission23001=读取排定任务
-Permission23002=创建/更新排定任务
-Permission23003=删除排定任务
-Permission23004=执行排定任务
 Permission2401=读取关联至此用户账户的动作(事件或任务)
 Permission2402=创建/变更关联至此用户账户的动作(事件或任务)
 Permission2403=删除关联至此用户账户的动作(事件或任务)
@@ -882,9 +882,41 @@ Permission2503=提交或删除的文档
 Permission2515=设置文档目录
 Permission2801=允许FTP客户端读取(仅供浏览和下载)
 Permission2802=允许FTP客户端写入(删除和上传文件)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
+Permission20003=删除请假申请
+Permission20004=阅读所有请假申请（即使是非下属用户）
+Permission20005=为每个人创建/修改请假申请（即使是非下属用户）
+Permission20006=管理员请假申请 (setup and update balance)
+Permission23001=读取排定任务
+Permission23002=创建/更新排定任务
+Permission23003=删除排定任务
+Permission23004=执行排定任务
 Permission50101=Use Point of Sale
 Permission50201=读取交易
 Permission50202=导入交易
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=打印
 Permission55001=读取调查
 Permission55002=创建/变更调查
@@ -1078,7 +1110,7 @@ AreaForAdminOnly=此功能仅供<b>管理员用户</b> 使用。
 SystemInfoDesc=系统信息指以只读方式显示的其它技术信息，只对系统管理员可见。
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" or "%s" button at the bottom of the page.
-AccountantDesc=Edit the details of your accountant/bookkeeper
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=可用模块
@@ -1891,3 +1923,5 @@ IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute s
 UrlForIFTTT=URL endpoint for IFTTT
 YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/zh_CN/banks.lang b/htdocs/langs/zh_CN/banks.lang
index 997a2507e0d..a45404d90fc 100644
--- a/htdocs/langs/zh_CN/banks.lang
+++ b/htdocs/langs/zh_CN/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=未调解
 CustomerInvoicePayment=客户付款
 SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=认购款项
-WithdrawalPayment=提款支付
+WithdrawalPayment=Debit payment order
 SocialContributionPayment=支付社保/财政税
 BankTransfer=银行转帐
 BankTransfers=银行转帐
diff --git a/htdocs/langs/zh_CN/cashdesk.lang b/htdocs/langs/zh_CN/cashdesk.lang
index cb0f4c89047..5e70a79f888 100644
--- a/htdocs/langs/zh_CN/cashdesk.lang
+++ b/htdocs/langs/zh_CN/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/zh_CN/mails.lang b/htdocs/langs/zh_CN/mails.lang
index 7e8d61a5153..bada6e2d7be 100644
--- a/htdocs/langs/zh_CN/mails.lang
+++ b/htdocs/langs/zh_CN/mails.lang
@@ -19,6 +19,8 @@ MailTopic=Email topic
 MailText=内容
 MailFile=附件
 MailMessage=电子邮件正文
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
 ShowEMailing=显示电子邮件
 ListOfEMailings=邮件列表
 NewMailing=新的电子邮件
@@ -76,9 +78,9 @@ GroupEmails=分组电子邮件
 OneEmailPerRecipient=每位收件人一封电子邮件（默认情况下，每封邮件选择一封
 WarningIfYouCheckOneRecipientPerEmail=警告，如果选中此框，则表示只会为所选的多个记录发送一封电子邮件，因此，如果您的邮件包含引用记录数据的替换变量，则无法替换它们。
 ResultOfMailSending=Result of mass Email sending
-NbSelected=No. selected
-NbIgnored=No. ignored
-NbSent=No. sent
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s发送的消息。
 ConfirmUnvalidateEmailing=您确定要将电子邮件<b> %s </b>更改为草稿状态吗？
 MailingModuleDescContactsWithThirdpartyFilter=与客户过滤器联系
diff --git a/htdocs/langs/zh_CN/members.lang b/htdocs/langs/zh_CN/members.lang
index 4c31e80b663..bc5a1a95e80 100644
--- a/htdocs/langs/zh_CN/members.lang
+++ b/htdocs/langs/zh_CN/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=选择你想读的统计...
 MenuMembersStats=统计
 LastMemberDate=最新成员日期
 LatestSubscriptionDate=最新订阅日期
-Nature=属性
+MemberNature=Nature of member
 Public=信息是否公开
 NewMemberbyWeb=增加了新成员。等待批准中
 NewMemberForm=新成员申请表
diff --git a/htdocs/langs/zh_CN/products.lang b/htdocs/langs/zh_CN/products.lang
index f4c4d733c74..a1323c8069d 100644
--- a/htdocs/langs/zh_CN/products.lang
+++ b/htdocs/langs/zh_CN/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=供应商价格
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=海关/商品/ HS编码
 CountryOrigin=产地国
-Nature=Product Type (material/finished)
+Nature=Nature of produt (material/finished)
 ShortLabel=标签别名
 Unit=单位
 p=u.
diff --git a/htdocs/langs/zh_CN/salaries.lang b/htdocs/langs/zh_CN/salaries.lang
index eb468b19b4c..93c3171f3cd 100644
--- a/htdocs/langs/zh_CN/salaries.lang
+++ b/htdocs/langs/zh_CN/salaries.lang
@@ -1,18 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger 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=用于合伙人的会计帐户
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=财务记账科目代码
 Salary=工资
 Salaries=工资
 NewSalaryPayment=新建工资支付
+AddSalaryPayment=Add salary payment
 SalaryPayment=工资支付
 SalariesPayments=工资支付
 ShowSalaryPayment=显示工资支付
 THM=平均时薪
 TJM=平均日薪
 CurrentSalary=当前薪资
-THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
-TJMDescription=This value is currently as information only and is not used for any calculation
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
-SalariesStatistics=Statistiques salaires
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
+LastSalaries=最新的%s工资支付
+AllSalaries=所有工资支付
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/zh_CN/stocks.lang b/htdocs/langs/zh_CN/stocks.lang
index 96b075a3a98..a203f75ac97 100644
--- a/htdocs/langs/zh_CN/stocks.lang
+++ b/htdocs/langs/zh_CN/stocks.lang
@@ -2,15 +2,15 @@
 WarehouseCard=仓库信息
 Warehouse=仓库
 Warehouses=仓库
-ParentWarehouse=Parent warehouse
-NewWarehouse=新建仓库/库位
+ParentWarehouse=父仓库
+NewWarehouse=New warehouse / Stock Location
 WarehouseEdit=变更仓库
 MenuNewWarehouse=新建仓库
 WarehouseSource=来源仓
 WarehouseSourceNotDefined=没有定义仓库，
-AddWarehouse=Create warehouse
+AddWarehouse=创建仓库
 AddOne=添加
-DefaultWarehouse=Default warehouse
+DefaultWarehouse=默认仓库
 WarehouseTarget=目标仓
 ValidateSending=删除发送
 CancelSending=取消发送
@@ -24,64 +24,67 @@ Movements=运动
 ErrorWarehouseRefRequired=仓库引用的名称是必需的
 ListOfWarehouses=仓库列表
 ListOfStockMovements=库存调拨列表
-ListOfInventories=List of inventories
-MovementId=Movement ID
-StockMovementForId=Movement ID %d
-ListMouvementStockProject=List of stock movements associated to project
+ListOfInventories=清单清单
+MovementId=移库ID
+StockMovementForId=移库ID%d
+ListMouvementStockProject=与项目相关的库存变动清单
 StocksArea=仓库区
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
 Location=位置
 LocationSummary=位置简称
 NumberOfDifferentProducts=不同的产品数
 NumberOfProducts=产品总数
-LastMovement=Latest movement
-LastMovements=Latest movements
+LastMovement=最新移库
+LastMovements=最新移库
 Units=单位
 Unit=单位
-StockCorrection=Stock correction
+StockCorrection=库存修正
 CorrectStock=合适的库存
 StockTransfer=库存转移
 TransferStock=库存调拨
 MassStockTransferShort=批量库存调拨
 StockMovement=库存调拨转移
 StockMovements=库存调拨转移
-LabelMovement=调拨标签
 NumberOfUnit=单位数目
 UnitPurchaseValue=采购单价
 StockTooLow=库存过低
-StockLowerThanLimit=Stock lower than alert limit (%s)
+StockLowerThanLimit=库存低于警戒限额（%s）
 EnhancedValue=值
 PMPValue=加权平均价格
 PMPValueShort=的WAP
 EnhancedValueOfWarehouses=仓库价值
-UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Allow to add limit and desired stock per couple (product, warehouse) instead of per product
-IndependantSubProductStock=Product stock and subproduct stock are independant
+UserWarehouseAutoCreate=创建用户时自动创建用户仓库
+AllowAddLimitStockByWarehouse=Manage also values for minimum and desired stock per pairing (product-warehouse) in addition to values per product
+IndependantSubProductStock=Product stock and subproduct stock are independent
 QtyDispatched=派出数量
 QtyDispatchedShort=派送数量
 QtyToDispatchShort=分配数量
-OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
-RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
-DeStockOnBill=减少来自客户发票或信用凭证中实际库存的验证
-DeStockOnValidateOrder=减少库存对客户订单的确认
+OrderDispatch=物品收据
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
 DeStockOnShipment=减少实际库存送货验证
-DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification closed
-ReStockOnBill=增加对供应商发票的实际库存/信用票据验证
-ReStockOnValidateOrder=Increase real stocks on purchase orders approbation
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=命令还没有或根本没有更多的地位，使产品在仓库库存调度。
-StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
+StockDiffPhysicTeoric=解释物理和虚拟库存之间的差异
 NoPredefinedProductToDispatch=此对象没有预定义的产品。因此，没有库存调度是必需的。
 DispatchVerb=派遣
 StockLimitShort=最小预警值
 StockLimit=最小库存预警
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
-PhysicalStock=实际库存
+StockLimitDesc=（空）表示没有警告。只要库存为空，可以使用0来发出警告。
+PhysicalStock=Physical Stock
 RealStock=实际库存
-RealStockDesc=Physical or real stock is the stock you currently have into your internal warehouses/emplacements.
-RealStockWillAutomaticallyWhen=The real stock will automatically change according to this rules (see stock module setup to change this):
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=虚拟库存
-VirtualStockDesc=Virtual stock is the stock you will get once all open pending actions that affect stocks will be closed (supplier order received, customer order shipped, ...)
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
 IdWarehouse=编号仓库
 DescWareHouse=说明仓库
 LieuWareHouse=本地化仓库
@@ -95,112 +98,117 @@ EstimatedStockValueSell=销量
 EstimatedStockValueShort=输入库存值
 EstimatedStockValue=输入库存值
 DeleteAWarehouse=删除仓库
-ConfirmDeleteWarehouse=Are you sure you want to delete the warehouse <b>%s</b>?
+ConfirmDeleteWarehouse=您确定要删除仓库<b> %s </b>吗？
 PersonalStock=个人库存 %s
 ThisWarehouseIsPersonalStock=此仓库为个人库存 %s %s
 SelectWarehouseForStockDecrease=选择仓库库存减少使用
 SelectWarehouseForStockIncrease=选择使用库存增加的仓库
 NoStockAction=暂无现货的行动
-DesiredStock=最佳库存值
-DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
+DesiredStock=Desired Stock
+DesiredStockDesc=此库存金额将是用于通过补货功能填充库存的值。
 StockToBuy=要订购
 Replenishment=补货
 ReplenishmentOrders=补货订单
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differ
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+VirtualDiffersFromPhysical=根据增加/减少股票期权，实物股票和虚拟股票（实物+当前订单）可能会有所不同
+UseVirtualStockByDefault=默认情况下使用虚拟库存，而不是物理库存，用于补货功能
 UseVirtualStock=使用虚拟库位
 UsePhysicalStock=使用物理库位
 CurentSelectionMode=当前所选模式
 CurentlyUsingVirtualStock=虚拟库位
 CurentlyUsingPhysicalStock=物理库位
 RuleForStockReplenishment=库存补充规则
-SelectProductWithNotNullQty=请至少选择一个数量非空的产品和供应商
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
 AlertOnly= 仅提醒
-WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
-WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
+WarehouseForStockDecrease=仓库<b> %s </b>将用于库存减少
+WarehouseForStockIncrease=仓库<b> %s </b>将用于库存增加
 ForThisWarehouse=这个仓库
-ReplenishmentStatusDesc=下面列表罗表出低于库存要求的最低库存的全部商品 (或者低于库存预警值 "alert only"复选框 ). 使用复选框, 您可以创建供应商订单，以填补差额.
-ReplenishmentOrdersDesc=这是一个包含所有包括预定义产品的打开的供应商订单的列表.只有预定义的产品的订单，所以可能会影响库存的订单，在这里是可见的。
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=补充资金
-NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
-NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
+NbOfProductBeforePeriod=产品数量%s选定期前库存（<%s）
+NbOfProductAfterPeriod=选定期限后产品数量%s（> %s）
 MassMovement=批量库存调拨
 SelectProductInAndOutWareHouse=请选择一个产品，数量值，来源仓和目标仓，然后点击 "%s"。完了之后呢，点击 "%s"。
-RecordMovement=Record transfer
-ReceivingForSameOrder=此订单的收据 
+RecordMovement=记录转移
+ReceivingForSameOrder=此订单的收据
 StockMovementRecorded=库存调拨已记录
 RuleForStockAvailability=库存要求规则
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever is rule for automatic stock change)
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=调拨标签
-DateMovement=Date of movement
+TypeMovement=Type of movement
+DateMovement=行动日期
 InventoryCode=调拨或盘点编码
 IsInPackage=包含在模块包
-WarehouseAllowNegativeTransfer=Stock can be negative
-qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse and your setup does not allow negative stocks.
+WarehouseAllowNegativeTransfer=股票可能是负面的
+qtyToTranferIsNotEnough=您的源仓库中没有足够的库存，您的设置不允许负库存。
 ShowWarehouse=显示仓库
 MovementCorrectStock=产品库存校正 %s
 MovementTransferStock=库存调拨移转 %s 到其他仓库库位中
 InventoryCodeShort=Inv./Mov. 代码
-NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
-ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
-OpenAll=Open for all actions
-OpenInternal=Open only for internal actions
-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
-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
-NewInventory=New inventory
-inventorySetup = Inventory Setup
-inventoryCreatePermission=Create new inventory
-inventoryReadPermission=View inventories
-inventoryWritePermission=Update inventories
-inventoryValidatePermission=Validate inventory
-inventoryTitle=Inventory
-inventoryListTitle=Inventories
-inventoryListEmpty=No inventory in progress
-inventoryCreateDelete=Create/Delete inventory
-inventoryCreate=Create new
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
+ThisSerialAlreadyExistWithDifferentDate=此批/序号（<strong> %s </strong>）已存在，但具有不同的吃饭或卖出日期（找到<strong> %s </strong>但您输入<strong> %s </strong>）。
+OpenAll=打开所有操作
+OpenInternal=仅对内部操作打开
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
+OptionMULTIPRICESIsOn=选项“每个段的几个价格”已开启。这意味着一个产品有几个销售价格，因此无法计算出售价值
+ProductStockWarehouseCreated=正确创建警报和所需最佳库存的库存限制
+ProductStockWarehouseUpdated=正确更新警报和所需最佳库存的库存限制
+ProductStockWarehouseDeleted=正确删除警报和所需最佳库存的库存限制
+AddNewProductStockWarehouse=设置警报和所需最佳库存的新限制
+AddStockLocationLine=减少数量，然后单击以添加此产品的另一个仓库
+InventoryDate=库存日期
+NewInventory=新库存
+inventorySetup = 库存设置
+inventoryCreatePermission=创建新库存
+inventoryReadPermission=查看库存
+inventoryWritePermission=更新库存
+inventoryValidatePermission=验证库存
+inventoryTitle=库存
+inventoryListTitle=存货
+inventoryListEmpty=没有库存正在进行中
+inventoryCreateDelete=创建/删除库存
+inventoryCreate=创建新的
 inventoryEdit=编辑
 inventoryValidate=已确认
 inventoryDraft=* 执行中/running
-inventorySelectWarehouse=Warehouse choice
+inventorySelectWarehouse=仓库选择
 inventoryConfirmCreate=创建
-inventoryOfWarehouse=Inventory for warehouse : %s
-inventoryErrorQtyAdd=Error : one quantity is leaser than zero
-inventoryMvtStock=By inventory
-inventoryWarningProductAlreadyExists=This product is already into list
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
+inventoryMvtStock=通过库存
+inventoryWarningProductAlreadyExists=此产品已列入清单
 SelectCategory=分类筛选
-SelectFournisseur=Supplier filter
-inventoryOnDate=Inventory
-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
-inventoryChangePMPPermission=Allow to change PMP value for a product
-ColumnNewPMP=New unit PMP
-OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorique qty
-TheoricalValue=Theorique qty
-LastPA=Last BP
-CurrentPA=Curent BP
-RealQty=Real Qty
-RealValue=Real Value
-RegulatedQty=Regulated Qty
-AddInventoryProduct=Add product to inventory
+SelectFournisseur=Vendor filter
+inventoryOnDate=库存
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
+INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=如果找不到最后买入价，请使用买入价
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement has date of inventory
+inventoryChangePMPPermission=允许更改产品的PMP值
+ColumnNewPMP=新单位PMP
+OnlyProdsInStock=不添加库存的产品
+TheoricalQty=理论数量
+TheoricalValue=理论数量
+LastPA=最后 BP
+CurrentPA=当前 BP
+RealQty=实际数量
+RealValue=实际价值
+RegulatedQty=规范数量
+AddInventoryProduct=将产品添加到库存
 AddProduct=添加
-ApplyPMP=Apply PMP
-FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action ?
-InventoryFlushed=Inventory flushed
-ExitEditMode=Exit edition
+ApplyPMP=应用 PMP
+FlushInventory=清仓库存
+ConfirmFlushInventory=Do you confirm this action?
+InventoryFlushed=库存已清空
+ExitEditMode=退出版
 inventoryDeleteLine=删除行
-RegulateStock=Regulate Stock
+RegulateStock=规范库存
 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 items
+StockSupportServices=Stock management supports Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
+ReceiveProducts=收到物品
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
diff --git a/htdocs/langs/zh_CN/website.lang b/htdocs/langs/zh_CN/website.lang
index 7226bc67409..a92bfcf66ad 100644
--- a/htdocs/langs/zh_CN/website.lang
+++ b/htdocs/langs/zh_CN/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/zh_CN/withdrawals.lang b/htdocs/langs/zh_CN/withdrawals.lang
index 714d36956c2..83c38178b4b 100644
--- a/htdocs/langs/zh_CN/withdrawals.lang
+++ b/htdocs/langs/zh_CN/withdrawals.lang
@@ -1,32 +1,32 @@
 # 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=长期订单区域
+SuppliersStandingOrdersArea=直接信用支付订单区域
+StandingOrdersPayment=长期订单
+StandingOrderPayment=长期订单
+NewStandingOrder=新建长期订单
 StandingOrderToProcess=要处理
-WithdrawalsReceipts=Direct debit orders
-WithdrawalReceipt=Direct debit order
-LastWithdrawalReceipts=Latest %s direct debit files
-WithdrawalsLines=Direct debit order lines
-RequestStandingOrderToTreat=Request for direct debit payment order to process
-RequestStandingOrderTreated=Request for direct debit payment order processed
+WithdrawalsReceipts=提款收据
+WithdrawalReceipt=提款收据
+LastWithdrawalReceipts=最后 %s 取款收据
+WithdrawalsLines=直接借记订单行
+RequestStandingOrderToTreat=要求直接付款处理订单
+RequestStandingOrderTreated=请求处理直接付款订单
 NotPossibleForThisStatusOfWithdrawReceiptORLine=这不可能。在声明拒绝特定明细行之前撤回状态必须设置为 'credited' 。
-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
+NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=发票等待直接付款
 AmountToWithdraw=收回的款额
-WithdrawsRefused=Direct debit refused
-NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
-ResponsibleUser=责任人
-WithdrawalsSetup=Direct debit payment setup
-WithdrawStatistics=Direct debit payment statistics
-WithdrawRejectStatistics=Direct debit payment reject statistics
-LastWithdrawalReceipt=Latest %s direct debit receipts
-MakeWithdrawRequest=Make a direct debit payment request
-WithdrawRequestsDone=%s direct debit payment requests recorded
-ThirdPartyBankCode=合伙人银行账号
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
+WithdrawsRefused=直接付款被拒绝
+NoInvoiceToWithdraw=没有打开“直接付款请求”的客户发票正在等待。继续在发票卡上的“%s”标签上提出申请。
+ResponsibleUser=User Responsible
+WithdrawalsSetup=提款设置
+WithdrawStatistics=直接付款统计
+WithdrawRejectStatistics=直接付款拒绝统计
+LastWithdrawalReceipt=最新的%s直接借记收据
+MakeWithdrawRequest=直接付款请求
+WithdrawRequestsDone=%s记录了直接付款请求
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=分类记
 ClassCreditedConfirm=你确定要分类这一撤离收据上记入您的银行帐户？
 TransData=数据传输
@@ -41,7 +41,7 @@ RefusedReason=拒绝的原因
 RefusedInvoicing=帐单拒绝
 NoInvoiceRefused=拒绝不收
 InvoiceRefused=订单已被拒绝 (Charge the rejection to customer)
-StatusDebitCredit=Status debit/credit
+StatusDebitCredit=状态借记/贷记
 StatusWaiting=等候
 StatusTrans=传播
 StatusCredited=计入
@@ -49,15 +49,15 @@ StatusRefused=拒绝
 StatusMotif0=未指定
 StatusMotif1=提供insuffisante
 StatusMotif2=Tirage conteste
-StatusMotif3=No direct debit payment order
-StatusMotif4=客户订单
+StatusMotif3=没有直接付款订单
+StatusMotif4=Sales Order
 StatusMotif5=肋inexploitable
 StatusMotif6=帐户无余额
 StatusMotif7=司法判决
 StatusMotif8=其他原因
-CreateForSepaFRST=Create direct debit file (SEPA FRST)
-CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
-CreateAll=Create direct debit file (all)
+CreateForSepaFRST=创建直接借记文件（SEPA FRST）
+CreateForSepaRCUR=创建直接借记文件（SEPA RCUR）
+CreateAll=创建直接借记文件（全部）
 CreateGuichet=只有办公室
 CreateBanque=只有银行
 OrderWaiting=等待治疗
@@ -66,49 +66,53 @@ NotifyCredit=提款信用
 NumeroNationalEmetter=国家发射数
 WithBankUsingRIB=有关银行账户，使用肋
 WithBankUsingBANBIC=使用的IBAN / BIC / SWIFT的银行帐户
-BankToReceiveWithdraw=Bank account to receive direct debit
+BankToReceiveWithdraw=Receiving Bank Account
 CreditDate=信贷
-WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
-ShowWithdraw=显示撤柜
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=然而，如果发票已至少有一个撤出支付尚未处理的，它不会被设置为支付最高允许管理撤出之前。
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+WithdrawalFileNotCapable=无法为您所在的国家/地区生成提款收据文件%s（不支持您所在的国家/地区）
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
+DoStandingOrdersBeforePayments=此选项卡允许您申请直接付款订单。完成后，进入菜单Bank-> Direct Debit订单以管理直接付款订单。当付款单关闭时，将自动记录发票上的付款，如果要支付的剩余部分为空，则发票将关闭。
 WithdrawalFile=撤回文件
 SetToStatusSent=设置状态“发送的文件”
-ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null
+ThisWillAlsoAddPaymentOnInvoice=这还将记录付款到发票，并将其分类为“付费”，如果仍然支付是空的
 StatisticsByLineStatus=按状态明细统计
 RUM=UMR
-RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
-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
-DirectDebitOrderCreated=Direct debit order %s created
-AmountRequested=Amount requested
+RUMLong=唯一授权参考
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
+WithdrawMode=直接付款模式（FRST或RECUR）
+WithdrawRequestAmount=直接付款申请金额：
+WithdrawRequestErrorNilAmount=无法为空金额创建直接付款请求。
+SepaMandate=SEPA直接借记授权
+SepaMandateShort=SEPA授权
+PleaseReturnMandate=请将此任务表格通过电子邮件发送至%s或邮寄至
+SEPALegalText=通过签署此授权表格，您授权（A）%s向您的银行发送指示以从您的帐户中扣款;以及（B）您的银行根据%s的指示从您的帐户中扣款。作为您权利的一部分，您有权根据与银行协议的条款和条件从银行获得退款。必须在自您的帐户扣款之日起的8周内申领退款。您可以从银行获得的声明中解释了您对上述任务的权利。
+CreditorIdentifier=债权人标识符
+CreditorName=Creditor Name
+SEPAFillForm=（B）请填写标有*的所有字段
+SEPAFormYourName=你的名字
+SEPAFormYourBAN=您的银行帐户名称（IBAN）
+SEPAFormYourBIC=您的银行识别码（BIC）
+SEPAFrstOrRecur=付款方式
+ModeRECUR=Recurring payment
+ModeFRST=一次性付款
+PleaseCheckOne=请检查一个
+DirectDebitOrderCreated=创建直接借记订单%s
+AmountRequested=要求金额
 SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
-ExecutionDate=Execution date
-CreateForSepa=Create direct debit file
+ExecutionDate=执行日期
+CreateForSepa=创建直接付款文件
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
 
 ### Notifications
-InfoCreditSubject=Payment of direct debit payment order %s by the bank
-InfoCreditMessage=The direct debit payment order %s has been paid by the bank<br>Data of payment: %s
-InfoTransSubject=Transmission of direct debit payment order %s to bank
-InfoTransMessage=The direct debit payment order %s has been sent to bank by %s %s.<br><br>
+InfoCreditSubject=由银行支付直接借记支付订单%s
+InfoCreditMessage=直接付款指令%s已由银行支付<br>付款方式：%s
+InfoTransSubject=直接借记支付订单%s到银行的传输
+InfoTransMessage=直接付款指令%s已被%s %s发送至银行。<br> <br> <br>
 InfoTransData=金额：%s <br> metode：%s <br>日期：%s
-InfoRejectSubject=Direct debit payment order refused
-InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
+InfoRejectSubject=直接付款订单被拒绝
+InfoRejectMessage=您好，<br> <br>与公司%s相关的发票%s的直接借记支付订单，金额已被%s拒绝了。<br> <br> <br> <br> %s
 ModeWarning=实模式下的选项没有设置，这个模拟后，我们停止
diff --git a/htdocs/langs/zh_TW/accountancy.lang b/htdocs/langs/zh_TW/accountancy.lang
index 95b6868ae2f..be9027cf959 100644
--- a/htdocs/langs/zh_TW/accountancy.lang
+++ b/htdocs/langs/zh_TW/accountancy.lang
@@ -216,7 +216,8 @@ DescThirdPartyReport=Consult here the list of third-party customers and vendors
 ListAccounts=各式會計項目清單
 UnknownAccountForThirdparty=Unknown third-party account. We will use %s
 UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
 
@@ -291,7 +292,7 @@ Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
-Modelcsv_FEC=Export FEC (Art. L47 A)
+Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
 ChartofaccountsId=會計項目表ID
 
@@ -316,6 +317,9 @@ WithoutValidAccount=沒有驗證的指定會計項目
 WithValidAccount=驗證的指定會計項目
 ValueNotIntoChartOfAccount=在會計項目表中沒有會計項目的值
 AccountRemovedFromGroup=Account removed from group
+SaleLocal=Local sale
+SaleExport=Export sale
+SaleEEC=Sale in EEC
 
 ## Dictionary
 Range=會計項目範圍
@@ -336,7 +340,7 @@ UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to
 
 ## Import
 ImportAccountingEntries=Accounting entries
-
+DateExport=Date export
 WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
 ExpenseReportJournal=Expense Report Journal
 InventoryJournal=Inventory Journal
diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
index 6f650158058..e139e03077d 100644
--- a/htdocs/langs/zh_TW/admin.lang
+++ b/htdocs/langs/zh_TW/admin.lang
@@ -149,7 +149,7 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=清除
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=刪除 log 檔案，包含Syslog 模組的 <b>%s</b> (沒有遺失資料風險)
-PurgeDeleteTemporaryFiles=刪除全部暫存檔案(沒有遺失資料風險)
+PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
 PurgeDeleteTemporaryFilesShort=刪除範本檔案
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=立即清除
@@ -804,6 +804,7 @@ Permission401=讀取折扣
 Permission402=建立/修改折扣
 Permission403=驗證折扣
 Permission404=刪除折扣
+Permission430=Use Debug Bar
 Permission511=Read payments of salaries
 Permission512=Create/modify payments of salaries
 Permission514=Delete payments of salaries
@@ -818,6 +819,9 @@ Permission532=建立/修改服務
 Permission534=刪除服務
 Permission536=查看/管理隱藏服務
 Permission538=匯出服務
+Permission650=Read bom of Bom
+Permission651=Create/Update bom of Bom
+Permission652=Delete bom of Bom
 Permission701=讀取捐款
 Permission702=建立/修改捐款
 Permission703=刪除捐款
@@ -837,6 +841,12 @@ Permission1101=讀取交貨訂單
 Permission1102=建立/修改交貨訂單
 Permission1104=驗證交貨訂單
 Permission1109=刪除交貨訂單
+Permission1121=Read supplier proposals
+Permission1122=Create/modify supplier proposals
+Permission1123=Validate supplier proposals
+Permission1124=Send supplier proposals
+Permission1125=Delete supplier proposals
+Permission1126=Close supplier price requests
 Permission1181=讀取供應商資訊
 Permission1182=Read purchase orders
 Permission1183=Create/modify purchase orders
@@ -859,16 +869,6 @@ Permission1251=執行匯入大量外部資料到資料庫的功能 (載入資料
 Permission1321=匯出客戶發票、屬性及其付款資訊
 Permission1322=重啟已付帳單
 Permission1421=Export sales orders and attributes
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
-Permission20003=刪除離職需求
-Permission20004=讀取全部離職需求 (甚至非您下屬的用戶)
-Permission20005=建立/修改全部人離職需求(甚至非您下屬的用戶)
-Permission20006=管理員離職需求(設定及昇級平衡)
-Permission23001=讀取預定工作
-Permission23002=建立/更新預定工作
-Permission23003=刪除預定工作
-Permission23004=執行預定工作
 Permission2401=讀取連結到其帳戶的行動（事件或任務）
 Permission2402=建立/修改連結到其帳戶的行動（事件或任務）
 Permission2403=刪除連結到其帳戶的行動（事件或任務）
@@ -882,9 +882,41 @@ Permission2503=提交或刪除文件
 Permission2515=設定文件的各式資料夾
 Permission2801=在唯讀模式下使用 FTP 客戶端 (僅瀏覽及下載)
 Permission2802=在寫入模式下使用 FTP 客戶端 (可刪除或上傳檔案)
+Permission3200=Read archived events and fingerprints
+Permission4001=See employees
+Permission4002=Create employees
+Permission4003=Delete employees
+Permission4004=Export employees
+Permission10001=Read website content
+Permission10002=Create/modify website content (html and javascript content)
+Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
+Permission10005=Delete website content
+Permission20001=Read leave requests (your leave and those of your subordinates)
+Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
+Permission20003=刪除離職需求
+Permission20004=讀取全部離職需求 (甚至非您下屬的用戶)
+Permission20005=建立/修改全部人離職需求(甚至非您下屬的用戶)
+Permission20006=管理員離職需求(設定及昇級平衡)
+Permission23001=讀取預定工作
+Permission23002=建立/更新預定工作
+Permission23003=刪除預定工作
+Permission23004=執行預定工作
 Permission50101=Use Point of Sale
 Permission50201=讀取交易
 Permission50202=匯入交易
+Permission50401=Bind products and invoices with accounting accounts
+Permission50411=Read operations in ledger
+Permission50412=Write/Edit operations in ledger
+Permission50414=Delete operations in ledger
+Permission50415=Delete all operations by year and journal in ledger
+Permission50418=Export operations of the ledger
+Permission50420=Report and export reports (turnover, balance, journals, ledger)
+Permission50430=Define and close a fiscal year
+Permission50440=Manage chart of accounts, setup of accountancy
+Permission51001=Read assets
+Permission51002=Create/Update assets
+Permission51003=Delete assets
+Permission51005=Setup types of asset
 Permission54001=列印
 Permission55001=讀取問卷
 Permission55002=建立/修改問卷
@@ -1078,7 +1110,7 @@ AreaForAdminOnly=設定參數僅由<b>管理員用戶</b>設定。
 SystemInfoDesc=僅供具有系統管理員以唯讀及可見模式取得系統資訊。
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
 CompanyFundationDesc=編輯公司/項目的資訊。點選在頁面下方的 "%s" 或 "%s" 按鈕。
-AccountantDesc=Edit the details of your accountant/bookkeeper
+AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
 AvailableModules=可用的程式/模組
@@ -1891,3 +1923,5 @@ IFTTTDesc=This module is designed to trigger events on IFTTT and/or to execute s
 UrlForIFTTT=URL endpoint for IFTTT
 YouWillFindItOnYourIFTTTAccount=You will find it on your IFTTT account
 EndPointFor=End point for %s : %s
+DeleteEmailCollector=Delete email collector
+ConfirmDeleteEmailCollector=Are you sure you want to delete this email collectore?
diff --git a/htdocs/langs/zh_TW/banks.lang b/htdocs/langs/zh_TW/banks.lang
index 9e8e378a066..1d49810c518 100644
--- a/htdocs/langs/zh_TW/banks.lang
+++ b/htdocs/langs/zh_TW/banks.lang
@@ -100,7 +100,7 @@ NotReconciled=未調節
 CustomerInvoicePayment=客戶付款
 SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=訂閱付款
-WithdrawalPayment=提款支付
+WithdrawalPayment=Debit payment order
 SocialContributionPayment=社會/財務稅負繳款單
 BankTransfer=銀行轉帳
 BankTransfers=銀行轉帳
diff --git a/htdocs/langs/zh_TW/cashdesk.lang b/htdocs/langs/zh_TW/cashdesk.lang
index 3dd8a9cf311..a642aa68f6c 100644
--- a/htdocs/langs/zh_TW/cashdesk.lang
+++ b/htdocs/langs/zh_TW/cashdesk.lang
@@ -68,3 +68,4 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
+BasicPhoneLayout=Use basic layout for phones
diff --git a/htdocs/langs/zh_TW/mails.lang b/htdocs/langs/zh_TW/mails.lang
index a8584f9b294..aa3d8052af1 100644
--- a/htdocs/langs/zh_TW/mails.lang
+++ b/htdocs/langs/zh_TW/mails.lang
@@ -19,6 +19,8 @@ MailTopic=Email topic
 MailText=郵件內容
 MailFile=附加檔案
 MailMessage=電子郵件正文
+SubjectNotIn=Not in Subject
+BodyNotIn=Not in Body
 ShowEMailing=顯示電子郵件
 ListOfEMailings=名單emailings
 NewMailing=新的電子郵件
@@ -76,9 +78,9 @@ GroupEmails=Group emails
 OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
 WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
 ResultOfMailSending=Result of mass Email sending
-NbSelected=No. selected
-NbIgnored=No. ignored
-NbSent=No. sent
+NbSelected=Number selected
+NbIgnored=Number ignored
+NbSent=Number sent
 SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
diff --git a/htdocs/langs/zh_TW/members.lang b/htdocs/langs/zh_TW/members.lang
index 35505032a19..b48f717a1ad 100644
--- a/htdocs/langs/zh_TW/members.lang
+++ b/htdocs/langs/zh_TW/members.lang
@@ -171,7 +171,7 @@ MembersStatisticsDesc=選擇你想讀的統計...
 MenuMembersStats=統計
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Latest subscription date
-Nature=類型
+MemberNature=Nature of member
 Public=信息是公開的
 NewMemberbyWeb=增加了新成員。等待批準
 NewMemberForm=新成員的形式
diff --git a/htdocs/langs/zh_TW/products.lang b/htdocs/langs/zh_TW/products.lang
index 182fd2b6339..0379739b18f 100644
--- a/htdocs/langs/zh_TW/products.lang
+++ b/htdocs/langs/zh_TW/products.lang
@@ -159,7 +159,7 @@ SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=原產地
-Nature=Product Type (material/finished)
+Nature=Nature of produt (material/finished)
 ShortLabel=簡短標籤
 Unit=單位
 p=u.
diff --git a/htdocs/langs/zh_TW/salaries.lang b/htdocs/langs/zh_TW/salaries.lang
index 6a82354edae..7c3c08a65bd 100644
--- a/htdocs/langs/zh_TW/salaries.lang
+++ b/htdocs/langs/zh_TW/salaries.lang
@@ -1,18 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger 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_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
 Salary=Salary
 Salaries=Salaries
 NewSalaryPayment=New salary payment
+AddSalaryPayment=Add salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
 ShowSalaryPayment=Show salary payment
 THM=Average hourly rate
 TJM=Average daily rate
 CurrentSalary=Current salary
-THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
-TJMDescription=This value is currently as information only and is not used for any calculation
+THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
+TJMDescription=This value is currently for information only and is not used for any calculation
 LastSalaries=Latest %s salary payments
 AllSalaries=All salary payments
-SalariesStatistics=Statistiques salaires
+SalariesStatistics=Salary statistics
+# Export
+SalariesAndPayments=Salaries and payments
diff --git a/htdocs/langs/zh_TW/stocks.lang b/htdocs/langs/zh_TW/stocks.lang
index 0d00cb46ee8..2e875d8e61d 100644
--- a/htdocs/langs/zh_TW/stocks.lang
+++ b/htdocs/langs/zh_TW/stocks.lang
@@ -3,7 +3,7 @@ WarehouseCard=倉庫/庫存卡
 Warehouse=倉庫
 Warehouses=倉庫
 ParentWarehouse=Parent warehouse
-NewWarehouse=新倉庫/庫存區
+NewWarehouse=New warehouse / Stock Location
 WarehouseEdit=修改倉庫
 MenuNewWarehouse=新倉庫
 WarehouseSource=來源倉庫
@@ -29,6 +29,8 @@ MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=庫存區
+AllWarehouses=All warehouses
+IncludeAlsoDraftOrders=Include also draft orders
 Location=位置
 LocationSummary=擺放位置
 NumberOfDifferentProducts=Number of different products
@@ -44,7 +46,6 @@ TransferStock=Transfer stock
 MassStockTransferShort=Mass stock transfer
 StockMovement=Stock movement
 StockMovements=Stock movements
-LabelMovement=Movement label
 NumberOfUnit=單位數目
 UnitPurchaseValue=單位購買價格
 StockTooLow=庫存過低
@@ -54,21 +55,23 @@ PMPValue=加權平均價格
 PMPValueShort=的WAP
 EnhancedValueOfWarehouses=倉庫價值
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Allow to add limit and desired stock per couple (product, warehouse) instead of per product
-IndependantSubProductStock=Product stock and subproduct stock are independant
+AllowAddLimitStockByWarehouse=Manage also values for minimum and desired stock per pairing (product-warehouse) in addition to values per product
+IndependantSubProductStock=Product stock and subproduct stock are independent
 QtyDispatched=派出數量
 QtyDispatchedShort=Qty dispatched
 QtyToDispatchShort=Qty to dispatch
 OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Rule for automatic stock management decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
-RuleForStockManagementIncrease=Rule for automatic stock management increase (manual increase is always possible, even if an automatic increase rule is activated)
-DeStockOnBill=在供應商發票(invoice)或票據(Credit notes)驗證後，減少實際庫存量
-DeStockOnValidateOrder=在客戶訂單驗證後，減少實際庫存量
+RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
+RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
+DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
+DeStockOnValidateOrder=Decrease real stocks on validation of sales order
 DeStockOnShipment=Decrease real stocks on shipping validation
-DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification closed
-ReStockOnBill=在供應商發票(invoice)或票據(Credit notes)驗證後，增加實際庫存量
-ReStockOnValidateOrder=Increase real stocks on purchase orders approbation
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods
+DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
+ReStockOnValidateOrder=Increase real stocks on purchase order approval
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
+StockOnReception=Increase real stocks on validation of reception
+StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=命令還沒有或根本沒有更多的地位，使產品在倉庫庫存調度。
 StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
 NoPredefinedProductToDispatch=此對象沒有預定義的產品。因此，沒有庫存調度是必需的。
@@ -76,12 +79,12 @@ DispatchVerb=派遣
 StockLimitShort=Limit for alert
 StockLimit=Stock limit for alert
 StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
-PhysicalStock=實際庫存量
+PhysicalStock=Physical Stock
 RealStock=實際庫存量
-RealStockDesc=Physical or real stock is the stock you currently have into your internal warehouses/emplacements.
-RealStockWillAutomaticallyWhen=The real stock will automatically change according to this rules (see stock module setup to change this):
+RealStockDesc=Physical/real stock is the stock currently in the warehouses.
+RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=虛擬庫存
-VirtualStockDesc=Virtual stock is the stock you will get once all open pending actions that affect stocks will be closed (supplier order received, customer order shipped, ...)
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
 IdWarehouse=編號倉庫
 DescWareHouse=說明倉庫
 LieuWareHouse=本地化倉庫
@@ -101,7 +104,7 @@ ThisWarehouseIsPersonalStock=這個倉庫代表的%s%的個人股票期權
 SelectWarehouseForStockDecrease=選擇倉庫庫存減少使用
 SelectWarehouseForStockIncrease=選擇使用庫存增加的倉庫
 NoStockAction=No stock action
-DesiredStock=理想庫存量
+DesiredStock=Desired Stock
 DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
 StockToBuy=To order
 Replenishment=Replenishment
@@ -114,13 +117,13 @@ CurentSelectionMode=Current selection mode
 CurentlyUsingVirtualStock=虛擬庫存
 CurentlyUsingPhysicalStock=實際庫存量
 RuleForStockReplenishment=Rule for stocks replenishment
-SelectProductWithNotNullQty=Select at least one product with a qty not null and a supplier
+SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
 AlertOnly= Alerts only
 WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is a list of all open supplier orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
+ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
+ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,10 +133,11 @@ RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
 RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever is rule for automatic stock change)
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
+StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
+StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
+StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
 MovementLabel=Label of movement
+TypeMovement=Type of movement
 DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
@@ -143,11 +147,11 @@ ShowWarehouse=顯示倉庫
 MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
 OpenAll=Open for all actions
 OpenInternal=Open only for internal actions
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on supplier order reception
+UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
 OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
 ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
 ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
@@ -171,16 +175,16 @@ inventoryValidate=驗證
 inventoryDraft=運行
 inventorySelectWarehouse=Warehouse choice
 inventoryConfirmCreate=Create
-inventoryOfWarehouse=Inventory for warehouse : %s
-inventoryErrorQtyAdd=Error : one quantity is leaser than zero
+inventoryOfWarehouse=Inventory for warehouse: %s
+inventoryErrorQtyAdd=Error: one quantity is less than zero
 inventoryMvtStock=By inventory
 inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=分類篩選器
-SelectFournisseur=Supplier filter
+SelectFournisseur=Vendor filter
 inventoryOnDate=庫存
-INVENTORY_DISABLE_VIRTUAL=Allow to not destock child product from a kit on inventory
+INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
 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
+INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement has date of inventory
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
@@ -195,12 +199,16 @@ AddInventoryProduct=Add product to inventory
 AddProduct=Add
 ApplyPMP=Apply PMP
 FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action ?
+ConfirmFlushInventory=Do you confirm this action?
 InventoryFlushed=Inventory flushed
 ExitEditMode=Exit edition
 inventoryDeleteLine=Delete line
 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"
+StockSupportServices=Stock management supports Services
+StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
 ReceiveProducts=Receive items
+StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
+StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
+StockIncrease=Stock increase
+StockDecrease=Stock decrease
diff --git a/htdocs/langs/zh_TW/website.lang b/htdocs/langs/zh_TW/website.lang
index a7fdef907cc..82a20e8535b 100644
--- a/htdocs/langs/zh_TW/website.lang
+++ b/htdocs/langs/zh_TW/website.lang
@@ -101,3 +101,5 @@ NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynam
 ReplaceWebsiteContent=Replace website content
 DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
+# Export
+MyWebsitePages=My website pages
diff --git a/htdocs/langs/zh_TW/withdrawals.lang b/htdocs/langs/zh_TW/withdrawals.lang
index bbf2aef9b6a..e9dcf33924b 100644
--- a/htdocs/langs/zh_TW/withdrawals.lang
+++ b/htdocs/langs/zh_TW/withdrawals.lang
@@ -5,28 +5,28 @@ StandingOrdersPayment=Direct debit payment orders
 StandingOrderPayment=Direct debit payment order
 NewStandingOrder=New direct debit order
 StandingOrderToProcess=要處理
-WithdrawalsReceipts=Direct debit orders
-WithdrawalReceipt=Direct debit order
+WithdrawalsReceipts=直接扣款
+WithdrawalReceipt=直接扣款
 LastWithdrawalReceipts=Latest %s direct debit files
 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
+NbOfInvoiceToWithdraw=No. of qualified invoice with waiting direct debit order
+NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=收回的款額
 WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request.
-ResponsibleUser=負責用戶
+ResponsibleUser=User Responsible
 WithdrawalsSetup=Direct debit payment setup
 WithdrawStatistics=Direct debit payment statistics
 WithdrawRejectStatistics=Direct debit payment reject statistics
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
 WithdrawRequestsDone=%s direct debit payment requests recorded
-ThirdPartyBankCode=第三方銀行代碼
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoices are on companies with a valid default BAN and that BAN has a RUM with mode <strong>%s</strong>.
+ThirdPartyBankCode=Third-party bank code
+NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=分類記
 ClassCreditedConfirm=你確定要分類這一撤離收據上記入您的銀行帳戶？
 TransData=數據傳輸
@@ -50,7 +50,7 @@ StatusMotif0=未指定
 StatusMotif1=提供insuffisante
 StatusMotif2=Tirage conteste
 StatusMotif3=No direct debit payment order
-StatusMotif4=客戶訂單
+StatusMotif4=Sales Order
 StatusMotif5=肋inexploitable
 StatusMotif6=帳戶無余額
 StatusMotif7=司法判決
@@ -66,11 +66,11 @@ NotifyCredit=提款信用
 NumeroNationalEmetter=國家發射數
 WithBankUsingRIB=有關銀行賬戶，使用肋
 WithBankUsingBANBIC=使用的IBAN / BIC / SWIFT的銀行帳戶
-BankToReceiveWithdraw=Bank account to receive direct debit
+BankToReceiveWithdraw=Receiving Bank Account
 CreditDate=信貸
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
-ShowWithdraw=顯示撤櫃
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=然而，如果發票已至少有一個撤出支付尚未處理的，它不會被設置為支付最高允許管理撤出之前。
+ShowWithdraw=Show Direct Debit Order
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to manage the direct debit payment order. When payment order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
 WithdrawalFile=Withdrawal file
 SetToStatusSent=Set to status "File Sent"
@@ -78,7 +78,7 @@ ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and w
 StatisticsByLineStatus=Statistics by status of lines
 RUM=UMR
 RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, UMR number will be generated once bank account information are saved
+RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -87,13 +87,13 @@ 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
+CreditorName=Creditor 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
+ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 DirectDebitOrderCreated=Direct debit order %s created
@@ -102,6 +102,10 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
+ICS=Creditor Identifier CI
+END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
+USTRD="Unstructured" SEPA XML tag
+ADDDAYS=Add days to Execution Date
 
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank